[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-53-g03fb5cb

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 1922cad88fa774ccb0bd117f4261d4efab4b4f6c
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 23:36:44 2014 +0200

    Update patch: webkit_qt_hide_symbols.diff
---
 debian/patches/webkit_qt_hide_symbols.diff | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/debian/patches/webkit_qt_hide_symbols.diff b/debian/patches/webkit_qt_hide_symbols.diff
index 7395428..60f59b6 100644
--- a/debian/patches/webkit_qt_hide_symbols.diff
+++ b/debian/patches/webkit_qt_hide_symbols.diff
@@ -1,7 +1,8 @@
 From: Modestas Vainius <modax at debian.org>
 SUbject: Make hide_symbols to cover all QtWebKit portions
 Origin: vendor
-Last-Update: 2012-05-12
+Author: Timo Jyrinki <timo at debian.org>
+Last-Update: 2013-01-28 (use a similar patch on Qt 5)
 Forwarded: no
 
 Almost everything in Source/WebCore/generated was not build with
@@ -11,29 +12,17 @@ list in libQtWebKit.so.
 Therefore, move +hide_symbols configuration parameter upwards in order for it
 to cover everything including the offending Source/WebCore/CodeGenerators.pri
 
---- a/Source/WebKit/qt/QtWebKit.pro
-+++ b/Source/WebKit/qt/QtWebKit.pro
-@@ -15,6 +15,11 @@ else: CONFIG_DIR = release
- 
- SOURCE_DIR = $$replace(PWD, /WebKit/qt, "")
+--- a/Source/QtWebKit.pro
++++ b/Source/QtWebKit.pro
+@@ -7,6 +7,11 @@
+ TEMPLATE = subdirs
+ CONFIG += ordered
  
 +CONFIG(release):!CONFIG(standalone_package) {
 +    contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 +    unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
 +}
 +
- include($$PWD/Api/headers.pri)
- include($$SOURCE_DIR/WebKit.pri)
- include($$SOURCE_DIR/JavaScriptCore/JavaScriptCore.pri)
-@@ -66,11 +71,6 @@ defineTest(addExtraCompiler) {
- 
- include($$SOURCE_DIR/WebCore/CodeGenerators.pri)
+ api.file = api.pri
+ SUBDIRS += api
  
--CONFIG(release):!CONFIG(standalone_package) {
--    contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
--    unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
--}
--
- CONFIG(QTDIR_build) {
-     include($$QT_SOURCE_TREE/src/qbase.pri)
-     # The following lines are to prevent qmake from adding the jscore, webcore and webkit2 libs to libQtWebKit's prl dependencies.

-- 
QtWebKit packaging