diff -r 52b1745787cf -r 146af4f081b9 MozillaFirefox/mozilla.sh.in --- a/MozillaFirefox/mozilla.sh.in Mon Nov 25 08:41:45 2019 +0100 +++ b/MozillaFirefox/mozilla.sh.in Thu Jun 11 22:04:26 2020 +0200 @@ -70,15 +70,6 @@ export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi -mozilla_lib=`file $MOZ_PROGRAM` -LIB=lib -echo $mozilla_lib | grep -q -E 'ELF.64-bit.*(x86-64|S/390|PowerPC|ARM aarch64)' && LIB=lib64 - -BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins -if [ ! -d $BROWSER_PLUGIN_DIR ]; then - BROWSER_PLUGIN_DIR=/opt/netscape/plugins -fi - MOZILLA_FIVE_HOME="$MOZ_DIST_LIB" export MOZILLA_FIVE_HOME LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} @@ -87,21 +78,15 @@ # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 -## -if [ -z "$MOZ_PLUGIN_PATH" ]; then - export MOZ_PLUGIN_PATH=$BROWSER_PLUGIN_DIR -else - # make sure that BROWSER_PLUGIN_DIR is in MOZ_PLUGIN_PATH - echo "$MOZ_PLUGIN_PATH" | grep "$BROWSER_PLUGIN_DIR" 2>&1 >/dev/null - _retval=$? - if [ ${_retval} -ne 0 ]; then - export MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$BROWSER_PLUGIN_DIR - fi -fi - # disable Gnome crash dialog (doesn't make sense anyway) export GNOME_DISABLE_CRASH_DIALOG=1 +# Wayland +# $XDG_SESSION_TYPE should contain either x11 or wayland +if [ "$XDG_SESSION_TYPE" = "wayland" ]; then + export MOZ_ENABLE_WAYLAND=1 +fi + # enable xinput2 (boo#1032003) # breaks too many things right now (boo#1053959) #export MOZ_USE_XINPUT2=1