waterfox-g 6.0.2 rc1

1 files changed, 8 insertions, 31 deletions

diff --git a/waterfox-g/debian/rules b/waterfox-g/debian/rules
index 462dd96..21db460 100755
--- a/waterfox-g/debian/rules
+++ b/waterfox-g/debian/rules
@@ -5,60 +5,38 @@ export SHELL=/bin/bash
 export MOZCONFIG=$(shell pwd)/debian/mozconfig
 export MOZ_NOSPAM:=1
 export MOZ_SOURCE_REPO=https://github.com/WaterfoxCo/Waterfox
+# stackrpms,3
 export MOZ_SOURCE_CHANGESET=$(shell awk -F ': ' '/^commit:/ {print $$2; exit}' ../SOURCES/waterfox-g.obsinfo)
 export WF_VERSION=$(shell awk -F ': ' '/^version:/ {print "G"$$2; exit}' ../SOURCES/waterfox-g.obsinfo)
 export TODAY_DATE=$(shell date +%Y-%m-%d)
 export LC_ALL=C.UTF-8
-
-LDFLAGS += -Wl,--no-keep-memory -Wl,--no-mmap-output-file
-
-distrelease := $(shell lsb_release -sc)
-ifeq ($(distrelease),$(filter $(distrelease),stretch xenial))
-LDFLAGS += -static-libstdc++
-endif
-
-export LDFLAGS
-
 export JOBS=$(shell echo $(shell grep -c ^processor /proc/cpuinfo)\/2 | bc)
-
 export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 
 export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
+include /usr/share/dpkg/buildflags.mk
+export CXXFLAGS CFLAGS LDFLAGS
 
 %:
 	dh $@
 
+override_dh_auto_configure:
+
 override_dh_auto_clean:
 	dh_auto_clean
 	find . -name '*.pyc' -delete
 
 override_dh_auto_build:
-	# Upstream modifies version_display.txt using script included in GitHub Actions (version=git_tag),
-	# without patching. Debhelper won't allow us to do that by same way and
-	# patching won't be much convenient, so we need to create new files.
-	mkdir -p $$(pwd)/debian/app_version
-	cp $$(pwd)/browser/config/version.txt $$(pwd)/debian/app_version/version.txt
-	echo $$WF_VERSION > $$(pwd)/debian/app_version/version_display.txt
-	# Build browser
-	# LTO needs more open files
-	ulimit -n 4096; xvfb-run -a -n 97 -s "-screen 0 1920x1080x24" ./mach build
-
-	# Build langpacks
-	mkdir -p $$(pwd)/extensions
-	# langpack-build can not be done in parallel easily (see https://bugzilla.mozilla.org/show_bug.cgi?id=1660943)
-	# Therefore, we have to have a separate obj-dir for each language
-	# We do this, by creating a mozconfig-template with the necessary switches
-	# and a placeholder obj-dir, which gets copied and modified for each language
-	sed -r '/^(ja-JP-mac|en-US|)$$/d;s/ .*$$//' debian/locales.shipped | cut -f1 -d":" \
-    | xargs -n 1 -P $$JOBS -I {} /bin/sh -c 'locale=$$1; cp debian/mozconfig_LANG mozconfig_$$locale; sed -i "s|obj_LANG|obj_$$locale|" mozconfig_$$locale; export MOZCONFIG=mozconfig_$$locale; ./mach build config/nsinstall langpack-$$locale; cp -L ../obj_$$locale/dist/linux-*/xpi/waterfox-g-$$WF_VERSION.$$locale.langpack.xpi \
-	$$(pwd)/extensions/langpack-$$locale@l10n.waterfox.net.xpi' -- {}
+	$$(pwd)/debian/build.sh
 
 override_dh_auto_install:
 	chmod +x $$(pwd)/debian/waterfox-g-bin.sh
+	# stackrpms,4
 	DESTDIR=$$(pwd)/debian/waterfox-g ./mach install
 	rm -rf $$(pwd)/debian/waterfox-g/usr/lib/waterfox-g/dictionaries
 	rm -rf $$(pwd)/debian/waterfox-g/usr/lib/waterfox-g/waterfox-g-bin
 	sed -i "s/__DATE__/$$TODAY_DATE/g" $$(pwd)/debian/waterfox-g.appdata.xml.in
+	# stackrpms,2
 	sed -e "s/__VERSION__/$$WF_VERSION/g" $$(pwd)/debian/waterfox-g.appdata.xml.in > $$(pwd)/debian/waterfox-g/usr/share/metainfo/waterfox-g.appdata.xml
 	mv $$(pwd)/debian/waterfox-g-wayland-bin.sh $$(pwd)/debian/waterfox-g-wayland/usr/bin/waterfox-g-wayland
 
@@ -66,4 +44,3 @@ override_dh_shlibdeps:
 	dh_shlibdeps -l /usr/lib/waterfox-g/waterfox-g
 
 override_dh_strip_nondeterminism:
-	dh_strip_nondeterminism -Xdebian/waterfox-g/usr/lib/waterfox-g/browser/features/formautofill@mozilla.org.xpi