[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 169c124dacd5bcaa14a1440740dcbf8fe006f970
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Thu Jun 19 12:33:28 2014 +0200

    Add new patch to hide JSC symbols.
---
 debian/changelog                                           |  1 +
 .../{hide_wtf_symbols.diff => hide_jsc_symbols.diff}       | 14 ++++++++------
 debian/patches/series                                      |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9db67ab..e00afdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
       and set --as-needed linker flag, to avoid useless linking, in debian/rules
     - remove stabs_format_debug_info.diff, flags set in debian/rules
     - new patch hide_wtf_symbols.diff, to hide WTF symbols
+    - new patch hide_jsc_symbols.diff, to hide JSC symbols
   * Switch to building with ./Tools/Scripts/build-webkit as recommended
     by upstream
   * Build with gstreamer-1.x:
diff --git a/debian/patches/hide_wtf_symbols.diff b/debian/patches/hide_jsc_symbols.diff
similarity index 53%
copy from debian/patches/hide_wtf_symbols.diff
copy to debian/patches/hide_jsc_symbols.diff
index 11f62f2..f97b980 100644
--- a/debian/patches/hide_wtf_symbols.diff
+++ b/debian/patches/hide_jsc_symbols.diff
@@ -1,12 +1,14 @@
-Description: do not make the WTF symbols in webkit public.
+Description: do not make the JSC symbols in webkit public.
 Author: Andreas Cord-Landwehr <cordlandwehr at kde.org>
 
 --- a/Tools/qmake/mkspecs/features/symbols.filter
 +++ b/Tools/qmake/mkspecs/features/symbols.filter
-@@ -2,4 +2,6 @@
- local:
- _ZSt*;
+@@ -4,4 +4,8 @@
  _ZNSt*;
-+_ZNK3WTF*;
-+_ZN3WTF*;
+ _ZNK3WTF*;
+ _ZN3WTF*;
++_ZN3JSC*;
++_ZNK3JSC*;
++_ZTSN3JSC*;
++_ZTVN3JSC*;
  };
diff --git a/debian/patches/series b/debian/patches/series
index 621bbce..0966d4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ ignore-unused-local-typedefs_error.diff
 ignore-new_gcc_warnings.diff
 gstreamer-1.0.diff
 hide_wtf_symbols.diff
+hide_jsc_symbols.diff

-- 
QtWebKit packaging