tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

firefox: add wayland option

Browse Source 
Also adds firefox-{wayland,x11} scripts to launch either the
wayland version of FF (somewhat broken) or the X11 version of FF.

[ci skip]
This commit is contained in:
Rasmus Thomsen 2019-01-24 15:04:56 +01:00 committed by Johannes
parent 997adfa157
commit b8fdfdf9b2
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
srcpkgs/firefox/files/firefox-wayland Normal file
View File

@ -0,0 +1,5 @@
#!/bin/sh
export GDK_BACKEND=wayland
exec /usr/lib/firefox/firefox "$@"

5
srcpkgs/firefox/files/firefox-x11 Normal file
View File

@ -0,0 +1,5 @@
#!/bin/sh
export GDK_BACKEND=x11
exec /usr/lib/firefox/firefox "$@"

13
srcpkgs/firefox/template
View File

@ -4,7 +4,7 @@
# #
pkgname=firefox pkgname=firefox
version=64.0.2 version=64.0.2
revision=2 revision=3
short_desc="Mozilla Firefox web browser" short_desc="Mozilla Firefox web browser"
maintainer="Juan RP <xtraeme@voidlinux.org>" maintainer="Juan RP <xtraeme@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
@ -27,8 +27,8 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme" depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme"
conflicts="firefox-esr>=0" conflicts="firefox-esr>=0"
build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio" build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio" build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
armv6*) armv6*)
@ -139,6 +139,7 @@ ac_add_options $(vopt_enable dbus)
ac_add_options $(vopt_enable dbus necko-wifi) ac_add_options $(vopt_enable dbus necko-wifi)
ac_add_options $(vopt_enable pulseaudio) ac_add_options $(vopt_enable pulseaudio)
ac_add_options $(vopt_enable startup_notification startup-notification) ac_add_options $(vopt_enable startup_notification startup-notification)
ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3')
! !
rm -f old-configure rm -f old-configure
@ -160,4 +161,10 @@ do_install() {
# https://bugzilla.mozilla.org/show_bug.cgi?id=658850 # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
ln -sf firefox ${DESTDIR}/usr/lib/firefox/firefox-bin ln -sf firefox ${DESTDIR}/usr/lib/firefox/firefox-bin
vbin ${FILESDIR}/firefox-x11
vbin ${FILESDIR}/firefox-wayland
# Default to x11 for now, FF wayland is somewhat broken
ln -sf /usr/bin/firefox-x11 ${DESTDIR}/usr/bin/firefox
} }