[SCM] QtWebKit packaging branch, master, updated. debian/2.0-week26-2-12-g4c2cea6

Fathi Boudra fabo at alioth.debian.org
Sun Sep 5 06:32:58 UTC 2010 

The following commit has been merged in the master branch:
commit d0e30d654326e85eb93870efab029f346938e9c3
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Sep 5 09:28:28 2010 +0300

    Remove 0002_add_webkit_qt_config.patch - merged upstream.
    Adjust 05_sparc_unaligned_access.diff
    Refresh patches
---
 debian/changelog                                   |    1 +
 .../0001_fix_symbols_visibility_for_webcore.diff   |    2 +-
 debian/patches/0002_add_webkit_qt_config.patch     |   15 ----------
 debian/patches/01_lflags_as-needed.diff            |    4 +-
 .../patches/02_add_nostrip_for_debug_packages.diff |    2 +-
 debian/patches/03_hide_std_symbols.diff            |    4 +-
 debian/patches/04_enable_debug_information.diff    |    2 +-
 debian/patches/05_sparc_unaligned_access.diff      |   30 ++++----------------
 debian/patches/06_kfreebsd_strnstr.diff            |    2 +-
 ...07_s390_stabs_format_debugging_information.diff |    2 +-
 debian/patches/08_powerpc_s390_no_gc_sections.diff |    2 +-
 debian/patches/series                              |    1 -
 12 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa689d1..0ba6d32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtwebkit (2.1~week35-1) UNRELEASED; urgency=low
 
   * New upstream release: switch to Qt WebKit 2.1 branch.
+  * Remove 0002_add_webkit_qt_config.patch - merged upstream.
 
  -- Fathi Boudra <fabo at debian.org>  Sun, 05 Sep 2010 09:08:05 +0300
 
diff --git a/debian/patches/0001_fix_symbols_visibility_for_webcore.diff b/debian/patches/0001_fix_symbols_visibility_for_webcore.diff
index 88782cd..9e1c059 100644
--- a/debian/patches/0001_fix_symbols_visibility_for_webcore.diff
+++ b/debian/patches/0001_fix_symbols_visibility_for_webcore.diff
@@ -4,7 +4,7 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=40237
 
 --- a/WebCore/WebCore.pro
 +++ b/WebCore/WebCore.pro
-@@ -93,7 +93,7 @@ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffun
+@@ -94,7 +94,7 @@ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffun
  unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
  linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  
