rev 11406 - in trunk/packages/qt4-x11/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-07-09 00:23:26 +0000 (Wed, 09 Jul 2008)
New Revision: 11406

Added:
   trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Don't make the std:: symbols in webkit public. Solution based on the work
of Mike Hommey in the gtk webkit package.

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-07-09 00:21:00 UTC (rev 11405)
+++ trunk/packages/qt4-x11/debian/changelog	2008-07-09 00:23:26 UTC (rev 11406)
@@ -8,6 +8,8 @@
   * Fix some unaligned access issues that makes any webkit using application
     crash (SIGBUS) on archs where this isn't allowed. Patch by Mike Hommey.
     See #487745 for details.
+  * Don't make the std:: symbols in webkit public. Solution based on the work
+    of Mike Hommey in the gtk webkit package.
 
   +++ Changes by Modestas Vainius:
 

Added: trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff	2008-07-09 00:23:26 UTC (rev 11406)
@@ -0,0 +1,22 @@
+Index: b/src/3rdparty/webkit/WebKit.pri
+===================================================================
+--- a/src/3rdparty/webkit/WebKit.pri
++++ b/src/3rdparty/webkit/WebKit.pri
+@@ -27,6 +27,7 @@
+ BASE_DIR = $$PWD
+ qt-port:INCLUDEPATH += \
+     $$PWD/WebKit/qt/Api
++qt-port:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
+ gtk-port:INCLUDEPATH += \
+     $$BASE_DIR/WebCore/platform/gtk \
+     $$BASE_DIR/WebCore/platform/network/curl \
+Index: b/src/3rdparty/webkit/symbols.filter
+===================================================================
+--- /dev/null
++++ b/src/3rdparty/webkit/symbols.filter
+@@ -0,0 +1,5 @@
++{
++local:
++_ZSt*;
++_ZNSt*;
++};

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:21:00 UTC (rev 11405)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:23:26 UTC (rev 11406)
@@ -32,6 +32,7 @@
 12_fix_qmake_pkgconfig.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
+16_hide_std_symbols_on_qtwebkit.diff
 20_mips_atomic_ops.diff
 21_qprintdialog_honour_fileprintersadded.diff
 30_webkit-unaligned-access.patch