Merge branch 'experimental'

14 files changed, 44 insertions, 47 deletions

diff --git a/debian/changelog b/debian/changelog
index 111aef3..5c52dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+qtwebkit (2.2.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Drop adjust_symbols_visibility_for_webcore.diff - stolen upstream.
+  * Update debian/compat: bump to 9.
+  * Update debian/control:
+    - bump Qt build dependency to 4:4.8.0~. This version introduce multiarch.
+    - add Multi-Arch and Pre-Depends fields to libqtwebkit4 package.
+  * Update debian/*.install files for multiarch.
+
+ -- Fathi Boudra <fabo@debian.org>  Wed, 28 Dec 2011 10:10:59 +0200
+
 qtwebkit (2.2.0-5) unstable; urgency=low
 
   * Update symbol file with the latest changes from the build logs.
diff --git a/debian/control b/debian/control
index c9a926a..203abaf 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 9),
                libgstreamer-plugins-base0.10-dev,
                libgstreamer0.10-dev,
                libicu-dev,
-               libqt4-dev (>= 4:4.7.3),
-               libqt4-opengl-dev (>= 4:4.7.3),
+               libqt4-dev (>= 4:4.8.0~),
+               libqt4-opengl-dev (>= 4:4.8.0~),
                libsqlite3-dev,
                libxext-dev,
                libxrender-dev,
@@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=summary
 Package: libqtwebkit-dev
 Section: libdevel
 Architecture: any
-Depends: libqt4-dev (>= 4:4.7.3),
+Depends: libqt4-dev (>= 4:4.8.0~),
          libqtwebkit4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -37,6 +37,8 @@ Description: Web content engine library for Qt - development files
 
 Package: libqtwebkit4
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libqt4-webkit (<= 4:4.7.0~beta1)
 Description: Web content engine library for Qt
diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
index 73816bc..cb4dbaa 100644
--- a/debian/libqtwebkit-dev.install
+++ b/debian/libqtwebkit-dev.install
@@ -30,8 +30,8 @@ usr/include/qt4/QtWebKit/qwebpluginfactory.h
 usr/include/qt4/QtWebKit/qwebsecurityorigin.h
 usr/include/qt4/QtWebKit/qwebsettings.h
 usr/include/qt4/QtWebKit/qwebview.h
-usr/lib/libQtWebKit.prl
-usr/lib/libQtWebKit.so
-usr/lib/pkgconfig/QtWebKit.pc
-usr/lib/qt4/plugins/designer/libqwebview.so
+usr/lib/*/libQtWebKit.prl
+usr/lib/*/libQtWebKit.so
+usr/lib/*/pkgconfig/QtWebKit.pc
+usr/lib/*/qt4/plugins/designer/libqwebview.so
 usr/share/qt4/mkspecs/modules/qt_webkit_version.pri
diff --git a/debian/libqtwebkit4.install b/debian/libqtwebkit4.install
index 3872f0f..917f930 100644
--- a/debian/libqtwebkit4.install
+++ b/debian/libqtwebkit4.install
@@ -1 +1 @@
-usr/lib/libQtWebKit.so.*
+usr/lib/*/libQtWebKit.so.*
diff --git a/debian/patches/01_lflags_as-needed.diff b/debian/patches/01_lflags_as-needed.diff
index 4fb615d..48efeda 100644
--- a/debian/patches/01_lflags_as-needed.diff
+++ b/debian/patches/01_lflags_as-needed.diff
@@ -7,7 +7,7 @@ Author: Fathi Boudra <fabo@debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -91,6 +91,8 @@ win32-g++* {
+@@ -100,6 +100,8 @@ win32-g++* {
  CONFIG -= warn_on
  *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  
diff --git a/debian/patches/02_add_nostrip_for_debug_packages.diff b/debian/patches/02_add_nostrip_for_debug_packages.diff
index 87ad141..5a619f8 100644
--- a/debian/patches/02_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/02_add_nostrip_for_debug_packages.diff
@@ -8,7 +8,7 @@ Author: Fathi Boudra <fabo@debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -27,6 +27,8 @@ CONFIG(standalone_package): DEFINES *= N
+@@ -36,6 +36,8 @@ CONFIG(standalone_package): DEFINES *= N
  CONFIG += depend_includepath
  DEPENDPATH += $$OUT_PWD
  
diff --git a/debian/patches/03_hide_std_symbols.diff b/debian/patches/03_hide_std_symbols.diff
index 402598a..e5c3d31 100644
--- a/debian/patches/03_hide_std_symbols.diff
+++ b/debian/patches/03_hide_std_symbols.diff
@@ -9,7 +9,7 @@ Author: Sune Vuorela <sune@debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -94,6 +94,7 @@ CONFIG -= warn_on
+@@ -103,6 +103,7 @@ CONFIG -= warn_on
  *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  
  *-g++*:QMAKE_LFLAGS += -Wl,--as-needed
diff --git a/debian/patches/adjust_symbols_visibility_for_webcore.diff b/debian/patches/adjust_symbols_visibility_for_webcore.diff
deleted file mode 100644
index 0ee08a9..0000000
--- a/debian/patches/adjust_symbols_visibility_for_webcore.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From 14b2ab0ee15794cc32b198860e2978c8f51e18c7 Mon Sep 17 00:00:00 2001
-From: commit-queue <commit-queue@webkit.org>
-Date: Tue, 1 Nov 2011 10:17:06 +0000
-Subject: [PATCH] bad codegen, pointer diff in
- JSC::JSCallbackConstructor::JSCallbackConstructor
- https://bugs.webkit.org/show_bug.cgi?id=60951
-
-Adjust symbols visibility for WebCore.
-
-Patch by Zeno Albisser <zeno.albisser@nokia.com> on 2011-11-01
-Reviewed by Simon Hausmann.
-
-* WebCore.pro:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@98947 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebCore/WebCore.pro |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/Source/WebCore/WebCore.pro
-+++ b/Source/WebCore/WebCore.pro
-@@ -7,6 +7,8 @@ include($$PWD/../WebKit.pri)
- include($$PWD/WebCore.pri)
- include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
- 
-+contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-+
- TEMPLATE = lib
- TARGET = $$WEBCORE_TARGET
- CONFIG += staticlib
diff --git a/debian/patches/glibc_mkspec.diff b/debian/patches/glibc_mkspec.diff
index 99697e0..f75b02c 100644
--- a/debian/patches/glibc_mkspec.diff
+++ b/debian/patches/glibc_mkspec.diff
@@ -26,7 +26,7 @@ Forwarded: not-needed
          PKGCONFIG += glib-2.0 gio-2.0
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -104,7 +104,7 @@ CONFIG -= warn_on
+@@ -113,7 +113,7 @@ CONFIG -= warn_on
  *-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter
  
  # Treat warnings as errors on x86/Linux/GCC
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index 83d4866..1631c4d 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -7,9 +7,13 @@ Origin: vendor
 Forwarded: not-needed
 Last-Update: 2011-12-30
 
+---
+ Source/JavaScriptCore/wtf/FastMalloc.cpp |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/Source/JavaScriptCore/wtf/FastMalloc.cpp
 +++ b/Source/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -1595,6 +1595,9 @@
+@@ -1595,6 +1595,9 @@ ALWAYS_INLINE void TCMalloc_PageHeap::su
  void TCMalloc_PageHeap::initializeScavenger()
  {
      // Create a non-recursive mutex.
@@ -19,7 +23,7 @@ Last-Update: 2011-12-30
  #if !defined(PTHREAD_MUTEX_NORMAL) || PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_DEFAULT
      pthread_mutex_init(&m_scavengeMutex, 0);
  #else
-@@ -1606,6 +1609,7 @@
+@@ -1606,6 +1609,7 @@ void TCMalloc_PageHeap::initializeScaven
  
      pthread_mutexattr_destroy(&attr);
  #endif
diff --git a/debian/patches/series b/debian/patches/series
index 85afe41..d3feb9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # upstream patches
-adjust_symbols_visibility_for_webcore.diff
 Fix_build_with_GLib_2.31_changeset_r97269.patch
 upstream_changeset_r93631.diff
 upstream_changeset_r113848.diff
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index aa87b74..ea15ad0 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -11,7 +11,7 @@ Bug-Debian: http://bugs.debian.org/618325
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -71,6 +71,13 @@ CONFIG(release, debug|release) {
+@@ -80,6 +80,13 @@ CONFIG(release, debug|release) {
      DEFINES += NDEBUG
  }
  
diff --git a/debian/patches/upstream_changeset_r113848.diff b/debian/patches/upstream_changeset_r113848.diff
index 390d805..13f6542 100644
--- a/debian/patches/upstream_changeset_r113848.diff
+++ b/debian/patches/upstream_changeset_r113848.diff
@@ -7,6 +7,12 @@ Author: Pino Toscano <pino@debian.org>
 Bug: https://bugs.webkit.org/show_bug.cgi?id=83584
 Origin: upstream, http://trac.webkit.org/changeset/113848
 
+---
+ Source/WebCore/html/HTMLImageElement.cpp                   |    2 +-
+ Source/WebCore/platform/graphics/TiledBackingStoreClient.h |    1 +
+ Source/common.pri                                          |    5 +++--
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
 --- a/Source/WebCore/html/HTMLImageElement.cpp
 +++ b/Source/WebCore/html/HTMLImageElement.cpp
 @@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageEl
@@ -30,7 +36,7 @@ Origin: upstream, http://trac.webkit.org/changeset/113848
      virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
 --- a/Source/common.pri
 +++ b/Source/common.pri
-@@ -5,8 +5,9 @@
+@@ -5,8 +5,9 @@ contains(JAVASCRIPTCORE_JIT,no): DEFINES
  
  linux-g++ {
  isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
diff --git a/debian/patches/upstream_changeset_r93631.diff b/debian/patches/upstream_changeset_r93631.diff
index 9f919cf..9b8eedd 100644
--- a/debian/patches/upstream_changeset_r93631.diff
+++ b/debian/patches/upstream_changeset_r93631.diff
@@ -3,6 +3,10 @@ Author: Ahmad Sharif <asharif@chromium.org>
 Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
 Origin: upstream, http://trac.webkit.org/changeset/93631
 
+---
+ Source/WebCore/dom/Element.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/Source/WebCore/dom/Element.cpp
 +++ b/Source/WebCore/dom/Element.cpp
 @@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange ch