mirror of
https://gitdl.cn/https://github.com/chakralinux/gtk.git
synced 2025-02-03 12:47:17 +08:00
firefox-kde: update to 57.0b14
- use Arch/Gentoo approach on mozconfig - remove *.js while generate them in PKGBUILD directly - remove fixed patch for various bug (see previous commit) - disable stylo by default (won't compile even without system nss/nspr)
This commit is contained in:
Chaoting Liu
parent
4f562bf201
commit
585892e89d
@ -40,11 +40,8 @@ _kmozillahelper_commit=47e708e
|
||||
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
|
||||
source=("https://download-installer.cdn.mozilla.net/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz"
|
||||
"git://github.com/openSUSE/kmozillahelper#commit=${_kmozillahelper_commit}"
|
||||
'mozconfig'
|
||||
'firefox.desktop'
|
||||
'firefox-install-dir.patch'
|
||||
'vendor.js'
|
||||
'kde.js'
|
||||
'pgo-fix-missing-kdejs.patch'
|
||||
'wifi-disentangle.patch'
|
||||
'wifi-fix-interface.patch'
|
||||
@ -76,12 +73,9 @@ source=("https://download-installer.cdn.mozilla.net/pub/firefox/releases/${pkgve
|
||||
)
|
||||
sha1sums=('cc3f8154a35833d34b36b4134d0a281b1b9f8614'
|
||||
'SKIP'
|
||||
'992db40f6b4f4f2d41afae76a149d54ca1a2fdbb'
|
||||
'1a8ecc6d2cfd97791d8182882a74929f2a7289e9'
|
||||
'693b54b9206ad854e4d75cbbf393029b77e82153'
|
||||
'a77df52cedb94f38ec3d94fc19bb40d120729fc1'
|
||||
'ce48f8e5065319e191a7389539ec663dc8a919d7'
|
||||
'e480985ad1c4277e48a7d69c07258f0d7e97a977'
|
||||
'12327a932bdb70d884277a7b781d2d17bff78b1c'
|
||||
'b979e1a2f3361fe76dbe2766d48033bf20e3d619'
|
||||
'8b38e2640c848adbc0cffa93918ff42fa9bbdea1'
|
||||
'46b5904abb4e9646f8173c739bd4f8260e010b7e'
|
||||
@ -112,7 +106,6 @@ _mozilla_api_key=bf05f841-e0bd-4644-81f5-3c132755f2e9
|
||||
prepare() {
|
||||
cd ${srcdir}/firefox-${pkgver}/
|
||||
|
||||
cp ../mozconfig .mozconfig
|
||||
patch -Np1 -i ../firefox-install-dir.patch
|
||||
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
|
||||
@ -129,11 +122,80 @@ prepare() {
|
||||
patch -Np1 -i ../no-plt.diff
|
||||
|
||||
echo -n "$_google_api_key" > google-api-key
|
||||
echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
|
||||
|
||||
echo -n "$_mozilla_api_key" > mozilla-api-key
|
||||
echo "ac_add_options --with-mozilla-api-keyfile=\"$PWD/mozilla-api-key\"" >>.mozconfig
|
||||
|
||||
msg 'Generating kde.js'
|
||||
cat >kde.js <<END
|
||||
pref("browser.preferences.instantApply", false);
|
||||
pref("browser.backspace_action", 0);
|
||||
END
|
||||
|
||||
msg 'Generating mozconfig'
|
||||
cat >.mozconfig <<END
|
||||
# There multiple default mozconfigs in the soruce tree with references across directories
|
||||
# $topsrcdir/build/unix/mozconfig.gtk
|
||||
# $topsrcdir/build/unix/mozconfig.linux
|
||||
# $topsrcdir/build/mozconfig.common
|
||||
# $topsrcdir/browser/config/mozconfigs/linux64/release
|
||||
# $topsrcdir/browser/config/mozconfigs/linux64/common-opt
|
||||
# $topsrcdir/browser/config/mozconfig
|
||||
# $topsrcdir/build/mozconfig.rust
|
||||
# But we intend to mantain our own mozconfig without reference to any of the mozilla upstream configuration to keep it simple
|
||||
# This mozconfig would inlcude most of the configurations listed above into one file
|
||||
|
||||
ac_add_options --prefix=/usr
|
||||
ac_add_options --enable-release
|
||||
ac_add_options --enable-pie
|
||||
ac_add_options --enable-gold
|
||||
ac_add_options --enable-optimize="-O2"
|
||||
ac_add_options --enable-jemalloc
|
||||
ac_add_options --enable-pthreads
|
||||
ac_add_options --disable-stylo
|
||||
|
||||
# Release branding
|
||||
ac_add_options --enable-application=browser
|
||||
ac_add_options --enable-official-branding
|
||||
ac_add_options --enable-update-channel=release
|
||||
ac_add_options --with-distribution-id=org.chakralinux
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk3
|
||||
export MOZILLA_OFFICIAL=1
|
||||
export MOZ_TELEMETRY_REPORTING=1
|
||||
export MOZ_ADDON_SIGNING=1
|
||||
export MOZ_REQUIRE_SIGNING=1
|
||||
|
||||
# Keys
|
||||
ac_add_options --with-google-api-keyfile=${PWD@Q}/google-api-key
|
||||
ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key
|
||||
|
||||
# System libraries
|
||||
ac_add_options --with-system-jpeg
|
||||
ac_add_options --with-system-zlib
|
||||
ac_add_options --with-system-bz2
|
||||
ac_add_options --with-system-libevent
|
||||
ac_add_options --with-system-libvpx
|
||||
ac_add_options --with-system-nspr
|
||||
ac_add_options --with-system-nss
|
||||
ac_add_options --with-system-icu
|
||||
ac_add_options --enable-system-pixman
|
||||
ac_add_options --enable-system-hunspell
|
||||
ac_add_options --enable-system-sqlite
|
||||
ac_add_options --enable-system-ffi
|
||||
ac_add_options --enable-system-cairo
|
||||
ac_add_options --enable-libproxy
|
||||
ac_add_options --with-system-png
|
||||
|
||||
# Features
|
||||
ac_add_options --enable-startup-notification
|
||||
ac_add_options --enable-jack
|
||||
ac_add_options --disable-gconf
|
||||
ac_add_options --disable-updater
|
||||
ac_add_options --disable-crashreporter
|
||||
|
||||
# PGO
|
||||
mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
|
||||
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-ff
|
||||
STRIP_FLAGS="--strip-debug"
|
||||
END
|
||||
|
||||
msg "Gecko/toolkit patchset"
|
||||
patch -Np1 -i "$srcdir/mozilla-nongnome-proxies.patch"
|
||||
@ -203,8 +265,26 @@ package() {
|
||||
export SHELL=/bin/bash
|
||||
make -f client.mk DESTDIR="$pkgdir" MOZ_PKG_FATAL_WARNINGS=0 INSTALL_SDK= install
|
||||
|
||||
install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox/browser/defaults/preferences/vendor.js"
|
||||
install -Dm644 ../kde.js "$pkgdir/usr/lib/firefox/browser/defaults/preferences/kde.js"
|
||||
_vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
|
||||
install -Dm644 /dev/stdin "$_vendorjs" <<END
|
||||
// Use LANG environment variable to choose locale
|
||||
pref("intl.locale.matchOS", true);
|
||||
|
||||
// Disable default browser checking.
|
||||
pref("browser.shell.checkDefaultBrowser", false);
|
||||
pref("browser.search.defaultenginename", "DuckDuckGo");
|
||||
pref("browser.search.order.extra.duckduckgo", "DuckDuckGo");
|
||||
pref("browser.search.selectedEngine", "DuckDuckGo");
|
||||
|
||||
// Don't disable our bundled extensions in the application directory
|
||||
pref("extensions.autoDisableScopes", 11);
|
||||
pref("extensions.shownSelectionUI", true);
|
||||
|
||||
// Default e10s support to be enabled
|
||||
pref("browser.tabs.remote.autostart", true);
|
||||
END
|
||||
|
||||
install -Dm644 kde.js "$pkgdir/usr/lib/firefox/browser/defaults/preferences/kde.js"
|
||||
|
||||
_distini="$pkgdir/usr/lib/firefox/distribution/distribution.ini"
|
||||
install -Dm644 /dev/stdin "$_distini" <<END
|
||||
|
||||
@ -1 +0,0 @@
|
||||
pref("browser.preferences.instantApply", false);
|
||||
@ -1,62 +0,0 @@
|
||||
# There multiple default mozconfigs in the soruce tree with references across directories
|
||||
# $topsrcdir/build/unix/mozconfig.gtk
|
||||
# $topsrcdir/build/unix/mozconfig.linux
|
||||
# $topsrcdir/build/mozconfig.common
|
||||
# $topsrcdir/browser/config/mozconfigs/linux64/release
|
||||
# $topsrcdir/browser/config/mozconfigs/linux64/common-opt
|
||||
# $topsrcdir/browser/config/mozconfig
|
||||
# $topsrcdir/build/mozconfig.rust
|
||||
# But we intend to mantain our own mozconfig without reference to any of the mozilla upstream configuration to keep it simple
|
||||
# This mozconfig would inlcude most of the configurations listed above into one file
|
||||
|
||||
ac_add_options --prefix=/usr
|
||||
ac_add_options --enable-release
|
||||
ac_add_options --enable-pie
|
||||
ac_add_options --enable-gold
|
||||
ac_add_options --enable-optimize="-O2"
|
||||
ac_add_options --enable-jemalloc
|
||||
ac_add_options --enable-pthreads
|
||||
ac_add_options --disable-stylo
|
||||
|
||||
# Release branding
|
||||
ac_add_options --enable-application=browser
|
||||
ac_add_options --enable-official-branding
|
||||
ac_add_options --enable-update-channel=release
|
||||
ac_add_options --with-distribution-id=org.chakralinux
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk3
|
||||
export MOZILLA_OFFICIAL=1
|
||||
export MOZ_TELEMETRY_REPORTING=1
|
||||
export MOZ_ADDON_SIGNING=1
|
||||
export MOZ_REQUIRE_SIGNING=1
|
||||
|
||||
# System libraries
|
||||
ac_add_options --with-system-jpeg
|
||||
ac_add_options --with-system-zlib
|
||||
ac_add_options --with-system-bz2
|
||||
ac_add_options --with-system-libevent
|
||||
ac_add_options --with-system-libvpx
|
||||
ac_add_options --with-system-nspr
|
||||
ac_add_options --with-system-nss
|
||||
ac_add_options --with-system-icu
|
||||
ac_add_options --enable-system-pixman
|
||||
ac_add_options --enable-system-hunspell
|
||||
ac_add_options --enable-system-sqlite
|
||||
ac_add_options --enable-system-ffi
|
||||
# system cairo without layers acceleration results in choppy video playback
|
||||
ac_add_options --enable-system-cairo
|
||||
ac_add_options --enable-libproxy
|
||||
ac_add_options --with-system-png
|
||||
|
||||
# Features
|
||||
ac_add_options --enable-startup-notification
|
||||
ac_add_options --enable-jack
|
||||
ac_add_options --disable-gconf
|
||||
ac_add_options --disable-updater
|
||||
ac_add_options --disable-crashreporter
|
||||
|
||||
# PGO
|
||||
mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
|
||||
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-ff
|
||||
STRIP_FLAGS="--strip-debug"
|
||||
|
||||
# vim:set ft=sh:
|
||||
@ -4,6 +4,6 @@
|
||||
libs:: $(srcdir)/profile/channel-prefs.js
|
||||
$(NSINSTALL) -D $(DIST)/bin/defaults/pref
|
||||
$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
|
||||
+ cp $(topsrcdir)/../kde.js $(DIST)/bin/defaults/pref/kde.js
|
||||
+ cp $(topsrcdir)/kde.js $(DIST)/bin/defaults/pref/kde.js
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
// Use LANG environment variable to choose locale
|
||||
pref("intl.locale.matchOS", true);
|
||||
|
||||
// Disable default browser checking.
|
||||
pref("browser.shell.checkDefaultBrowser", false);
|
||||
pref("browser.search.defaultenginename", "DuckDuckGo");
|
||||
pref("browser.search.order.extra.duckduckgo", "DuckDuckGo");
|
||||
pref("browser.search.selectedEngine", "DuckDuckGo");
|
||||
|
||||
// Don't disable our bundled extensions in the application directory
|
||||
pref("extensions.autoDisableScopes", 11);
|
||||
pref("extensions.shownSelectionUI", true);
|
||||
|
||||
// Default e10s support to be enabled
|
||||
pref("browser.tabs.remote.autostart", true);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user