From c5b98845d200f64375669e3bc7789c3b3a4c78f9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 18 Nov 2023 13:06:06 +0000 Subject: [PATCH] chrome: enable lib.private --- packages/addons/browser/chrome/package.mk | 4 ++-- packages/addons/browser/chrome/source/bin/chrome-start | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 996350df9c..18b2c6e18f 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -29,7 +29,7 @@ make_target() { } addon() { - mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,config,lib,resources} + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,config,lib.private,resources} # config cp -P ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config @@ -57,7 +57,7 @@ addon() { $(get_install_dir libxss)/usr/lib/libXss.so.1 \ $(get_install_dir chrome-libXtst)/usr/lib/libXtst.so.6 \ $(get_install_dir pango)/usr/lib/{libpangocairo-1.0.so.0,libpango-1.0.so.0,libpangoft2-1.0.so.0} \ - ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private # unix_ar cp -P $(get_build_dir unix_ar)/unix_ar.py ${ADDON_BUILD}/${PKG_ADDON_ID}/resources diff --git a/packages/addons/browser/chrome/source/bin/chrome-start b/packages/addons/browser/chrome/source/bin/chrome-start index 55a5148594..ddc79c0fb4 100755 --- a/packages/addons/browser/chrome/source/bin/chrome-start +++ b/packages/addons/browser/chrome/source/bin/chrome-start @@ -22,13 +22,13 @@ chmod +x $ADDON_DIR/chrome-bin/chrome chmod 4755 $ADDON_DIR/chrome-bin/chrome-sandbox # make sure we use "own" gtk/pango/nss/etc -export LD_LIBRARY_PATH=$ADDON_DIR/lib +export LD_LIBRARY_PATH=$ADDON_DIR/lib.private # configure pango/pixbuf export PANGO_RC_FILE=$ADDON_DIR/config/pangorc export GDK_PIXBUF_MODULE_FILE=$ADDON_DIR/config/pixbuf.loaders.cache -# font rendering in gtk widgets is brokeen with nvidia blob. use our Xdefaults +# font rendering in gtk widgets is broken with nvidia blob. use our Xdefaults export XENVIRONMENT=$ADDON_DIR/config/Xdefaults # start unclutter @@ -39,7 +39,7 @@ then fi # vaapi -LIBVA_DRIVERS_PATH="/usr/lib/dri:$ADDON_DIR/lib" +LIBVA_DRIVERS_PATH="/usr/lib/dri:$ADDON_DIR/lib.private" LIBVA_DRIVER_NAME='' case $VAAPI_MODE in 'intel')