[X2Go-Commits] [pale-moon] 215/216: debian/: merge in changes from downstream Debian packaging.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 16 02:43:38 CET 2019 

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

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

commit fb8c34185c16e1ca680379e20a98090bccd84a31
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 16 01:33:17 2019 +0100

    debian/: merge in changes from downstream Debian packaging.
    
    Remove obsolete splice patch file.
---
 debian/changelog                                   |  2 +
 debian/palemoon.dirs                               |  3 +-
 debian/palemoon.install.in                         | 10 ++--
 debian/palemoon.js                                 |  3 ++
 debian/palemoon.links.in                           |  3 +-
 debian/palemoon.mozconfig.in                       | 28 +++++-----
 ...extra-stuff-to-upstream-build-system-dire.patch |  2 +-
 ...am-build-system-create-debian-installer-M.patch |  2 +-
 debian/patches/fixes/Define-splice-constants.patch | 23 ---------
 debian/patches/series                              |  1 -
 debian/rules                                       | 60 +++++++++++++++-------
 11 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f3564d..09639e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium
   * New downstream version (28.3.1):
   * debian/:
     - Replace palemoon.desktop with upstream file (i.e., copy).
+    - Merge in changes from downstream Debian packaging. Remove obsolete
+      splice patch file.
 
  -- Mihai Moldovan <ionic at ionic.de>  Thu, 31 Jan 2019 01:36:58 +0100
 
diff --git a/debian/palemoon.dirs b/debian/palemoon.dirs
index 49e0b99..99f5378 100644
--- a/debian/palemoon.dirs
+++ b/debian/palemoon.dirs
@@ -1,4 +1,5 @@
-etc/palemoon
+# Check palemoon.install.in for a description of why this is disabled.
+#etc/palemoon
 usr/lib/mozilla/plugins
 usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
diff --git a/debian/palemoon.install.in b/debian/palemoon.install.in
index 6bb4f50..417172e 100644
--- a/debian/palemoon.install.in
+++ b/debian/palemoon.install.in
@@ -64,13 +64,16 @@ debian/palemoon.desktop usr/share/applications
 
 build-palemoon/dist/palemoon/browser/icons/mozicon128.png usr/share/palemoon/browser/icons/
 
-debian/palemoon.js etc/palemoon
+# The next file would require a special patch to enable searching a custom system directory
+# and a symlink to /etc/palemoon in there.
+# Palemoon developers do not want system-wide configuration support, so don't use that.
+#debian/palemoon.js etc/palemoon
 debian/vendor.js usr/share/palemoon/browser/defaults/preferences
 
 debian/debsearch.xml usr/share/palemoon/distribution/searchplugins/common
 
 # And more weird entries which we fix up.
-usr/lib/palemoon/browser/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\}
+usr/lib/palemoon/browser/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\}.xpi
 # Doesn't exist in Palemoon.
 #usr/lib/palemoon/browser/features
 
@@ -83,8 +86,7 @@ usr/lib/palemoon/browser/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\}
 usr/lib/palemoon/chrome.manifest
 usr/lib/palemoon/browser/chrome.manifest
 
-# Doesn't exist, so ignore.
-#usr/lib/palemoon/@ICU_DATA_FILE@
+usr/lib/palemoon/@ICU_DATA_FILE@
 
 # No GMP support, since that would mean also supporting EME (DRM).
 #usr/lib/palemoon/gmp-clearkey/0.1/clearkey.info
diff --git a/debian/palemoon.js b/debian/palemoon.js
index d963a96..0edd924 100644
--- a/debian/palemoon.js
+++ b/debian/palemoon.js
@@ -1,3 +1,6 @@
+// THIS FILE IS UNUSED AND WILL NOT BE INSTALLED!
+// Keeping it for downstream packaging sync.
+
 // This is the Debian specific preferences file for Palemoon
 // You can make any change in here, it is the purpose of this file.
 // You can, with this file and all files present in the
diff --git a/debian/palemoon.links.in b/debian/palemoon.links.in
index 23a8462..586bfbc 100644
--- a/debian/palemoon.links.in
+++ b/debian/palemoon.links.in
@@ -5,7 +5,8 @@
 /usr/share/palemoon/browser/chrome/icons/default/default48.png /usr/share/icons/hicolor/48x48/apps/palemoon.png
 /usr/share/palemoon/browser/chrome/icons/default/default48.png /usr/share/pixmaps/palemoon.png
 
-/etc/palemoon /usr/share/palemoon/browser/defaults/syspref
+# Check palemoon.install.in for a description of why this is disabled.
+#/etc/palemoon /usr/share/palemoon/browser/defaults/syspref
 
 /usr/share/palemoon/browser/icons /usr/lib/palemoon/browser/icons
 /usr/share/palemoon/browser/chrome /usr/lib/palemoon/browser/chrome
