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

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit cf710cb89750238d13dbd7231b13948569e0b7bd
Author: Sandro Knauß <hefee at debian.org>
Date:   Wed Jan 4 15:16:55 2017 +0100

    Move logic to disable debug symbols form patch to .gmake.conf
---
 debian/changelog                                   |  2 +-
 .../patches/disable_debug_symbols_completly.patch  | 27 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  2 ++
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6098a57..24e45bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ qtwebengine-opensource-src (5.7.1+dfsg-2) UNRELEASED; urgency=medium
     porterboxes
   * Make ld not cache the symbol tables of input files in memory to
     avoid memory exhaustion during the linking phase.
-  * Add patch to disable debug symbols build completly.
+  * Disable debug symbols build and push this info to gyp.
   * Bump symbols from pre 5.7.1 to 5.7.1.
   * Add symbols from i386.
 
diff --git a/debian/patches/disable_debug_symbols_completly.patch b/debian/patches/disable_debug_symbols_completly.patch
deleted file mode 100644
index adde2cd..0000000
--- a/debian/patches/disable_debug_symbols_completly.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Disable any debug symbols from gyp
- As Debian portboxes have limited space, we can't affort it to build
- with debug symbols enabled.
-Author: Sandro Knauß <hefee at debian.org>
-Last-Update: 2017-01-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/core/gyp_run.pro
-+++ b/src/core/gyp_run.pro
-@@ -24,12 +24,12 @@ GYP_CONFIG += disable_glibcxx_debug=1
- !webcore_debug: GYP_CONFIG += remove_webcore_debug_symbols=1
- !v8base_debug: GYP_CONFIG += remove_v8base_debug_symbols=1
- 
--linux:contains(QT_CONFIG, separate_debug_info): GYP_CONFIG += linux_dump_symbols=1
-+#linux:contains(QT_CONFIG, separate_debug_info): GYP_CONFIG += linux_dump_symbols=1
- 
--force_debug_info {
--    win32: GYP_CONFIG += win_release_extra_cflags=-Zi
--    else: GYP_CONFIG += release_extra_cflags=-g
--}
-+#force_debug_info {
-+#    win32: GYP_CONFIG += win_release_extra_cflags=-Zi
-+#    else: GYP_CONFIG += release_extra_cflags=-g
-+#}
- 
- !warnings_are_errors: GYP_CONFIG += disable_fatal_linker_warnings=1
- 
diff --git a/debian/patches/series b/debian/patches/series
index 22d57b0..9dcd921 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use_system_re2.patch
 add_mips_support.patch
-disable_debug_symbols_completly.patch
diff --git a/debian/rules b/debian/rules
index 6b694c1..41d19a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,8 @@ else
 # Disable debugging symbols in all the other archs.
 	echo "QMAKE_CXXFLAGS -= -g" >> .qmake.conf
 	echo "QMAKE_CXXFLAGS -= -gstabs" >> .qmake.conf
+	echo "QT_CONFIG -= force_debug_info" >> .qmake.conf
+	echo "QT_CONFIG -= seperate_debug_info" >> .qmake.conf
 endif
 
 # Disable JIT on selected architectures

-- 
qtwebengine packaging