[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-53-g03fb5cb

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit a7dca125c489111039b3f05bb607257f7d5236c8
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sat Jun 7 22:42:35 2014 +0200

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

diff --git a/debian/changelog b/debian/changelog
index f9ce7e7..854bd38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
     Qt 5 to Qt 4
   * Update patches:
     - remove Fix_build_with_GLib_2.31_changeset_r97269, applied upstream
+    - remove upstream_changeset_r93631.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 01ed494..b1e1541 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # upstream patches
-upstream_changeset_r93631.diff
 upstream_changeset_r113848.diff
 upstream_Build-fixes-for-glib-2.31.diff
 
diff --git a/debian/patches/upstream_changeset_r93631.diff b/debian/patches/upstream_changeset_r93631.diff
deleted file mode 100644
index 9b8eedd..0000000
--- a/debian/patches/upstream_changeset_r93631.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-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