diff --git a/debian/palemoon.mozconfig.in b/debian/palemoon.mozconfig.in
index d6e55a0..23203f4 100644
--- a/debian/palemoon.mozconfig.in
+++ b/debian/palemoon.mozconfig.in
@@ -16,44 +16,40 @@ ac_add_options --enable-default-toolkit=cairo-gtk2
 # 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
+ac_add_options --with-system-zlib # MOZ_SYSTEM_ZLIB=1
 %endif
 %if USE_SYSTEM_BZ2
-ac_add_options --with-system-bz2 # MOZ_NATIVE_BZ2=1
+ac_add_options --with-system-bz2 # MOZ_SYSTEM_BZ2=1
 %endif
-ac_add_options --disable-gconf
+# Palemoon wants gconf for some reason.
+# ac_add_options --disable-gconf
 ac_add_options --enable-readline
 %if USE_SYSTEM_HUNSPELL
-ac_add_options --enable-system-hunspell # MOZ_NATIVE_HUNSPELL=1
+ac_add_options --enable-system-hunspell # MOZ_SYSTEM_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
+ac_add_options --enable-system-ffi # MOZ_SYSTEM_FFI=1
 %endif
 %if USE_SYSTEM_LIBEVENT
-ac_add_options --with-system-libevent # MOZ_NATIVE_LIBEVENT=1
+ac_add_options --with-system-libevent # MOZ_SYSTEM_LIBEVENT=1
 %endif
 %if USE_SYSTEM_NSPR
-ac_add_options --with-system-nspr # MOZ_NATIVE_NSPR=1
+ac_add_options --with-system-nspr # MOZ_SYSTEM_NSPR=1
 %endif
 %if USE_SYSTEM_NSS
-ac_add_options --with-system-nss # MOZ_NATIVE_NSS=1
+ac_add_options --with-system-nss # MOZ_SYSTEM_NSS=1
 %endif
 %if USE_SYSTEM_SQLITE
-ac_add_options --enable-system-sqlite # MOZ_NATIVE_SQLITE=1
+ac_add_options --enable-system-sqlite # MOZ_SYSTEM_SQLITE=1
 %endif
 %if USE_SYSTEM_VPX
-ac_add_options --with-system-libvpx # MOZ_NATIVE_LIBVPX=1
+ac_add_options --with-system-libvpx # MOZ_SYSTEM_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.
diff --git a/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch
index da84ac3..086adb5 100644
--- a/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch
+++ b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch
@@ -8,7 +8,7 @@ Subject: Add debian/extra-stuff to upstream build system directory traversal
 
 --- a/moz.build
 +++ b/moz.build
-@@ -70,4 +70,7 @@ if not CONFIG['JS_STANDALONE']:
+@@ -85,4 +85,7 @@ if not CONFIG['JS_STANDALONE'] and CONFI
      # Bring in the configuration for the configured application.
      include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild')
  
diff --git a/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch b/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch
index 7307c4c..b97b48f 100644
--- a/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch
+++ b/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch
@@ -8,7 +8,7 @@ Subject: Make upstream build system create debian/installer/Makefile
 
 --- a/moz.build
 +++ b/moz.build
-@@ -73,4 +73,6 @@ if not CONFIG['JS_STANDALONE']:
+@@ -88,4 +88,6 @@ if not CONFIG['JS_STANDALONE'] and CONFI
  if not CONFIG['LIBXUL_SDK']:
      DIRS += ['debian/extra-stuff']
  
diff --git a/debian/patches/fixes/Define-splice-constants.patch b/debian/patches/fixes/Define-splice-constants.patch
deleted file mode 100644
index 1ca1793..0000000
--- a/debian/patches/fixes/Define-splice-constants.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/dom/system/OSFileConstants.cpp
-+++ b/dom/system/OSFileConstants.cpp
-@@ -491,6 +491,20 @@ static const dom::ConstantSpec gLibcProp
-   INT_CONSTANT(F_RDLCK),
-   INT_CONSTANT(F_WRLCK),
-   INT_CONSTANT(F_UNLCK),
-+
-+  // splice
-+#if defined(SPLICE_F_MOVE)
-+  INT_CONSTANT(SPLICE_F_MOVE),
-+#endif // defined(SPLICE_F_MOVE)
-+#if defined(SPLICE_F_NONBLOCK)
-+  INT_CONSTANT(SPLICE_F_NONBLOCK),
-+#endif // defined(SPLICE_F_NONBLOCK)
-+#if defined(SPLICE_F_MORE)
-+  INT_CONSTANT(SPLICE_F_MORE),
-+#endif // defined(SPLICE_F_MORE)
-+#if defined(SPLICE_F_GIFT)
-+  INT_CONSTANT(SPLICE_F_GIFT),
-+#endif // defined(SPLICE_F_GIFT)
- #endif // defined(XP_UNIX)
-   // copyfile
- #if defined(COPYFILE_DATA)
diff --git a/debian/patches/series b/debian/patches/series
index b47c9a9..0c0ca9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch
 debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch
 
