[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=163ed94

The following commit has been merged in the experimental branch:
commit 163ed949d488c86fd24c8f43402ffdb1eb78aae1
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sat Jun 7 22:46:27 2014 +0200

    Remove patch: upstream_changeset_r113848.diff
    
    Patch was applied upstream.
---
 debian/changelog                               |  1 +
 debian/patches/series                          |  1 -
 debian/patches/upstream_changeset_r113848.diff | 50 --------------------------
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 854bd38..ee281f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
   * Update patches:
     - remove Fix_build_with_GLib_2.31_changeset_r97269, applied upstream
     - remove upstream_changeset_r93631.diff, applied upstream
+    - remove upstream_changeset_r113848.diff, applied upstream 
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Jun 2014 21:18:08 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index b1e1541..3e100cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # upstream patches
-upstream_changeset_r113848.diff
 upstream_Build-fixes-for-glib-2.31.diff
 
 # debian patches
diff --git a/debian/patches/upstream_changeset_r113848.diff b/debian/patches/upstream_changeset_r113848.diff
deleted file mode 100644
index 13f6542..0000000
--- a/debian/patches/upstream_changeset_r113848.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-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 @@ 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
- }
- }
- 

-- 
QtWebKit packaging