[X2Go-Commits] [pale-moon] 118/216: debian/palemoon.mozconfig.in: sync with Debian's Firefox package.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit 1262953420d4c321cdb6307e727b6c71716328b3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Sep 20 23:41:48 2018 +0200

    debian/palemoon.mozconfig.in: sync with Debian's Firefox package.
---
 debian/changelog             |  2 ++
 debian/palemoon.mozconfig.in | 74 +++++++++++++++++++++++++++++++++++++-------
 2 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57f4c7e..c416182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -166,6 +166,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Sync with Debian Firefox package.
   * debian/palemoon.prerm:
     - Sync with Debian Firefox package.
+  * debian/palemoon.mozconfig.in:
+    - Sync with Debian's Firefox package.
 
  -- Mihai Moldovan <ionic at ionic.de>  Mon, 28 May 2018 03:44:10 +0200
 
diff --git a/debian/palemoon.mozconfig.in b/debian/palemoon.mozconfig.in
index d64b3b1..1ed5496 100644
--- a/debian/palemoon.mozconfig.in
+++ b/debian/palemoon.mozconfig.in
@@ -1,17 +1,67 @@
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZ_CO_PROJECT=browser
-ac_add_options --enable-official-branding
-ac_add_options --enable-application=browser
+# Please don't use this mozconfig unless you are planning to build
+# packages for Debian or a derivative.
+. $topsrcdir/browser/config/mozconfig
+ac_add_options --with-app-name=palemoon
 ac_add_options --enable-release
-ac_add_options --disable-installer
+ac_add_options --prefix=/usr
+# Typically, we'd have to use GTK3 nowadays, but Palemoon's GTK3 status is...
+# unknown.
+%if GTK3
+ac_add_options --enable-default-toolkit=cairo-gtk3
+%else
+ac_add_options --enable-default-toolkit=cairo-gtk2
+%endif
+# This one is FAKE/unusable! Luckily Palemoon uses a different geolocation
+# service that does not require an API key anyway.
+ac_add_options --with-mozilla-api-keyfile=$topsrcdir/debian/mls.key
+# Palemoon didn't rename USE_NATIVE_... to USE_SYSTEM_..., so we'll have to
+# keep the old notation for now.
+# The USE_SYSTEM_FOO substitution variables are actually Debian-additions, even
+# if they make look like Mozbuild variables, so keep them as they are.
+# N.B.: They did, however, rename the configure arguments to --with-system-...
+# and set MOZ_NATIVE_FOO internally.
+%if USE_SYSTEM_ZLIB
+ac_add_options --with-system-zlib # MOZ_NATIVE_ZLIB=1
+%endif
+%if USE_SYSTEM_BZ2
+ac_add_options --with-system-bz2 # MOZ_NATIVE_BZ2=1
+%endif
+ac_add_options --disable-gconf
+ac_add_options --enable-readline
+%if USE_SYSTEM_HUNSPELL
+ac_add_options --enable-system-hunspell # MOZ_NATIVE_HUNSPELL=1
+%endif
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
+ac_add_options --enable-startup-notification
+%if USE_SYSTEM_FFI
+ac_add_options --enable-system-ffi # MOZ_NATIVE_FFI=1
+%endif
+%if USE_SYSTEM_LIBEVENT
+ac_add_options --with-system-libevent # MOZ_NATIVE_LIBEVENT=1
+%endif
+%if USE_SYSTEM_NSPR
+ac_add_options --with-system-nspr # MOZ_NATIVE_NSPR=1
+%endif
+%if USE_SYSTEM_NSS
+ac_add_options --with-system-nss # MOZ_NATIVE_NSS=1
+%endif
+%if USE_SYSTEM_SQLITE
+ac_add_options --enable-system-sqlite # MOZ_NATIVE_SQLITE=1
+%endif
+%if USE_SYSTEM_VPX
+ac_add_options --with-system-libvpx # MOZ_NATIVE_LIBVPX=1
+%endif
 ac_add_options --disable-updater
+ac_add_options --enable-pie
+# Palemoon does not support Rust yet. The option won't make the build fail,
+# though, so keep it.
+%if BUILD_RUST
+ac_add_options --enable-rust
+%endif
+ac_add_options --enable-alsa
+# Palemoon-specific flags.
+ac_add_options --disable-necko-wifi
 ac_add_options --with-pthreads
-ac_add_options --enable-shared-js
 ac_add_options --enable-jemalloc
-ac_add_options --enable-strip
-ac_add_options --x-libraries=/usr/lib
-ac_add_options --prefix=/usr
 ac_add_options --enable-devtools
-ac_add_options --disable-necko-wifi
-ac_add_options --disable-installer
-ac_add_options --disable-updater

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git