Re: Bug#844722: qtwebkit: Please add platform support for m68k
Hi!
Attaching the debdiff for qtwebkit_2.3.4.dfsg-9.1.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
diff -Nru qtwebkit-2.3.4.dfsg/debian/changelog qtwebkit-2.3.4.dfsg/debian/changelog
--- qtwebkit-2.3.4.dfsg/debian/changelog 2016-10-21 13:55:27.000000000 +0200
+++ qtwebkit-2.3.4.dfsg/debian/changelog 2016-11-23 11:46:11.000000000 +0100
@@ -1,3 +1,10 @@
+qtwebkit (2.3.4.dfsg-9.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add m68k_support.diff to add basic m68k support (Closes: #844722).
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Wed, 23 Nov 2016 11:46:11 +0100
+
qtwebkit (2.3.4.dfsg-9) unstable; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
diff -Nru qtwebkit-2.3.4.dfsg/debian/patches/m68k_support.diff qtwebkit-2.3.4.dfsg/debian/patches/m68k_support.diff
--- qtwebkit-2.3.4.dfsg/debian/patches/m68k_support.diff 1970-01-01 01:00:00.000000000 +0100
+++ qtwebkit-2.3.4.dfsg/debian/patches/m68k_support.diff 2016-11-17 22:21:48.000000000 +0100
@@ -0,0 +1,93 @@
+Description: Add support for m68k
+Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+
+--- qtwebkit-2.3.4.dfsg.orig/Source/WTF/wtf/Platform.h
++++ qtwebkit-2.3.4.dfsg/Source/WTF/wtf/Platform.h
+@@ -345,6 +345,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
+--- qtwebkit-2.3.4.dfsg.orig/Source/WTF/wtf/dtoa/utils.h
++++ qtwebkit-2.3.4.dfsg/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
+--- qtwebkit-2.3.4.dfsg.orig/Source/WebCore/css/CSSProperty.cpp
++++ qtwebkit-2.3.4.dfsg/Source/WebCore/css/CSSProperty.cpp
+@@ -39,7 +39,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()
+ {
+--- qtwebkit-2.3.4.dfsg.orig/Source/WebCore/dom/ShadowRoot.cpp
++++ qtwebkit-2.3.4.dfsg/Source/WebCore/dom/ShadowRoot.cpp
+@@ -60,7 +60,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);
+
+ ShadowRoot::ShadowRoot(Document* document)
+ : DocumentFragment(document, CreateShadowRoot)
+--- qtwebkit-2.3.4.dfsg.orig/Source/WebCore/rendering/style/RenderStyle.cpp
++++ qtwebkit-2.3.4.dfsg/Source/WebCore/rendering/style/RenderStyle.cpp
+@@ -58,7 +58,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];
+@@ -75,7 +75,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()
+ {
+--- qtwebkit-2.3.4.dfsg.orig/Source/WebCore/rendering/style/StyleBoxData.cpp
++++ qtwebkit-2.3.4.dfsg/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())
+--- qtwebkit-2.3.4.dfsg.orig/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
++++ qtwebkit-2.3.4.dfsg/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
+@@ -61,7 +61,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())
diff -Nru qtwebkit-2.3.4.dfsg/debian/patches/series qtwebkit-2.3.4.dfsg/debian/patches/series
--- qtwebkit-2.3.4.dfsg/debian/patches/series 2016-10-21 13:53:04.000000000 +0200
+++ qtwebkit-2.3.4.dfsg/debian/patches/series 2016-11-17 22:20:52.000000000 +0100
@@ -25,3 +25,4 @@
fix_number_of_cpus_in_kfreebsd.diff
fix_x32_cpu_detection.patch
disable-jit-nonsse2.patch
+m68k_support.diff
Reply to: