From d6fb2938e0fe2dec2a1ad7020069dc09fc0189fb Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 14 Apr 2012 23:44:46 +0200 Subject: fix building with gcc 4.7 (#667346) backport (parts of) upstream r93631 and r113848, with a small adaptation to use current (and not used-for-qt4 one) g++ minor version --- debian/patches/upstream_changeset_r93631.diff | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 debian/patches/upstream_changeset_r93631.diff (limited to 'debian/patches/upstream_changeset_r93631.diff') diff --git a/debian/patches/upstream_changeset_r93631.diff b/debian/patches/upstream_changeset_r93631.diff new file mode 100644 index 0000000..9f919cf --- /dev/null +++ b/debian/patches/upstream_changeset_r93631.diff @@ -0,0 +1,16 @@ +Description: Fixed warnings produced by gcc-4.6.0. +Author: Ahmad Sharif +Bug: https://bugs.webkit.org/show_bug.cgi?id=62168 +Origin: upstream, http://trac.webkit.org/changeset/93631 + +--- 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 currentStyle(renderStyle()); +- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; ++ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast(parentNodeForRenderingAndStyle()->renderStyle()) : false; + bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules(); + bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules(); + -- cgit v1.2.3