[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-14-g5f83b8b
Fathi Boudra
fabo at alioth.debian.org
Tue Sep 20 07:51:20 UTC 2011
The following commit has been merged in the master branch:
commit 77faff707e4816aa88ac83464ef41ae46c8aceb5
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Sep 20 10:23:41 2011 +0300
Refresh patches
Adapt 03_hide_std_symbols: BASE_DIR -> PWD
---
.../0001_fix_symbols_visibility_for_webcore.diff | 4 +-
debian/patches/01_lflags_as-needed.diff | 14 +++++-----
.../patches/02_add_nostrip_for_debug_packages.diff | 10 ++++----
debian/patches/03_hide_std_symbols.diff | 18 +++++++-------
debian/patches/04_enable_debug_information.diff | 26 +++++--------------
debian/patches/05_sparc_unaligned_access.diff | 26 ++++++++++----------
debian/patches/06_kfreebsd_strnstr.diff | 8 +++---
debian/patches/09_hurd.diff | 6 ++--
debian/patches/defines_qt_webkit.diff | 19 ++++++++------
debian/patches/linux_amd64_no_overcommit.diff | 4 +-
debian/patches/no_gc_sections.diff | 4 +-
debian/patches/s390.diff | 6 ++--
debian/patches/stabs_format_debug_info.diff | 15 +++++------
13 files changed, 75 insertions(+), 85 deletions(-)
diff --git a/debian/patches/0001_fix_symbols_visibility_for_webcore.diff b/debian/patches/0001_fix_symbols_visibility_for_webcore.diff
index ed7a336..2631da5 100644
--- a/debian/patches/0001_fix_symbols_visibility_for_webcore.diff
+++ b/debian/patches/0001_fix_symbols_visibility_for_webcore.diff
@@ -6,8 +6,8 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=40237
WebCore/WebCore.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/WebCore/WebCore.pro
-+++ b/WebCore/WebCore.pro
+--- a/Source/WebCore/WebCore.pro
++++ b/Source/WebCore/WebCore.pro
@@ -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/01_lflags_as-needed.diff b/debian/patches/01_lflags_as-needed.diff
index c217f1a..4fb615d 100644
--- a/debian/patches/01_lflags_as-needed.diff
+++ b/debian/patches/01_lflags_as-needed.diff
@@ -2,17 +2,17 @@ Description: set --as-needed linker flag to avoid useless linking.
Author: Fathi Boudra <fabo at debian.org>
---
- WebKit.pri | 2 ++
+ Source/WebKit.pri | 2 ++
1 file changed, 2 insertions(+)
---- a/WebKit.pri
-+++ b/WebKit.pri
-@@ -68,6 +68,8 @@ symbian {
+--- a/Source/WebKit.pri
++++ b/Source/WebKit.pri
+@@ -91,6 +91,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
+*-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
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+ isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
diff --git a/debian/patches/02_add_nostrip_for_debug_packages.diff b/debian/patches/02_add_nostrip_for_debug_packages.diff
index 7100825..87ad141 100644
--- a/debian/patches/02_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/02_add_nostrip_for_debug_packages.diff
@@ -3,14 +3,14 @@ Description: set CONFIG += nostrip to avoid stripping and
Author: Fathi Boudra <fabo at debian.org>
---
- WebKit.pri | 2 ++
+ Source/WebKit.pri | 2 ++
1 file changed, 2 insertions(+)
---- a/WebKit.pri
-+++ b/WebKit.pri
-@@ -10,6 +10,8 @@ CONFIG += production
-
+--- a/Source/WebKit.pri
++++ b/Source/WebKit.pri
+@@ -27,6 +27,8 @@ CONFIG(standalone_package): DEFINES *= N
CONFIG += depend_includepath
+ DEPENDPATH += $$OUT_PWD
+CONFIG += nostrip
+
diff --git a/debian/patches/03_hide_std_symbols.diff b/debian/patches/03_hide_std_symbols.diff
index 2d69070..402598a 100644
--- a/debian/patches/03_hide_std_symbols.diff
+++ b/debian/patches/03_hide_std_symbols.diff
@@ -3,22 +3,22 @@ Description: do not make the std:: symbols in webkit public.
Author: Sune Vuorela <sune at debian.org>
---
- WebKit.pri | 1 +
- symbols.filter | 5 +++++
+ Source/WebKit.pri | 1 +
+ Source/symbols.filter | 5 +++++
2 files changed, 6 insertions(+)
---- a/WebKit.pri
-+++ b/WebKit.pri
-@@ -71,6 +71,7 @@ CONFIG -= warn_on
+--- a/Source/WebKit.pri
++++ b/Source/WebKit.pri
+@@ -94,6 +94,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
++*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter
- # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
- symbian|*-armcc {
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
--- /dev/null
-+++ b/symbols.filter
++++ b/Source/symbols.filter
@@ -0,0 +1,5 @@
+{
+local:
diff --git a/debian/patches/04_enable_debug_information.diff b/debian/patches/04_enable_debug_information.diff
index 158e10a..bf63cfb 100644
--- a/debian/patches/04_enable_debug_information.diff
+++ b/debian/patches/04_enable_debug_information.diff
@@ -1,26 +1,14 @@
Description: on Qt >= 4.5, debug info are disabled for QtWebkit.
- enable debug information in JavaScriptCore and WebCore.
+ enable debug information in JavaScriptCore
Author: Fathi Boudra <fabo at debian.org>
---
- JavaScriptCore/JavaScriptCore.pro | 2 --
- WebCore/WebCore.pro | 2 --
- 2 files changed, 4 deletions(-)
+ Source/JavaScriptCore/JavaScriptCore.pro | 2 --
+ 1 file changed, 2 deletions(-)
---- a/WebCore/WebCore.pro
-+++ b/WebCore/WebCore.pro
-@@ -3160,8 +3160,6 @@ HEADERS += $$WEBKIT_API_HEADERS
-
- !CONFIG(webkit-debug):CONFIG(QTDIR_build) {
- # Remove the following 2 lines if you want debug information in WebCore
-- CONFIG -= separate_debug_info
-- CONFIG += no_debug_info
- }
-
- win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
---- a/JavaScriptCore/JavaScriptCore.pro
-+++ b/JavaScriptCore/JavaScriptCore.pro
-@@ -38,8 +38,6 @@ unix:contains(QT_CONFIG, reduce_relocati
+--- a/Source/JavaScriptCore/JavaScriptCore.pro
++++ b/Source/JavaScriptCore/JavaScriptCore.pro
+@@ -24,8 +24,6 @@ unix:contains(QT_CONFIG, reduce_relocati
CONFIG(QTDIR_build) {
# Remove the following 2 lines if you want debug information in JavaScriptCore
@@ -28,4 +16,4 @@ Author: Fathi Boudra <fabo at debian.org>
- CONFIG += no_debug_info
}
- # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
+ *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
index 28c055a..368387a 100644
--- a/debian/patches/05_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -7,25 +7,25 @@ Author: Mike Hommey <glandium at debian.org>
JavaScriptCore/wtf/text/StringHash.h | 6 +++---
3 files changed, 7 insertions(+), 10 deletions(-)
---- a/JavaScriptCore/wtf/ListHashSet.h
-+++ b/JavaScriptCore/wtf/ListHashSet.h
+--- a/Source/JavaScriptCore/wtf/ListHashSet.h
++++ b/Source/JavaScriptCore/wtf/ListHashSet.h
@@ -127,7 +127,7 @@ namespace WTF {
: m_freeList(pool())
, m_isDoneWithInitialFreeList(false)
- {
+ {
- memset(m_pool.pool, 0, sizeof(m_pool.pool));
+ memset(m_pool, 0, sizeof(m_pool));
}
-
+
Node* allocate()
@@ -171,7 +171,7 @@ namespace WTF {
}
-
+
private:
- Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
+ Node* pool() { return reinterpret_cast<Node*>(m_pool); }
Node* pastPool() { return pool() + m_poolSize; }
-
+
bool inPool(Node* node)
@@ -182,10 +182,7 @@ namespace WTF {
Node* m_freeList;
@@ -37,12 +37,12 @@ Author: Mike Hommey <glandium at debian.org>
- } m_pool;
+ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
};
-
+
template<typename ValueArg, size_t inlineCapacity> struct ListHashSetNode {
---- a/JavaScriptCore/wtf/text/AtomicString.cpp
-+++ b/JavaScriptCore/wtf/text/AtomicString.cpp
+--- a/Source/JavaScriptCore/wtf/text/AtomicString.cpp
++++ b/Source/JavaScriptCore/wtf/text/AtomicString.cpp
@@ -130,7 +130,7 @@ static inline bool equal(StringImpl* str
-
+
// 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)
@@ -50,10 +50,10 @@ Author: Mike Hommey <glandium at debian.org>
const UChar* stringCharacters = string->characters();
for (unsigned i = 0; i != length; ++i) {
if (*stringCharacters++ != *characters++)
---- a/JavaScriptCore/wtf/text/StringHash.h
-+++ b/JavaScriptCore/wtf/text/StringHash.h
+--- a/Source/JavaScriptCore/wtf/text/StringHash.h
++++ b/Source/JavaScriptCore/wtf/text/StringHash.h
@@ -56,7 +56,7 @@ 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)
diff --git a/debian/patches/06_kfreebsd_strnstr.diff b/debian/patches/06_kfreebsd_strnstr.diff
index 58c5d7a..0fee625 100644
--- a/debian/patches/06_kfreebsd_strnstr.diff
+++ b/debian/patches/06_kfreebsd_strnstr.diff
@@ -3,12 +3,12 @@ Author: Fathi Boudra <fabo at debian.org>
Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
---
- JavaScriptCore/wtf/Platform.h | 2 +-
+ Source/JavaScriptCore/wtf/Platform.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/JavaScriptCore/wtf/Platform.h
-+++ b/JavaScriptCore/wtf/Platform.h
-@@ -385,7 +385,7 @@
+--- a/Source/JavaScriptCore/wtf/Platform.h
++++ b/Source/JavaScriptCore/wtf/Platform.h
+@@ -423,7 +423,7 @@
#endif
/* OS(LINUX) - Linux */
diff --git a/debian/patches/09_hurd.diff b/debian/patches/09_hurd.diff
index dc1e9c7..e368ea9 100644
--- a/debian/patches/09_hurd.diff
+++ b/debian/patches/09_hurd.diff
@@ -9,11 +9,11 @@ Forwarded: no
Last-Update: 2011-01-04
---
- JavaScriptCore/wtf/Platform.h | 5 +++++
+ Source/JavaScriptCore/wtf/Platform.h | 5 +++++
1 file changed, 5 insertions(+)
---- a/JavaScriptCore/wtf/Platform.h
-+++ b/JavaScriptCore/wtf/Platform.h
+--- a/Source/JavaScriptCore/wtf/Platform.h
++++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -28,6 +28,11 @@
#ifndef WTF_Platform_h
#define WTF_Platform_h
diff --git a/debian/patches/defines_qt_webkit.diff b/debian/patches/defines_qt_webkit.diff
index 7f6472c..53afa41 100644
--- a/debian/patches/defines_qt_webkit.diff
+++ b/debian/patches/defines_qt_webkit.diff
@@ -3,13 +3,16 @@ Author: Fathi Boudra <fabo at debian.org>
Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619443
Bug: http://bugreports.qt.nokia.com/browse/QTBUG-13608
---
- WebKit/qt/qt_webkit_version.pri | 1 +
+ Source/WebKit/qt/qt_webkit_version.pri | 1 +
1 file changed, 1 insertion(+)
---- a/WebKit/qt/qt_webkit_version.pri
-+++ b/WebKit/qt/qt_webkit_version.pri
-@@ -3,3 +3,4 @@ QT_WEBKIT_MAJOR_VERSION = 4
- QT_WEBKIT_MINOR_VERSION = 8
- QT_WEBKIT_PATCH_VERSION = 0
- QT_CONFIG += webkit
-+DEFINES += QT_WEBKIT
+--- a/Source/WebKit/qt/qt_webkit_version.pri
++++ b/Source/WebKit/qt/qt_webkit_version.pri
+@@ -11,6 +11,7 @@ QT.webkit.depends = core gui opengl netw
+
+ !contains(QT_CONFIG, modular)|contains(QT_ELIGIBLE_MODULES, webkit) {
+ QT_CONFIG += webkit
++ DEFINES += QT_WEBKIT
+ } else {
+ warning("Attempted to include $$QT.webkit.name in the build, but it was not enabled in configure.")
+ }
diff --git a/debian/patches/linux_amd64_no_overcommit.diff b/debian/patches/linux_amd64_no_overcommit.diff
index 1b59cb2..d896aa2 100644
--- a/debian/patches/linux_amd64_no_overcommit.diff
+++ b/debian/patches/linux_amd64_no_overcommit.diff
@@ -29,8 +29,8 @@ Description: Avoid crashes on amd64 with less than 3 or 4GB of RAM.
JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp | 55 +++++++++++++++---
1 file changed, 46 insertions(+), 9 deletions(-)
---- a/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-+++ b/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
+--- a/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
++++ b/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
@@ -38,14 +38,29 @@
#include <wtf/PageReservation.h>
#include <wtf/VMTags.h>
diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index 6e95e43..86cbfc0 100644
--- a/debian/patches/no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -11,8 +11,8 @@ Last-Update: 2011-03-28 (mips* and arm* added)
WebCore/WebCore.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/WebCore/WebCore.pro
-+++ b/WebCore/WebCore.pro
+--- a/Source/WebCore/WebCore.pro
++++ b/Source/WebCore/WebCore.pro
@@ -91,7 +91,7 @@ unix {
}
diff --git a/debian/patches/s390.diff b/debian/patches/s390.diff
index 0a1c334..21669ff 100644
--- a/debian/patches/s390.diff
+++ b/debian/patches/s390.diff
@@ -4,12 +4,12 @@ Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&ne
Forwarded: no
Last-Update: 2011-08-06
---- a/JavaScriptCore/wtf/Platform.h
-+++ b/JavaScriptCore/wtf/Platform.h
+--- a/Source/JavaScriptCore/wtf/Platform.h
++++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -186,6 +186,18 @@
#define WTF_CPU_SPARC 1
#endif
-
+
+/* CPU(S390X) - S390 64-bit */
+#if defined(__s390x__)
+#define WTF_CPU_S390X 1
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index cbe04f9..aa87b74 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -4,15 +4,14 @@ Author: Sune Vuorela <sune at debian.org>
Author: Modestas Vainius <modax at debian.org>
Bug-Debian: http://bugs.debian.org/528485
Bug-Debian: http://bugs.debian.org/618325
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618325
---
- WebKit.pri | 7 +++++++
+ Source/WebKit.pri | 7 +++++++
1 file changed, 7 insertions(+)
---- a/WebKit.pri
-+++ b/WebKit.pri
-@@ -59,6 +59,13 @@ CONFIG(release, debug|release) {
+--- a/Source/WebKit.pri
++++ b/Source/WebKit.pri
+@@ -71,6 +71,13 @@ CONFIG(release, debug|release) {
DEFINES += NDEBUG
}
@@ -23,6 +22,6 @@ Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618325
+}
+
+
- BASE_DIR = $$PWD
-
- symbian {
+ INCLUDEPATH += \
+ $$PWD \
+ $$PWD/../include \
--
QtWebKit packaging
More information about the pkg-kde-commits
mailing list