-fixes/Define-splice-constants.patch
diff --git a/debian/rules b/debian/rules
index e11c433..5b508d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,10 @@ ifeq (,$(filter wheezy jessie,$(DIST)))
 SYSTEM_LIBS += vpx
 endif
 
-# Palemoon's official branding explicitly disallows using system libraries. Do tell...
+# Palemoon's official branding explicitly disallows using system libraries.
+# This is horrible from a distribution standpoint, because bundled software is
+# a huge problem security- and maintenance-wise.
+# Still, adhere to the policy.
 SYSTEM_LIBS =
 
 define system_lib
@@ -46,13 +49,19 @@ else
 # Use the system default.
 endif
 
-OFFICIAL_BRANDING := browser/branding/official
+OFFICIAL_BRANDING := application/palemoon/branding/official
 MOZILLA_OFFICIAL := 1
+BUILDING_RELEASE := 1
+MC_OFFICIAL := 1
+MC_PALEMOON := 1
 BRANDING ?= $(OFFICIAL_BRANDING)
 
 # Leave rust out, it's unsupported and unimplemented.
 
-GTK3 ?= $(shell grep -q "_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk3" configure.in && echo 1)
+GTK3 ?= $(shell grep -q "platform_choices = .'cairo-gtk3'" toolkit/moz.configure && echo 1)
+
+# Hardcode GTK2 for now.
+GTK3=0
 
 BRANDING_CONFIGURE_FLAG = $(if $(filter $(BRANDING),$(OFFICIAL_BRANDING)),--enable-official-branding --enable-official-vendor,--with-branding=$(BRANDING) --disable-official-vendor)
 
@@ -70,7 +79,7 @@ LDFLAGS += -Wl,--no-keep-memory
 # Also add execution time and memory usage stats in the logs
 LDFLAGS += -Wl,--stats
 
-AUTOCONF_DIRS := build/autoconf js/src/build/autoconf
+AUTOCONF_DIRS := build/autoconf
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CONFIGURE_FLAGS += --disable-optimize
@@ -79,6 +88,9 @@ endif
 ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 	CONFIGURE_FLAGS += --enable-debug
 endif
+ifneq (,$(filter %i386 %amd64,$(DEB_BUILD_ARCH)))
+	MOZ_FFVPX = 1
+endif
 ifneq (,$(filter i386 amd64 armel armhf,$(DEB_BUILD_ARCH)))
 	CRASH_REPORTER = 1
 endif
@@ -101,9 +113,13 @@ endif
 
 CXXFLAGS = $(CFLAGS)
 
-ICU_DATA_FILE = stub
+ifeq ($(DEB_BUILD_ARCH_ENDIAN),little)
+ICU_DATA_FILE = icudt58l.dat
+else
+ICU_DATA_FILE = icudt58b.dat
+endif
 
-EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MOZILLA_OFFICIAL ICU_DATA_FILE
+EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MOZILLA_OFFICIAL BUILDING_RELEASE MC_OFFICIAL MC_PALEMOON ICU_DATA_FILE
 $(call lazy,CONFIGURE_ENV,$$(foreach export,$(EXPORTS),$$(export)="$$($$(export))"))
 
 IN_FILES := $(wildcard debian/*.in)
@@ -119,7 +135,7 @@ debian/control: debian/rules debian/changelog
 
 DICT_DIR := /usr/share/hunspell
 
-$(PREPROCESSED_FILES): VARS = UPSTREAM_VERSION DICT_DIR MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) GTK3 DIST ICU_DATA_FILE CRASH_REPORTER RUST BUILD_RUST DEB_BUILD_ARCH
+$(PREPROCESSED_FILES): VARS = UPSTREAM_VERSION DICT_DIR MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) GTK3 DIST MOZ_FFVPX ICU_DATA_FILE CRASH_REPORTER RUST BUILD_RUST DEB_BUILD_ARCH
 
 $(PREPROCESSED_FILES):
 	$(PYTHON) python/mozbuild/mozbuild/preprocessor.py --marker % -Fsubstitution $(foreach var,$(VARS),-D$(var)="$($(var))" )$< > $@
@@ -138,7 +154,6 @@ stamps/prepare-configure:: stamps/dummy
 		done; \
 	done
 	$(MAKE) -f client.mk configure-files
-	chmod +x configure js/src/configure
 
 stamps/configure-check-palemoon:: stamps/configure-palemoon
 # Ensure --{with,enable}-system options properly set expected variables
@@ -163,6 +178,10 @@ stamps/configure-check-palemoon:: stamps/configure-palemoon
 
 stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig
 	$(if $(wildcard build-palemoon),,mkdir build-palemoon)
+ifeq ($(DEB_BUILD_ARCH_ENDIAN),big)
+	echo mk_add_options MOZ_OBJDIR=build-palemoon > build-palemoon/mozconfig.icu
+	cd build-palemoon && MOZCONFIG=mozconfig.icu ../mach python ../intl/icu_sources_data.py "$(CURDIR)"
+endif
 	cd build-palemoon && \
 	MOZCONFIG=$(CURDIR)/debian/palemoon.mozconfig \
 	ASFLAGS="-g" \
@@ -170,13 +189,12 @@ stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig
 	../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr $(CONFIGURE_FLAGS) \
 		--with-default-mozilla-five-home=$(LIB_DIR) \
 		$(BRANDING_CONFIGURE_FLAG)
-	sed -i "/MOZ_APP_REMOTINGNAME/s/r''' [^']* '''/r''' $(MOZ_APP_REMOTINGNAME) '''/" build-palemoon/config.status
+	sed -i "/MOZ_APP_REMOTINGNAME/s/'[^']*',/'$(MOZ_APP_REMOTINGNAME)',/" build-palemoon/config.status
 
 stamps/build-palemoon:: stamps/configure-check-palemoon
 	dh_auto_build --parallel --builddirectory=build-palemoon -- \
 		LD_LIBS=-Wl,--no-gc-sections \
-		_LEAKTEST_FILES=leaktest.py \
-		JS_READLINE=1
+		_LEAKTEST_FILES=leaktest.py
 
 override_dh_auto_build override_dh_auto_build-arch: stamps/build-palemoon
 
@@ -188,6 +206,10 @@ override_dh_auto_clean::
 	rm -rf stamps l10n
 	debian/rules debian/control TESTDIR=
 	
+ifeq ($(DEB_BUILD_ARCH_ENDIAN),big)
+	rm -f config/external/icu/data/$(ICU_DATA_FILE)
+endif
+	
 	dh_auto_clean --builddirectory=build-palemoon
 	find . -name "*.pyc" -o -name "*.pyo" | xargs --no-run-if-empty rm -f
 	
@@ -209,7 +231,6 @@ endif
 
 stamps/install-palemoon:: build-palemoon/debian/installer/package-manifest
 ifneq (,$(filter mips,$(DEB_BUILD_ARCH)))
-	# Failures are not fatal, since this old base doesn't seem to even have a greprefs.js file.
 	sed -i '/"javascript.options.\(baselinejit\|ion\)"/s/true/false/' build-palemoon/dist/bin/greprefs.js || :
 endif
 	dh_auto_install --builddirectory=build-palemoon -- installdir=$(LIB_DIR) \
@@ -223,7 +244,8 @@ endif
 	
 	# SDK stuff is typically installed into a versioned directory, but we don't need this additional complexity.
 	# Additionally, Mozilla stopped bundling SDKs as part of the XUL/XPCOM deprecation in favor of WebExtensions, so if PM decided to follow this path, we can easily drop the -dev package, too.
-	# For now, just move the versioned content over to the palemoon-devel directory.
+	# For now, that doesn't seem likely, since XUL is one of the features PM tries to preserve.
+	# Just move the versioned content over to the palemoon-devel directory.
 	# Likewise for the include files.
 	mkdir -p debian/tmp/$(LIB_DIR)-devel
 	mv debian/tmp/$(LIB_DIR)-devel-$(UPSTREAM_VERSION)/* debian/tmp/$(LIB_DIR)-devel/
@@ -277,11 +299,12 @@ endif
 	rmdir debian/tmp/usr/share/idl
 	rmdir debian/tmp/usr/share
 
-MPL-1.1: gfx/cairo/cairo/COPYING-MPL-1.1
-	cp -f $< $@
-
-MPL-2.0: b2g/LICENSE
-	cp -f $< $@
+# PM copied these files manually, but keep rules here for downstream packaging sync.
+#MPL-1.1: gfx/cairo/cairo/COPYING-MPL-1.1
+#	cp -f $< $@
+#
+#MPL-2.0: b2g/LICENSE
+#	cp -f $< $@
 
 override_dh_installdocs: MPL-1.1 MPL-2.0
 	dh_installdocs -A $^
@@ -330,5 +353,4 @@ binary binary-arch binary-indep build build-arch build-indep clean install:
 $(shell awk -F:: '$$1 ~ /^stamps\// && !/%/ { print $$1 }' debian/rules) stamps/dummy::
 	@mkdir -p stamps
 	$(if $(wildcard $@),,touch $@)
-
 endif

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

More information about the x2go-commits mailing list