[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-5-11-g2259d2b
Fathi Boudra
fabo at alioth.debian.org
Tue May 1 12:09:26 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=d0f25e3
The following commit has been merged in the master branch:
commit d0f25e33d40cb8037fcaed51ec2ad4ee36df2e26
Merge: fe9125fa3149a0e93623117202265cc6a3d154b8 0bc501168b5ebd2b0cf7f1c833365ab2230b3660
Author: Fathi Boudra <fabo at debian.org>
Date: Tue May 1 15:06:35 2012 +0300
Merge branch 'experimental'
debian/changelog | 12 ++++++++
debian/control | 8 +++--
debian/libqtwebkit-dev.install | 8 ++--
debian/libqtwebkit4.install | 2 +-
debian/patches/01_lflags_as-needed.diff | 2 +-
.../patches/02_add_nostrip_for_debug_packages.diff | 2 +-
debian/patches/03_hide_std_symbols.diff | 2 +-
.../adjust_symbols_visibility_for_webcore.diff | 30 --------------------
debian/patches/glibc_mkspec.diff | 2 +-
debian/patches/hurd.diff | 8 ++++-
debian/patches/series | 1 -
debian/patches/stabs_format_debug_info.diff | 2 +-
debian/patches/upstream_changeset_r113848.diff | 8 ++++-
debian/patches/upstream_changeset_r93631.diff | 4 ++
14 files changed, 44 insertions(+), 47 deletions(-)
diff --cc debian/changelog
index 111aef3,90c1dc7..5c52dda
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,15 +1,61 @@@
+ 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 at 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.
+ * Mark a bunch of other internal WebCore namespace symbols as
+ optional=private.
+ * Mark some external symbols as optional=external.
+
+ -- Modestas Vainius <modax at debian.org> Mon, 16 Apr 2012 23:35:59 +0300
+
+qtwebkit (2.2.0-4) unstable; urgency=low
+
+ * Team upload.
+
+ [ Pino Toscano ]
+ * Add -Wl,--no-relax to the LDFLAGS on alpha. (Closes: #656056)
+ * Update the symbols file for alpha, armhf and ppc64, and for all the other
+ archs from their build logs. (Closes: #653905, #656056, #664897)
+ * Backport (parts of) upstream r93631 and r113848 to fix building with
+ GCC 4.7. (Closes: #667346)
+
+ [ Felix Geyer ]
+ * Add Fix_build_with_GLib_2.31_changeset_r97269.patch, cherry-picked from
+ upstream. (Closes: #665679)
+ * Bump debhelper compat level to v9.
+ - Use DEB_<flag>_MAINT variables instead of manipulating the flag variables
+ directly.
+ * Bump Standards-Version to 3.9.3, no changes needed.
+
+ [ Modestas Vainius ]
+ * Mark symbols having 'Private' in their name as optional=private.
+ * Mark '^ _ZN7WebCore' symbols as optional=private. They are not part of
+ public API.
+
+ -- Modestas Vainius <modax at debian.org> Sun, 15 Apr 2012 21:16:49 +0300
+
+qtwebkit (2.2.0-3) unstable; urgency=low
+
+ [ Fathi Boudra ]
+ * Update the symbols file for ia64 and mipsel architectures.
+
+ [ Pino Toscano ]
+ * Add patch hurd.diff to temporarly workaround build failure on Hurd.
+ * Update the symbols file for hurd-i386, sh4, and sparc64 architectures.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 28 Dec 2011 10:10:59 +0200
+
qtwebkit (2.2.0-2) unstable; urgency=low
[ Pino Toscano ]
diff --cc debian/patches/hurd.diff
index 83d4866,0000000..1631c4d
mode 100644,000000..100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@@ -1,29 -1,0 +1,33 @@@
+Author: Pino Toscano <pino at debian.org>
+Description: fix (workaround) build on GNU/Hurd
+ Apparently PTHREAD_MUTEX_NORMAL and PTHREAD_MUTEX_DEFAULT cannot be used
+ in preprocessor expressions, so temporarly use directly the code which would
+ be used on GNU/Hurd.
+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.
++#if defined(__GNU__)
++ pthread_mutex_init(&m_scavengeMutex, 0);
++#else
+ #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
++#endif
+
+ pthread_cond_init(&m_scavengeCondition, 0);
+ m_scavengeThreadActive = true;
diff --cc debian/patches/series
index 85afe41,6c06450..d3feb9b
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,4 +1,7 @@@
# 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
# debian patches
01_lflags_as-needed.diff
diff --cc debian/patches/upstream_changeset_r113848.diff
index 390d805,0000000..13f6542
mode 100644,000000..100644
--- a/debian/patches/upstream_changeset_r113848.diff
+++ b/debian/patches/upstream_changeset_r113848.diff
@@@ -1,44 -1,0 +1,50 @@@
+Description: Fix the build with gcc 4.7.0
+ .
+ The part in Source/common.pri has been adapted to use the version of g++
+ used during build, not the one used to build Qt4.
+Author: Andras Becsi <andras.becsi at nokia.com>
+Author: Pino Toscano <pino at 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
+ RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
+ if (optionalWidth)
+ image->setWidth(*optionalWidth);
+- if (optionalHeight > 0)
++ if (optionalHeight)
+ image->setHeight(*optionalHeight);
+ return image.release();
+ }
+--- a/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
++++ b/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
+@@ -25,6 +25,7 @@ namespace WebCore {
+ #if ENABLE(TILED_BACKING_STORE)
+ class TiledBackingStoreClient {
+ public:
++ virtual ~TiledBackingStoreClient() { }
+ virtual void tiledBackingStorePaintBegin() = 0;
+ virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
+ 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) {
+- message(Using gold linker)
+- QMAKE_LFLAGS+=-fuse-ld=gold
++ GCC_VERSION_MINOR = $$system($$QMAKE_CXX -dumpversion | sed -r -e 's,\([0-9]+\)\\.\([0-9]+\).*,\\2,g')
++ # Upstream gcc 4.7 does not support the -fuse-ld=gold option ( see: http://sourceware.org/ml/binutils/2011-01/msg00178.html )
++ isEqual(QT_GCC_MAJOR_VERSION, 4):lessThan(GCC_VERSION_MINOR, 7):QMAKE_LFLAGS+=-fuse-ld=gold
+ }
+ }
+
diff --cc debian/patches/upstream_changeset_r93631.diff
index 9f919cf,0000000..9b8eedd
mode 100644,000000..100644
--- a/debian/patches/upstream_changeset_r93631.diff
+++ b/debian/patches/upstream_changeset_r93631.diff
@@@ -1,16 -1,0 +1,20 @@@
+Description: Fixed warnings produced by gcc-4.6.0.
+Author: Ahmad Sharif <asharif at 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
+ {
+ // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
+ RefPtr<RenderStyle> currentStyle(renderStyle());
+- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
++ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
+ bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
+ bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
+
--
QtWebKit packaging
More information about the pkg-kde-commits
mailing list