[SCM] qtwebengine packaging branch, master, updated. debian/5.7.1+dfsg-5-1-g66979d4

Sandro Knauß hefee at moszumanska.debian.org
Wed Jan 18 19:58:06 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=66979d4

The following commit has been merged in the master branch:
commit 66979d4f98df4cc142f322409ac889329f91b945
Author: Sandro Knauß <hefee at debian.org>
Date:   Wed Jan 18 20:56:39 2017 +0100

    make small archs not fail
---
 debian/changelog | 7 +++++++
 debian/rules     | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 98b0f68..d41d4b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtwebengine-opensource-src (5.7.1+dfsg-6) unstable; urgency=medium
+
+  [ Sandro Knauß ]
+  * Make it buildable on small archs again.
+
+ -- Sandro Knauß <hefee at debian.org>  Wed, 18 Jan 2017 19:08:01 +0100
+
 qtwebengine-opensource-src (5.7.1+dfsg-5) unstable; urgency=medium
 
   [ Sandro Knauß ]
diff --git a/debian/rules b/debian/rules
index 2123fc1..0a696e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,10 @@ replace_gyp_args = $(foreach define,$(defines),-D$(define))
 
 defines += use_proprietary_codecs use_system_ffmpeg
 
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(small_architectures)))
+	defines += reduce_binary_size
+endif
+
 touch_files = src/3rdparty/chromium/third_party/analytics/google-analytics-bundle.js \
 	      src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/acorn.js \
 	      src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/diff/diff_match_patch.js \
@@ -114,7 +118,6 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_pch_architectur
 endif
 
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(small_architectures)))
-	defines += reduce_binary_size
 	echo "QMAKE_CXXFLAGS += --param ggc-min-expand=20" >> .qmake.conf
 	echo "QMAKE_CFLAGS += --param ggc-min-expand=20" >> .qmake.conf
 	echo "QMAKE_LFLAGS -= Wl,--gc-sections" >> .qmake.conf

-- 
qtwebengine packaging



More information about the pkg-kde-commits mailing list