wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-08 16:13:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

firefox: template cleanup

Browse source 
- remove obsolete gtk3 build option
- stylo now works on 32-bits too
This commit is contained in:
Alessio Sergi 2017-12-20 18:40:22 +01:00
parent 9cfb0ad889
commit d256097d85
2 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/firefox/files/mozconfig
View file

@ -42,6 +42,10 @@ ac_add_options --disable-strip
ac_add_options --disable-profiling
ac_add_options --enable-optimize="$CFLAGS"
ac_add_options --enable-pie
# https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
ac_add_options BINDGEN_CFLAGS="-I/usr/include/nspr -I/usr/include/pixman-1"
# needed to enable stylo at runtime by default
ac_add_options --enable-stylo
ac_add_options --enable-release
ac_add_options --enable-official-branding

38
srcpkgs/firefox/template
View file

@ -14,18 +14,18 @@ lib32disabled=yes
hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm rust cargo
llvm clang"
makedepends="nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel
sqlite-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel
hunspell-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel
$(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel)
$(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel)
makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx-devel
libXrender-devel hunspell-devel libXcomposite-devel libSM-devel libXt-devel
libXdamage-devel $(vopt_if alsa alsa-lib-devel)
$(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if startup_notification startup-notification-devel)
$(vopt_if xscreensaver libXScrnSaver-devel)"
depends="nss>=3.33 desktop-file-utils hicolor-icon-theme"
conflicts="firefox-esr>=0"
build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver"
build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver"
build_options="alsa dbus pulseaudio startup_notification xscreensaver"
build_options_default="alsa dbus pulseaudio startup_notification xscreensaver"
post_extract() {
case "$XBPS_TARGET_MACHINE" in
@ -47,19 +47,6 @@ post_extract() {
do_build() {
cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
case "$XBPS_TARGET_MACHINE" in
x86_64*)
# https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
echo "ac_add_options BINDGEN_CFLAGS='-I/usr/include/nspr -I/usr/include/pixman-1'" >>.mozconfig
# needed to enable stylo at runtime by default
echo "ac_add_options --enable-stylo" >>.mozconfig
;;
i686*)
# https://bugzilla.mozilla.org/show_bug.cgi?id=1401093
echo "ac_add_options --disable-stylo" >>.mozconfig
;;
esac
case "$XBPS_TARGET_MACHINE" in
*-musl)
echo "ac_add_options --disable-jemalloc" >>.mozconfig
@ -79,16 +66,8 @@ do_build() {
echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig
fi
if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
# Append CFLAGS and CXXFLAGS to set work around code which gcc6 would
# otherwise regard as out-of-specification and allow it to produce a
# working program.
export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
fi
case "$XBPS_TARGET_MACHINE" in
i686)
i686*)
export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
;;
@ -105,7 +84,6 @@ do_build() {
cat <<! >>.mozconfig
ac_add_options --with-google-api-keyfile="${wrksrc}/google-api-key"
ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key"
ac_add_options --enable-default-toolkit=cairo-gtk$(vopt_if gtk3 '3' '2')
ac_add_options $(vopt_enable alsa)
ac_add_options $(vopt_enable dbus)
ac_add_options $(vopt_enable dbus necko-wifi)