[SCM] QtWebKit packaging branch, master, updated. 00cd41e2951af0824b4d613021d459e4b0396559
Fathi Boudra
fabo at alioth.debian.org
Fri Jul 2 12:32:50 UTC 2010
The following commit has been merged in the master branch:
commit 00cd41e2951af0824b4d613021d459e4b0396559
Author: Fathi Boudra <fabo at debian.org>
Date: Fri Jul 2 15:30:48 2010 +0300
port Qt WebKit patches from Qt packages
---
.../{07_no_strip.diff => 01_lflags_as-needed.diff} | 12 ++++--
.../patches/02_add_nostrip_for_debug_packages.diff | 15 ++++++++
...e_std_symbols.diff => 03_hide_std_symbols.diff} | 6 ++--
...ation.diff => 04_enable_debug_information.diff} | 6 ++--
...04_s390_stabs_format_debugging_information.diff | 22 -----------
debian/patches/05_powerpc_no_gc_sections.diff | 15 --------
..._access.diff => 05_sparc_unaligned_access.diff} | 38 ++++++++++++++++---
debian/patches/06_link_as_needed.diff | 10 -----
...06_s390_stabs_format_debugging_information.diff | 22 +++++++++++
debian/patches/07_powerpc_s390_no_gc_sections.diff | 20 ++++++++++
debian/patches/series | 14 ++++----
11 files changed, 110 insertions(+), 70 deletions(-)
diff --git a/debian/patches/07_no_strip.diff b/debian/patches/01_lflags_as-needed.diff
similarity index 64%
rename from debian/patches/07_no_strip.diff
rename to debian/patches/01_lflags_as-needed.diff
index 7d5025e..1df5897 100644
--- a/debian/patches/07_no_strip.diff
+++ b/debian/patches/01_lflags_as-needed.diff
@@ -1,10 +1,14 @@
+Description: set --as-needed linker flag to avoid useless linking.
+Author: Fathi Boudra <fabo at debian.org>
+
--- a/WebKit.pri
+++ b/WebKit.pri
-@@ -52,6 +52,7 @@ INCLUDEPATH += $$OUTPUT_DIR/include/QtWe
-
+@@ -58,6 +58,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_LFLAGS += -Wl,--as-needed
- *-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
++*-g++*:QMAKE_LFLAGS += -Wl,--as-needed
++
# Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
+ symbian|*-armcc {
+ RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293
diff --git a/debian/patches/02_add_nostrip_for_debug_packages.diff b/debian/patches/02_add_nostrip_for_debug_packages.diff
new file mode 100644
index 0000000..1671556
--- /dev/null
+++ b/debian/patches/02_add_nostrip_for_debug_packages.diff
@@ -0,0 +1,15 @@
+Description: set CONFIG += nostrip to avoid stripping and
+ let dh_strip do it to generate debug packages.
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/WebKit.pri
++++ b/WebKit.pri
+@@ -8,6 +8,8 @@ else:exists($$PWD/WebCore/generated): CO
+
+ CONFIG += depend_includepath
+
++CONFIG += nostrip
++
+ DEFINES += BUILDING_QT__=1
+ building-libs {
+ win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
diff --git a/debian/patches/01_hide_std_symbols.diff b/debian/patches/03_hide_std_symbols.diff
similarity index 89%
rename from debian/patches/01_hide_std_symbols.diff
rename to debian/patches/03_hide_std_symbols.diff
index 9841cb4..c33f978 100644
--- a/debian/patches/01_hide_std_symbols.diff
+++ b/debian/patches/03_hide_std_symbols.diff
@@ -4,10 +4,10 @@ Author: Sune Vuorela <sune at debian.org>
--- a/WebKit.pri
+++ b/WebKit.pri
-@@ -52,6 +52,7 @@ INCLUDEPATH += $$OUTPUT_DIR/include/QtWe
-
- CONFIG -= warn_on
+@@ -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
+
+ *-g++*:QMAKE_LFLAGS += -Wl,--as-needed
+*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
# Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
diff --git a/debian/patches/02_enable_debug_information.diff b/debian/patches/04_enable_debug_information.diff
similarity index 80%
rename from debian/patches/02_enable_debug_information.diff
rename to debian/patches/04_enable_debug_information.diff
index 122950d..ffddb6f 100644
--- a/debian/patches/02_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
-@@ -2894,8 +2894,6 @@ WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HE
+@@ -2935,8 +2935,6 @@ HEADERS += $$WEBKIT_API_HEADERS
CONFIG(QTDIR_build) {
# Remove the following 2 lines if you want debug information in WebCore
@@ -12,10 +12,10 @@ author: Fathi Boudra <fabo at debian.org>
- CONFIG += no_debug_info
}
- !win32-g++:win32:contains(QMAKE_HOST.arch, x86_64):{
+ win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
--- a/JavaScriptCore/JavaScriptCore.pro
+++ b/JavaScriptCore/JavaScriptCore.pro
-@@ -24,8 +24,6 @@ contains(QT_CONFIG, embedded):CONFIG +=
+@@ -38,8 +38,6 @@ unix:contains(QT_CONFIG, reduce_relocati
CONFIG(QTDIR_build) {
# Remove the following 2 lines if you want debug information in JavaScriptCore
diff --git a/debian/patches/04_s390_stabs_format_debugging_information.diff b/debian/patches/04_s390_stabs_format_debugging_information.diff
deleted file mode 100644
index b45d585..0000000
--- a/debian/patches/04_s390_stabs_format_debugging_information.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: build s390 debugging symbols with -gstabs instead of with -g
- to reduce linker memory usage.
- Thanks to Oswald Buddenhagen for the hint.
-author: Sune Vuorela <sune at debian.org>
-Bug-Debian: http://bugs.debian.org/528485
-
---- a/WebKit.pri
-+++ b/WebKit.pri
-@@ -69,6 +69,13 @@ symbian {
- QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS
- }
-
-+arch=$$system(dpkg-architecture -qDEB_BUILD_ARCH)
-+equals(arch, s390) {
-+ message("S/390 workaround: is not building with -g, but with -gstabs")
-+ QMAKE_CXXFLAGS -= -g
-+ QMAKE_CXXFLAGS += -gstabs
-+}
-+
- symbian|maemo5: DEFINES *= QT_NO_UITOOLS
-
- contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
diff --git a/debian/patches/05_powerpc_no_gc_sections.diff b/debian/patches/05_powerpc_no_gc_sections.diff
deleted file mode 100644
index d18f286..0000000
--- a/debian/patches/05_powerpc_no_gc_sections.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: do not pass -Wl,--gc-sections on powerpc when building libQtWebKit.so;
- works around a binutils bug that results in a segfault.
-Author: Steve Langasek <vorlon at debian.org>
-
---- a/WebCore/WebCore.pro
-+++ b/WebCore/WebCore.pro
-@@ -79,7 +79,7 @@ unix {
- }
-
- unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
--unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):QMAKE_LFLAGS += -Wl,--gc-sections
- linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
-
- CONFIG(release):!CONFIG(standalone_package) {
diff --git a/debian/patches/03_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
similarity index 60%
rename from debian/patches/03_sparc_unaligned_access.diff
rename to debian/patches/05_sparc_unaligned_access.diff
index 037a519..659d869 100644
--- a/debian/patches/03_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -1,6 +1,24 @@
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 {
@@ -24,7 +42,7 @@ Author: Mike Hommey <glandium at debian.org>
@@ -182,10 +182,7 @@ namespace WTF {
Node* m_freeList;
bool m_isDoneWithInitialFreeList;
- static const size_t m_poolSize = 256;
+ static const size_t m_poolSize = inlineCapacity;
- union {
- char pool[sizeof(Node) * m_poolSize];
- double forAlignment;
@@ -32,14 +50,14 @@ Author: Mike Hommey <glandium at debian.org>
+ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
};
- template<typename ValueArg> struct ListHashSetNode {
+ 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
if (string->length() != length)
return false;
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
++#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
// FIXME: perhaps we should have a more abstract macro that indicates when
// going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4)
@@ -48,12 +66,20 @@ Author: Mike Hommey <glandium at debian.org>
if (*stringCharacters++ != *characters++)
--- a/WebCore/platform/text/StringHash.h
+++ b/WebCore/platform/text/StringHash.h
-@@ -54,7 +54,7 @@ namespace WebCore {
+@@ -54,13 +54,13 @@ namespace WebCore {
// FIXME: perhaps we should have a more abstract macro that indicates when
// going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
++#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
const UChar* aChars = a->characters();
const UChar* bChars = b->characters();
- for (unsigned i = 0; i != aLength; ++i) {
+- for (unsigned i = 0; i != aLength; ++i) {
++ for (unsigned i = 0; i != aLength; ++i)
+ if (*aChars++ != *bChars++)
+ return false;
+- }
++
+ return true;
+ #else
+ /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/debian/patches/06_link_as_needed.diff b/debian/patches/06_link_as_needed.diff
deleted file mode 100644
index c96935f..0000000
--- a/debian/patches/06_link_as_needed.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/WebKit.pri
-+++ b/WebKit.pri
-@@ -51,6 +51,7 @@ BASE_DIR = $$PWD
- INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
-
- CONFIG -= warn_on
-+CONFIG += nostrip
- *-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_LFLAGS += -Wl,--as-needed
- *-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
diff --git a/debian/patches/06_s390_stabs_format_debugging_information.diff b/debian/patches/06_s390_stabs_format_debugging_information.diff
new file mode 100644
index 0000000..208d356
--- /dev/null
+++ b/debian/patches/06_s390_stabs_format_debugging_information.diff
@@ -0,0 +1,22 @@
+Description: build s390 debugging symbols with -gstabs instead of with -g
+ to reduce linker memory usage.
+ Thanks to Oswald Buddenhagen for the hint.
+author: Sune Vuorela <sune at debian.org>
+Bug-Debian: http://bugs.debian.org/528485
+
+--- a/WebKit.pri
++++ b/WebKit.pri
+@@ -49,6 +49,13 @@ CONFIG(release, debug|release) {
+ DEFINES += NDEBUG
+ }
+
++equals(QT_ARCH, s390) {
++ message("S/390 workaround for QtWebkit: do not build with -g, but with -gstabs")
++ QMAKE_CXXFLAGS -= -g
++ QMAKE_CXXFLAGS += -gstabs
++}
++
++
+ BASE_DIR = $$PWD
+
+ symbian {
diff --git a/debian/patches/07_powerpc_s390_no_gc_sections.diff b/debian/patches/07_powerpc_s390_no_gc_sections.diff
new file mode 100644
index 0000000..a88d108
--- /dev/null
+++ b/debian/patches/07_powerpc_s390_no_gc_sections.diff
@@ -0,0 +1,20 @@
+Description: do not pass -Wl,--gc-sections on powerpc and s390 when building
+ libQtWebKit.so; works around a binutils bug that results in a
+ segfault on powerpc and an internal link error on s390.
+Author: Steve Langasek <vorlon at debian.org>
+Author: Modestas Vainius <modax at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-04-11 (s390 added)
+
+--- a/WebCore/WebCore.pro
++++ b/WebCore/WebCore.pro
+@@ -90,7 +90,7 @@ unix {
+ }
+
+ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):QMAKE_LFLAGS += -Wl,--gc-sections
+ linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+
+ CONFIG(release) {
diff --git a/debian/patches/series b/debian/patches/series
index f912a5c..3d59bb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,10 +2,10 @@
0001_fix_symbols_visibility_for_webcore.diff
# debian patches
-#01_hide_std_symbols.diff
-#02_enable_debug_information.diff
-#03_sparc_unaligned_access.diff
-#04_s390_stabs_format_debugging_information.diff
-#05_powerpc_no_gc_sections.diff
-#06_link_as_needed.diff
-#07_no_strip.diff
+01_lflags_as-needed.diff
+02_add_nostrip_for_debug_packages.diff
+03_hide_std_symbols.diff
+04_enable_debug_information.diff
+05_sparc_unaligned_access.diff
+06_s390_stabs_format_debugging_information.diff
+07_powerpc_s390_no_gc_sections.diff
--
QtWebKit packaging
More information about the pkg-kde-commits
mailing list