[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-3

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 15d6f20e40b2fc6f2d8af73d4afe7eb3e3538929
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 12 19:14:41 2012 +0300

    Build Source/WebCore/generated/* with hidden visibility as well
    
    This reduces a symbol file a lot and brings it back to manageable state
    (patch webkit_qt_hide_symbols.diff).
---
 debian/changelog                           |    3 ++
 debian/patches/series                      |    1 +
 debian/patches/webkit_qt_hide_symbols.diff |   39 ++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f000413..ef167f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtwebkit (2.2.1-3) UNRELEASED; urgency=low
 
+  * Build Source/WebCore/generated/* with hidden visibility as well (patch
+    webkit_qt_hide_symbols.diff). This reduces a symbol file a lot and brings
+    it back to manageable state.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 12 May 2012 17:59:50 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index c4442fc..bc59db0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ no_gc_sections.diff
 defines_qt_webkit.diff
 glibc_hurd_mkspecs.diff
 hurd.diff
+webkit_qt_hide_symbols.diff
diff --git a/debian/patches/webkit_qt_hide_symbols.diff b/debian/patches/webkit_qt_hide_symbols.diff
new file mode 100644
index 0000000..7395428
--- /dev/null
+++ b/debian/patches/webkit_qt_hide_symbols.diff
@@ -0,0 +1,39 @@
+From: Modestas Vainius <modax at debian.org>
+SUbject: Make hide_symbols to cover all QtWebKit portions
+Origin: vendor
+Last-Update: 2012-05-12
+Forwarded: no
+
+Almost everything in Source/WebCore/generated was not build with
+-fvisibility=hidden resulting into redundantly polluted and huge dynamic symbol
+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, "")
+ 
++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)
+ 
+-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