[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 66872a5bfa7ece77d508549a17423e89e48af9f8
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 11:04:01 2014 +0200

    Set --as-needed linker flag in rules.
---
 debian/changelog                        |  2 ++
 debian/patches/01_lflags_as-needed.diff | 18 ------------------
 debian/patches/series                   |  1 -
 debian/rules                            |  2 ++
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac39d60..dc71f57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
     - remove upstream_changeset_r113848.diff, applied upstream 
     - remove upstream_Build-fixes-for-glib-2.31.diff, applied upstream
     - add build fix: upstream_changeset_119798.patch
+    - remove 01_lflags_as-needed.diff
+      and set --as-needed linker flag, to avoid useless linking, in debian/rules
   * Switch to building with ./Tools/Scripts/build-webkit as recommended
     by upstream
 
diff --git a/debian/patches/01_lflags_as-needed.diff b/debian/patches/01_lflags_as-needed.diff
deleted file mode 100644
index 48efeda..0000000
--- a/debian/patches/01_lflags_as-needed.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: set --as-needed linker flag to avoid useless linking.
-Author: Fathi Boudra <fabo at debian.org>
-
----
- Source/WebKit.pri |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/Source/WebKit.pri
-+++ b/Source/WebKit.pri
-@@ -100,6 +100,8 @@ win32-g++* {
- CONFIG -= warn_on
- *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
- 
-+*-g++*:QMAKE_LFLAGS += -Wl,--as-needed
-+
- # Treat warnings as errors on x86/Linux/GCC
- linux-g++* {
-     isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
diff --git a/debian/patches/series b/debian/patches/series
index 7d0940a..4086e2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 # upstream patches
 upstream_changeset_119798.diff
 # debian patches
-01_lflags_as-needed.diff
 02_add_nostrip_for_debug_packages.diff
 03_hide_std_symbols.diff
 04_enable_debug_information.diff
diff --git a/debian/rules b/debian/rules
index ed2d9b2..6225f19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+
 # Filter -g from environment on troublesome arches. Replace it with -gstabs
 # See also: stabs_format_debug_info.diff
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

-- 
QtWebKit packaging