diff --git a/debian/patches/0002_add_webkit_qt_config.patch b/debian/patches/0002_add_webkit_qt_config.patch
deleted file mode 100644
index 0551bdd..0000000
--- a/debian/patches/0002_add_webkit_qt_config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: when Qt is built with -no-webkit and Qt WebKit is used
-             Qt applications cannot found webkit as they rely on qmake. 
-Author: Simon Hausmann <simon.hausmann at nokia.com>
-Author: Fathi Boudra <fathi.boudra at nokia.com>
-
---- a/WebKit/qt/qt_webkit_version.pri
-+++ b/WebKit/qt/qt_webkit_version.pri
-@@ -1,3 +1,7 @@
-+#configuration
-+QT_CONFIG *= webkit
-+
-+#versioning
- QT_WEBKIT_VERSION = 4.7.0
- QT_WEBKIT_MAJOR_VERSION = 4
- QT_WEBKIT_MINOR_VERSION = 7
diff --git a/debian/patches/01_lflags_as-needed.diff b/debian/patches/01_lflags_as-needed.diff
index 1df5897..987b4a8 100644
--- a/debian/patches/01_lflags_as-needed.diff
+++ b/debian/patches/01_lflags_as-needed.diff
@@ -3,9 +3,9 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -58,6 +58,8 @@ symbian {
+@@ -60,6 +60,8 @@ symbian {
  CONFIG -= warn_on
- *-g++*:QMAKE_CXXFLAGS += -Wall -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_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/02_add_nostrip_for_debug_packages.diff b/debian/patches/02_add_nostrip_for_debug_packages.diff
index 1671556..a318de6 100644
--- a/debian/patches/02_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/02_add_nostrip_for_debug_packages.diff
@@ -4,7 +4,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -8,6 +8,8 @@ else:exists($$PWD/WebCore/generated): CO
+@@ -10,6 +10,8 @@ CONFIG += production
  
  CONFIG += depend_includepath
  
diff --git a/debian/patches/03_hide_std_symbols.diff b/debian/patches/03_hide_std_symbols.diff
index c33f978..019a7b2 100644
--- a/debian/patches/03_hide_std_symbols.diff
+++ b/debian/patches/03_hide_std_symbols.diff
@@ -4,8 +4,8 @@ Author: Sune Vuorela <sune at debian.org>
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -61,6 +61,7 @@ CONFIG -= warn_on
- *-g++*:QMAKE_CXXFLAGS += -Wall -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
+@@ -63,6 +63,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
 +*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
diff --git a/debian/patches/04_enable_debug_information.diff b/debian/patches/04_enable_debug_information.diff
index ffddb6f..fcdda11 100644
--- a/debian/patches/04_enable_debug_information.diff
+++ b/debian/patches/04_enable_debug_information.diff
@@ -4,7 +4,7 @@ author: Fathi Boudra <fabo at debian.org>
 
 --- a/WebCore/WebCore.pro
 +++ b/WebCore/WebCore.pro
-@@ -2935,8 +2935,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3158,8 +3158,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  
  CONFIG(QTDIR_build) {
      # Remove the following 2 lines if you want debug information in WebCore
diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
index 659d869..5b52dbe 100644
--- a/debian/patches/05_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -1,24 +1,6 @@
 Description: fix some alignment problems on sparc.
 Author: Mike Hommey <glandium at debian.org>
 
---- a/JavaScriptCore/wtf/FastMalloc.cpp
-+++ b/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -2336,13 +2336,13 @@ static TCMalloc_Central_FreeListPadded c
- 
- // Page-level allocator
- static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
--static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
-+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
- static bool phinited = false;
- 
- // Avoid extra level of indirection by making "pageheap" be just an alias
- // of pageheap_memory.
- typedef union {
--    void* m_memory;
-+    uint64_t* m_memory;
-     TCMalloc_PageHeap* m_pageHeap;
- } PageHeapUnion;
- 
 --- a/JavaScriptCore/wtf/ListHashSet.h
 +++ b/JavaScriptCore/wtf/ListHashSet.h
 @@ -127,7 +127,7 @@ namespace WTF {
@@ -51,9 +33,9 @@ Author: Mike Hommey <glandium at debian.org>
      };
  
      template<typename ValueArg, size_t inlineCapacity> struct ListHashSetNode {
---- a/WebCore/platform/text/AtomicString.cpp
-+++ b/WebCore/platform/text/AtomicString.cpp
-@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
+--- a/JavaScriptCore/wtf/text/AtomicString.cpp
++++ b/JavaScriptCore/wtf/text/AtomicString.cpp
+@@ -128,9 +128,9 @@ static inline bool equal(StringImpl* str
      if (string->length() != length)
          return false;
  
@@ -64,9 +46,9 @@ Author: Mike Hommey <glandium at debian.org>
      const UChar* stringCharacters = string->characters();
      for (unsigned i = 0; i != length; ++i) {
          if (*stringCharacters++ != *characters++)
---- a/WebCore/platform/text/StringHash.h
-+++ b/WebCore/platform/text/StringHash.h
-@@ -54,13 +54,13 @@ namespace WebCore {
+--- a/JavaScriptCore/wtf/text/StringHash.h
++++ b/JavaScriptCore/wtf/text/StringHash.h
+@@ -56,13 +56,13 @@ namespace WebCore {
  
              // FIXME: perhaps we should have a more abstract macro that indicates when
              // going 4 bytes at a time is unsafe
diff --git a/debian/patches/06_kfreebsd_strnstr.diff b/debian/patches/06_kfreebsd_strnstr.diff
index b535c47..7e74723 100644
--- a/debian/patches/06_kfreebsd_strnstr.diff
+++ b/debian/patches/06_kfreebsd_strnstr.diff
@@ -4,7 +4,7 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
 
 --- a/JavaScriptCore/wtf/Platform.h
 +++ b/JavaScriptCore/wtf/Platform.h
-@@ -367,7 +367,7 @@
+@@ -385,7 +385,7 @@
  #endif
  
  /* OS(LINUX) - Linux */
diff --git a/debian/patches/07_s390_stabs_format_debugging_information.diff b/debian/patches/07_s390_stabs_format_debugging_information.diff
index 208d356..d2f4703 100644
--- a/debian/patches/07_s390_stabs_format_debugging_information.diff
+++ b/debian/patches/07_s390_stabs_format_debugging_information.diff
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/528485
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -49,6 +49,13 @@ CONFIG(release, debug|release) {
+@@ -51,6 +51,13 @@ CONFIG(release, debug|release) {
      DEFINES += NDEBUG
  }
  
diff --git a/debian/patches/08_powerpc_s390_no_gc_sections.diff b/debian/patches/08_powerpc_s390_no_gc_sections.diff
index a88d108..be7d66a 100644
--- a/debian/patches/08_powerpc_s390_no_gc_sections.diff
+++ b/debian/patches/08_powerpc_s390_no_gc_sections.diff
@@ -9,7 +9,7 @@ Last-Update: 2010-04-11 (s390 added)
 
 --- a/WebCore/WebCore.pro
 +++ b/WebCore/WebCore.pro
-@@ -90,7 +90,7 @@ unix {
+@@ -91,7 +91,7 @@ unix {
  }
  
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
diff --git a/debian/patches/series b/debian/patches/series
index d0fc0d8..acce5e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # upstream patches
 0001_fix_symbols_visibility_for_webcore.diff
-0002_add_webkit_qt_config.patch
 
 # debian patches
 01_lflags_as-needed.diff

-- 
QtWebKit packaging

More information about the pkg-kde-commits mailing list