Merge lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510

[Dmitry Shachnev]

Copy dont_pollute_pri_and_pc_with_private_deps.patch from Debian
(LP: #1134745).

This is a backport of a patch from Upstream/Debian that makes apps using QtWebKit compile with default dependency set.

I hope I have chosen a correct Bzr branch to merge this into.

Timo: I haven't tested the patch, so I hope you can get this into the landing PPA so that we both can get it from there and test.

[Timo Jyrinki (timo-jyrinki)]

Thanks! I'll assign a silo for it, line 50 currently at http://wiki.ubuntu.com/citrain

This qtwebkit-opensource-src_510 branch is as good as any, while we're stuck with QtWebKit 5.1.1 at least until lp:oxide comes into production. We're not running WebKit tests anyway so there's not much to be done by CI either, compared to having all builds done in a PPA.

[Timo Jyrinki (timo-jyrinki)]

review: Approve

[Timo Jyrinki (timo-jyrinki)]

The 510 branch was missing the patch files from ubuntu5 upload, so I added them before merging your branch on top of it for upload.

[Timo Jyrinki (timo-jyrinki)]

Just "Abstain" until actual testing :)

review: Abstain

[Timo Jyrinki (timo-jyrinki)]

I'm at least still seeing '-lgstapp-1.0 -lgstbase-1.0 -lgstreamer-1.0' etc in the .pc files in https://launchpad.net/~ci-train-ppa-service/+archive/landing-017

review: Needs Fixing

[Timo Jyrinki (timo-jyrinki)]

Looking further, the .prl widgets file is however fixed and the lp:~timo-jyrinki/+junk/testwebkit test case works unlike without this.

I've also tested there are no regressions on device, and at least the Ubuntu Touch reverse dependencies seem to compile ok.

So, I think this is ok, but I'd like to have a 2nd ack too.

review: Approve

[Dmitry Shachnev (mitya57)]

I agree that a second ACK would be nice.

By the way, do we still plan to get QtWebKit 5.2 this cycle? The .pc files issue should be fixed there.

[Dmitry Shachnev (mitya57)]

I have finally found some time to test this, and this upload definitely makes things better.

Before:

g++ -Wl,-O1 -Wl,-rpath-link,/usr/lib/i386-linux-gnu -o test test.o -lQt5WebKitWidgets -lX11 -lxslt -lxml2 -lgio-2.0 -lgstapp-1.0 -lgstpbutils-1.0 -lgstvideo-1.0 -lgstaudio-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lsqlite3 -L/usr/lib/i386-linux-gnu -lQt5Sql -lQt5Quick -lQt5OpenGL -lQt5PrintSupport -lQt5Location -lQt5Qml -lQt5WebKit -lQt5Widgets -lQt5Positioning -lQt5Sensors -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread

After:

g++ -Wl,-O1 -Wl,-rpath-link,/usr/lib/i386-linux-gnu -o test test.o -lQt5WebKitWidgets -L/usr/lib/i386-linux-gnu -lQt5Quick -lQt5OpenGL -lQt5PrintSupport -lQt5Location -lQt5Qml -lQt5WebKit -lQt5Widgets -lQt5Positioning -lQt5Sensors -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread

[Timo Jyrinki (timo-jyrinki)]

Thanks, so it seems to be. Releasing the landing.

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-15 08:08:30 +0000
+++ debian/changelog	2014-03-19 10:13:03 +0000
@@ -1,3 +1,10 @@
+qtwebkit-opensource-src (5.1.1-1ubuntu8) UNRELEASED; urgency=medium
+
+  * Copy dont_pollute_pri_and_pc_with_private_deps.patch from Debian
+    (LP: #1134745).
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 19 Mar 2014 14:07:02 +0400
+
 qtwebkit-opensource-src (5.1.1-1ubuntu7) trusty; urgency=medium
 
   * Backport upstream patch to add AArch64 support.

=== added file 'debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch'
--- debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch	2014-03-19 10:13:03 +0000
@@ -0,0 +1,40 @@
+From 31a1ec780aaba33c1008b8dc7bca7da88bd297ff Mon Sep 17 00:00:00 2001
+From: Jocelyn Turcotte <[e-mail]>
+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 <[e-mail]>
+Change-Id: Ib5992e112803679837249400e98cb8c22636096d
+---
+ Source/widgetsapi.pri                         | 1 +
+ Tools/qmake/mkspecs/features/default_post.prf | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- a/Source/widgetsapi.pri
++++ b/Source/widgetsapi.pri
+@@ -47,6 +47,7 @@
+ WEBKIT += javascriptcore wtf webcore
+ 
+ MODULE = webkitwidgets
++CONFIG += creating_module
+ 
+ MODULE_SYNCQT_DIR = $$_PRO_FILE_PWD_
+ 
+--- a/Tools/qmake/mkspecs/features/default_post.prf
++++ b/Tools/qmake/mkspecs/features/default_post.prf
+@@ -189,8 +189,8 @@
+ }
+ 
+ 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

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-15 08:08:30 +0000
+++ debian/patches/series	2014-03-19 10:13:03 +0000
@@ -27,4 +27,9 @@
 0008-arm-Inverted-src-and-dest-FP-registers-in-DFG-specul.patch
 0009-Qt-Fix-build-with-Qt-5.2-QtPosition-module.patch
 aarch64.patch
+
+# Can be dropped with QtWebKit 5.2
 disable_jit.patch
+
+# From QtWebKit 5.3
+dont_pollute_pri_and_pc_with_private_deps.patch