Bug#840693: qttools-opensource-src: Please disable WebKit support on m68k and sh4

To: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Debian Bug Tracking System <submit@bugs.debian.org>, 840693@bugs.debian.org
Subject: Bug#840693: qttools-opensource-src: Please disable WebKit support on m68k and sh4
From: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri, 14 Oct 2016 11:02:00 +0200
Message-id: <[🔎] 87twcfmhh3.fsf@linux-m68k.org>
Reply-to: Andreas Schwab <schwab@linux-m68k.org>, 840693@bugs.debian.org
In-reply-to: <147639777845.2810.5115825770825297046.reportbug__12127.7895560072$1476398018$gmane$org@ikarus> (John Paul Adrian Glaubitz's message of "Fri, 14 Oct 2016 00:29:38 +0200")
References: <147639777845.2810.5115825770825297046.reportbug__12127.7895560072$1476398018$gmane$org@ikarus>

On Okt 14 2016, John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> wrote:

> Both on m68k and sh4, qtwebkit-opensource-src doesn't build [1] and fixing the
> issue would probably require quite some elbow grease.

Fixing m68k build is easy:

Index: qtwebkit-opensource-src-5.4.1/Source/WTF/wtf/Platform.h
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WTF/wtf/Platform.h
+++ qtwebkit-opensource-src-5.4.1/Source/WTF/wtf/Platform.h
@@ -353,6 +353,12 @@
 #endif
 #endif
 
+/* CPU(M68K) - m68k */
+#if defined(__mc68000__)
+#define WTF_CPU_M68K 1
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
 #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64)
 #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
 #endif
Index: qtwebkit-opensource-src-5.4.1/Source/WTF/wtf/dtoa/utils.h
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WTF/wtf/dtoa/utils.h
+++ qtwebkit-opensource-src-5.4.1/Source/WTF/wtf/dtoa/utils.h
@@ -58,6 +58,8 @@ defined(_MIPS_ARCH_MIPS32R2)
 #else
 #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
 #endif  // _WIN32
+#elif defined(__mc68000__)
+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
 #else
 #error Target architecture was not detected as supported by Double-Conversion.
 #endif
Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/css/CSSProperty.cpp
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/css/CSSProperty.cpp
+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/css/CSSProperty.cpp
@@ -38,7 +38,7 @@ struct SameSizeAsCSSProperty {
     void* value;
 };
 
-COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small);
+COMPILE_ASSERT(sizeof(CSSProperty) <= sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small);
 
 void CSSProperty::wrapValueInCommaSeparatedList()
 {
Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/ElementRareData.cpp
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/dom/ElementRareData.cpp
+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/ElementRareData.cpp
@@ -44,6 +44,6 @@ struct SameSizeAsElementRareData : NodeR
     void* pointers[7];
 };
 
-COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall);
+COMPILE_ASSERT(sizeof(ElementRareData) <= sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall);
 
 } // namespace WebCore
Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/NodeRareData.cpp
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/dom/NodeRareData.cpp
+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/NodeRareData.cpp
@@ -41,6 +41,6 @@ struct SameSizeAsNodeRareData {
 #endif
 };
 
-COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
+COMPILE_ASSERT(sizeof(NodeRareData) <= sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
 
 } // namespace WebCore
Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/ShadowRoot.cpp
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/dom/ShadowRoot.cpp
+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/ShadowRoot.cpp
@@ -42,7 +42,7 @@ struct SameSizeAsShadowRoot : public Doc
     unsigned countersAndFlags[1];
 };
 
-COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
+COMPILE_ASSERT(sizeof(ShadowRoot) <= sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
 
 enum ShadowRootUsageOriginType {
     ShadowRootUsageOriginWeb = 0,
Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/RenderStyle.cpp
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/rendering/style/RenderStyle.cpp
+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -57,7 +57,7 @@ struct SameSizeAsBorderValue {
     unsigned m_width;
 };
 
-COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
+COMPILE_ASSERT(sizeof(BorderValue) <= sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
 
 struct SameSizeAsRenderStyle : public RefCounted<SameSizeAsRenderStyle> {
     void* dataRefs[7];
@@ -74,7 +74,7 @@ struct SameSizeAsRenderStyle : public Re
     } noninherited_flags;
 };
 
-COMPILE_ASSERT(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small);
+COMPILE_ASSERT(sizeof(RenderStyle) <= sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small);
 
 inline RenderStyle* defaultStyle()
 {
Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/StyleBoxData.cpp
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/rendering/style/StyleBoxData.cpp
+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/StyleBoxData.cpp
@@ -33,7 +33,7 @@ struct SameSizeAsStyleBoxData : public R
     uint32_t bitfields;
 };
 
-COMPILE_ASSERT(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow);
+COMPILE_ASSERT(sizeof(StyleBoxData) <= sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow);
 
 StyleBoxData::StyleBoxData()
     : m_minWidth(RenderStyle::initialMinSize())
Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
===================================================================
--- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
@@ -59,7 +59,7 @@ struct SameSizeAsStyleRareInheritedData
 #endif
 };
 
-COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack);
+COMPILE_ASSERT(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack);
 
 StyleRareInheritedData::StyleRareInheritedData()
     : listStyleImage(RenderStyle::initialListStyleImage())

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Reply to:

Prev by Date: Processed: reassign 840653 to pyme, block 840642 with 840653 840652 840651
Next by Date: Still Failing: chroot-installation_jessie_install_kde_upgrade_to_stretch_aptdpkg_first/121
Previous by thread: Bug#840693: marked as done (qttools-opensource-src: Please disable WebKit support on m68k and sh4)
Next by thread: Bug#840695: plasma-sdk: lookandfeelexplorer requires kirigami, but it is not marked even in Recommends
Index(es):
- Date
- Thread