Bug#902100: webkit2gtk: Please update patch fix-ftbfs-m68k.patch

[John Paul Adrian Glaubitz]

Source: webkit2gtk
Version: 2.20.3-1
Severity: normal
Tags: patch
User: debian-68k at lists.debian.org
Usertags: m68k

Hello!

The patch fix-ftbfs-m68k.patch needs to be updated to fix the FTBFS
of webkit2gtk on m68k. I have done that, could you apply the attached
patch for the next upload?

Thanks,
Adrian

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz at debian.org
`. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
-------------- next part --------------
From: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
Subject: Fix FTBFS on m68k
Bug-Debian: https://bugs.debian.org/868126
Last-Update: 2017-07-11
Index: webkit2gtk-2.20.3/Source/WTF/wtf/Platform.h
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WTF/wtf/Platform.h
+++ webkit2gtk-2.20.3/Source/WTF/wtf/Platform.h
@@ -59,6 +59,11 @@
 /* ==== CPU() - the target CPU architecture ==== */
 /* CPU(KNOWN) becomes true if we explicitly support a target CPU. */
 
+/* CPU(M68K) - m68k */
+#if defined(__m68k__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
 /* CPU(MIPS) - MIPS 32-bit and 64-bit */
 #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) || defined(__mips64))
 #if defined(_ABI64) && (_MIPS_SIM == _ABI64)
Index: webkit2gtk-2.20.3/Source/WebCore/css/CSSProperty.cpp
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WebCore/css/CSSProperty.cpp
+++ webkit2gtk-2.20.3/Source/WebCore/css/CSSProperty.cpp
@@ -33,7 +33,11 @@ struct SameSizeAsCSSProperty {
     void* value;
 };
 
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(CSSProperty) <= sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small);
+#else
 COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small);
+#endif
 
 CSSPropertyID StylePropertyMetadata::shorthandID() const
 {
Index: webkit2gtk-2.20.3/Source/WebCore/dom/ElementRareData.cpp
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WebCore/dom/ElementRareData.cpp
+++ webkit2gtk-2.20.3/Source/WebCore/dom/ElementRareData.cpp
@@ -46,6 +46,10 @@ struct SameSizeAsElementRareData : NodeR
     void* pointers[8];
 };
 
+#if defined(__m68k__)
+static_assert(sizeof(ElementRareData) <= sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
+#else
 static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
+#endif
 
 } // namespace WebCore
Index: webkit2gtk-2.20.3/Source/WebCore/dom/NodeRareData.cpp
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WebCore/dom/NodeRareData.cpp
+++ webkit2gtk-2.20.3/Source/WebCore/dom/NodeRareData.cpp
@@ -38,6 +38,10 @@ struct SameSizeAsNodeRareData {
     void* m_pointer[3];
 };
 
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(NodeRareData) <= sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
+#else
 COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
+#endif
 
 } // namespace WebCore
Index: webkit2gtk-2.20.3/Source/WebCore/dom/ShadowRoot.cpp
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WebCore/dom/ShadowRoot.cpp
+++ webkit2gtk-2.20.3/Source/WebCore/dom/ShadowRoot.cpp
@@ -47,7 +47,11 @@ struct SameSizeAsShadowRoot : public Doc
     void* slotAssignment;
 };
 
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(ShadowRoot) <= sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
+#else
 COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
+#endif
 
 ShadowRoot::ShadowRoot(Document& document, ShadowRootMode type)
     : DocumentFragment(document, CreateShadowRoot)
Index: webkit2gtk-2.20.3/Source/WebCore/rendering/style/RenderStyle.cpp
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WebCore/rendering/style/RenderStyle.cpp
+++ webkit2gtk-2.20.3/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -63,7 +63,11 @@ struct SameSizeAsBorderValue {
     int m_restBits;
 };
 
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(BorderValue) <= sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
+#else
 COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
+#endif
 
 struct SameSizeAsRenderStyle {
     void* dataRefs[7];
@@ -81,7 +85,11 @@ struct SameSizeAsRenderStyle {
 #endif
 };
 
+#if defined(__m68k__)
+static_assert(sizeof(RenderStyle) <= sizeof(SameSizeAsRenderStyle), "RenderStyle should stay small");
+#else
 static_assert(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), "RenderStyle should stay small");
+#endif
 
 RenderStyle& RenderStyle::defaultStyle()
 {
Index: webkit2gtk-2.20.3/Source/WebCore/rendering/style/StyleBoxData.cpp
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WebCore/rendering/style/StyleBoxData.cpp
+++ webkit2gtk-2.20.3/Source/WebCore/rendering/style/StyleBoxData.cpp
@@ -33,7 +33,11 @@ struct SameSizeAsStyleBoxData : public R
     uint32_t bitfields;
 };
 
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(StyleBoxData) <= sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow);
+#else
 COMPILE_ASSERT(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow);
+#endif
 
 StyleBoxData::StyleBoxData()
     : m_minWidth(RenderStyle::initialMinSize())
Index: webkit2gtk-2.20.3/Source/WebCore/css/RuleSet.h
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WebCore/css/RuleSet.h
+++ webkit2gtk-2.20.3/Source/WebCore/css/RuleSet.h
@@ -98,7 +98,11 @@ struct SameSizeAsRuleData {
     unsigned d[4];
 };
 
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(RuleData) <= sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
+#else
 COMPILE_ASSERT(sizeof(RuleData) == sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
+#endif
 
 class RuleSet {
     WTF_MAKE_NONCOPYABLE(RuleSet); WTF_MAKE_FAST_ALLOCATED;
Index: webkit2gtk-2.20.3/Source/WebCore/platform/graphics/FontDescription.cpp
===================================================================
--- webkit2gtk-2.20.3.orig/Source/WebCore/platform/graphics/FontDescription.cpp
+++ webkit2gtk-2.20.3/Source/WebCore/platform/graphics/FontDescription.cpp
@@ -52,7 +52,11 @@ struct SameSizeAsFontCascadeDescription
     unsigned bitfields3 : 10;
 };
 
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(FontCascadeDescription) <= sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+#else
 COMPILE_ASSERT(sizeof(FontCascadeDescription) == sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+#endif
 
 FontDescription::FontDescription()
     : m_fontSelectionRequest { FontCascadeDescription::initialWeight(), FontCascadeDescription::initialStretch(), FontCascadeDescription::initialItalic() }