From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- www-client/firefox/files/firefox-wayland.sh | 7 -- www-client/firefox/files/firefox-x11.sh | 7 -- www-client/firefox/files/firefox.sh | 128 ---------------------------- 3 files changed, 142 deletions(-) delete mode 100644 www-client/firefox/files/firefox-wayland.sh delete mode 100644 www-client/firefox/files/firefox-x11.sh delete mode 100644 www-client/firefox/files/firefox.sh (limited to 'www-client/firefox/files') diff --git a/www-client/firefox/files/firefox-wayland.sh b/www-client/firefox/files/firefox-wayland.sh deleted file mode 100644 index 44280250fb9d..000000000000 --- a/www-client/firefox/files/firefox-wayland.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# -# Run Mozilla Firefox under Wayland -# -export MOZ_ENABLE_WAYLAND=1 -exec @PREFIX@/bin/firefox "$@" diff --git a/www-client/firefox/files/firefox-x11.sh b/www-client/firefox/files/firefox-x11.sh deleted file mode 100644 index 756556690cf3..000000000000 --- a/www-client/firefox/files/firefox-x11.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# -# Run Mozilla Firefox on X11 -# -export MOZ_DISABLE_WAYLAND=1 -exec @PREFIX@/bin/firefox "$@" diff --git a/www-client/firefox/files/firefox.sh b/www-client/firefox/files/firefox.sh deleted file mode 100644 index c08d555196d6..000000000000 --- a/www-client/firefox/files/firefox.sh +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/bash - -## -## Usage: -## -## $ firefox -## -## This script is meant to run Mozilla Firefox in Gentoo. - -cmdname=$(basename "$0") - -## -## Variables -## -MOZ_ARCH=$(uname -m) -case ${MOZ_ARCH} in - x86_64|s390x|sparc64) - MOZ_LIB_DIR="@PREFIX@/lib64" - SECONDARY_LIB_DIR="@PREFIX@/lib" - ;; - *) - MOZ_LIB_DIR="@PREFIX@/lib" - SECONDARY_LIB_DIR="@PREFIX@/lib64" - ;; -esac - -MOZ_FIREFOX_FILE="firefox" - -if [[ ! -r ${MOZ_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} ]]; then - if [[ ! -r ${SECONDARY_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} ]]; then - echo "Error: ${MOZ_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} not found" >&2 - if [[ -d $SECONDARY_LIB_DIR ]]; then - echo " ${SECONDARY_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} not found" >&2 - fi - exit 1 - fi - MOZ_LIB_DIR="$SECONDARY_LIB_DIR" -fi -MOZILLA_FIVE_HOME="${MOZ_LIB_DIR}/firefox" -MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" -MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_FIREFOX_FILE}" -DESKTOP_FILE="firefox" - -## -## Enable Wayland backend? -## -if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then - if [[ -n "$WAYLAND_DISPLAY" ]]; then - DESKTOP_FILE="firefox-wayland" - export MOZ_ENABLE_WAYLAND=1 - fi -elif [[ -n ${MOZ_DISABLE_WAYLAND} ]]; then - DESKTOP_FILE="firefox-x11" -fi - -## -## Use D-Bus remote exclusively when there's Wayland display. -## -if [[ -n "${WAYLAND_DISPLAY}" ]]; then - export MOZ_DBUS_REMOTE=1 -fi - -## -## Make sure that we set the plugin path -## -MOZ_PLUGIN_DIR="plugins" - -if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then - MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR} -else - MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR} -fi - -if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then - MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR} -fi - -export MOZ_PLUGIN_PATH - -## -## Set MOZ_APP_LAUNCHER for gnome-session -## -export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}" - -## -## Disable the GNOME crash dialog, Moz has it's own -## -if [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]]; then - GNOME_DISABLE_CRASH_DIALOG=1 - export GNOME_DISABLE_CRASH_DIALOG -fi - -## -## Enable Xinput2 (#617344) -## - -# respect user settings -MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto} - -if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then - # enabling XINPUT2 should be safe for all wayland users - MOZ_USE_XINPUT2=1 -elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then - # XINPUT2 is known to cause problems for KWin users - MOZ_USE_XINPUT2=0 -elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then - # LXQt uses KWin - MOZ_USE_XINPUT2=0 -elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then - # should work on Mate, Xfce, FluxBox, OpenBox and all the others ... - MOZ_USE_XINPUT2=1 -fi - -[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2} - -# Don't throw "old profile" dialog box. -export MOZ_ALLOW_DOWNGRADE=1 - -## -## Route to the correct .desktop file to get proper -## name and actions -## -if [[ $@ != *"--name "* ]]; then - set -- --name "${DESKTOP_FILE}" "$@" -fi - -# Run the browser -exec ${MOZ_PROGRAM} "$@" -- cgit v1.2.3