[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.1+dfsg-3-2-gb2913ca

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit b2913ca81d6c7bf9b09bc80b68f466a1a2c0a325
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Mar 5 12:16:29 2014 -0300

    Backport dont_pollute_pri_and_pc_with_private_deps.patch.
---
 debian/changelog                                   |  4 ++
 ...dont_pollute_pri_and_pc_with_private_deps.patch | 47 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9ac790d..43e24a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebkit-opensource-src (5.2.1+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Backport dont_pollute_pri_and_pc_with_private_deps.patch to avoid
+    propagating wrong linker flags (Closes: #711307).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Mar 2014 12:13:03 -0300
 
 qtwebkit-opensource-src (5.2.1+dfsg-3) experimental; urgency=medium
diff --git a/debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch b/debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch
new file mode 100644
index 0000000..fb24c70
--- /dev/null
+++ b/debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch
@@ -0,0 +1,47 @@
+From 31a1ec780aaba33c1008b8dc7bca7da88bd297ff Mon Sep 17 00:00:00 2001
+From: Jocelyn Turcotte <jocelyn.turcotte at digia.com>
+Date: Tue, 28 Jan 2014 13:07:59 +0100
+Subject: [PATCH] Don't pollute .prl & .pc files with private dependencies
+
+Also change the creating_module check in needToLink to make sure that
+only the main module will try to link directly with the WebCore and
+JavaScriptCore static libraries.
+
+Task-number: QTBUG-35774
+Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen at digia.com>
+Change-Id: Ib5992e112803679837249400e98cb8c22636096d
+---
+ Source/widgetsapi.pri                         | 1 +
+ Tools/qmake/mkspecs/features/default_post.prf | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri
+index 7bdc0e1..335e371 100644
+--- a/Source/widgetsapi.pri
++++ b/Source/widgetsapi.pri
+@@ -49,6 +49,7 @@ use?(3D_GRAPHICS): WEBKIT += ANGLE
+ WEBKIT += javascriptcore wtf webcore
+ 
+ MODULE = webkitwidgets
++CONFIG += creating_module
+ 
+ # We want the QtWebKit API forwarding includes to live in the root build dir.
+ MODULE_BASE_DIR = $$_PRO_FILE_PWD_
+diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
+index 6fae22f..548005d 100644
+--- a/Tools/qmake/mkspecs/features/default_post.prf
++++ b/Tools/qmake/mkspecs/features/default_post.prf
+@@ -171,8 +171,8 @@ contains(QT, webkit)|contains(QT, webkitwidgets) {
+ }
+ 
+ defineTest(needToLink) {
+-    # The main dynamic library always needs to link in the intermediate libraries
+-    creating_module: return(true)
++    # The main module dynamic library always needs to link in the intermediate libraries
++    isEqual(MODULE, webkit): return(true)
+ 
+     force_static_libs_as_shared {
+         # So do the individual libraries if they are dynamic
+-- 
+1.9.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 8f98791..02d64c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # Upstream patches
 fix_ftbfs_in_archs_without_jit_support.patch
+dont_pollute_pri_and_pc_with_private_deps.patch
 
 # debian patches
 05_sparc_unaligned_access.diff

-- 
qt5webkit packaging