--- Begin Message ---
Source: qtwebkit
Version: 2.3.4.dfsg-9
Severity: normal
User: debian-68k@lists.debian.org
Usertags: m68k
Hi!
qtwebkit used to build fine in the past but due to changes in the
upstream WebKit code no longer does. I have therefore created a
small patch which re-adds m68k support to qtwebkit.
This patch is based on the m68k support patch for qtwebkit-
opensource-src [1] and I have verified it to make qtwebkit
build fine on m68k with the patch applied.
It would be great to have both qtwebkit-opensource-src and
qtwebkit patched for m68k support as both packages still have
a lot of reverse dependencies and therefore prevent several
packages from being built on m68k.
I'm aware that qtwebkit* is going away in the future, but until
this has happened, it would be great to just have m68k support
in the package to help Debian's m68k port move forward.
Thanks,
Adrian
> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780430
--
.''`. 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
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())
--- End Message ---
--- Begin Message ---
Source: qtwebkit
Source-Version: 2.3.4.dfsg-9.1
We believe that the bug you reported is fixed in the latest version of
qtwebkit, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 844722@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> (supplier of updated qtwebkit package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 23 Nov 2016 11:46:11 +0100
Source: qtwebkit
Binary: libqtwebkit-dev libqtwebkit4 libqtwebkit-qmlwebkitplugin libqtwebkit4-dbg
Architecture: source amd64
Version: 2.3.4.dfsg-9.1
Distribution: sid
Urgency: medium
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Changed-By: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Description:
libqtwebkit-dev - Web content engine library for Qt - development files
libqtwebkit-qmlwebkitplugin - Qt WebKit QML plugin
libqtwebkit4 - Web content engine library for Qt
libqtwebkit4-dbg - Web content engine library for Qt - debugging symbols
Closes: 844722
Changes:
qtwebkit (2.3.4.dfsg-9.1) unstable; urgency=medium
.
* Non-maintainer upload.
* Add m68k_support.diff to add basic m68k support (Closes: #844722).
Checksums-Sha1:
0b8d2479d300243fe2643a9623eb9842aa34a419 2581 qtwebkit_2.3.4.dfsg-9.1.dsc
a0a95c848c8cdcd59be754ac11467bc7f98bebd8 86252 qtwebkit_2.3.4.dfsg-9.1.debian.tar.xz
a0079caf8f35926d16a8bdb5f3b7c10ad0ac0f54 115030 libqtwebkit-dev_2.3.4.dfsg-9.1_amd64.deb
3776f144a35ed524fce005ad444bc6d7842a6a1f 123072 libqtwebkit-qmlwebkitplugin_2.3.4.dfsg-9.1_amd64.deb
9d0b6c76b5aab15647d2723c0cdb9c5c36aa9a78 90376498 libqtwebkit4-dbg_2.3.4.dfsg-9.1_amd64.deb
276b7bf9cb6ad32b1860f7fada379d5d667ddf83 8882374 libqtwebkit4_2.3.4.dfsg-9.1_amd64.deb
d68bb58ba5436944fd19c0248d1f99e2dba9b33f 10904 qtwebkit_2.3.4.dfsg-9.1_amd64.buildinfo
Checksums-Sha256:
b20e77362136ff3689940f792a381ade08e3226eea35739d6c7305e1ea0ee7e9 2581 qtwebkit_2.3.4.dfsg-9.1.dsc
2d54cc0a063dc3b32cb6f42cc2b28d790c6c1eb9498a448f6fd5363f9fecf565 86252 qtwebkit_2.3.4.dfsg-9.1.debian.tar.xz
0f481d34a8a7a469a9e38c54be2f352cc784764439d97722d1eb4eb22302c640 115030 libqtwebkit-dev_2.3.4.dfsg-9.1_amd64.deb
e185bc5c53da7e90d54f06d0a45c255efb21e7a63b17d7e31b16c233ad4bac09 123072 libqtwebkit-qmlwebkitplugin_2.3.4.dfsg-9.1_amd64.deb
db8bf2ca4ad6afad7820a4562bf29d7da5ca4fe74cbfd74bfa561eb5c18ebb81 90376498 libqtwebkit4-dbg_2.3.4.dfsg-9.1_amd64.deb
bfd63dca3d12c9ddfdd16d895c4a90e0cd715f5c2e3f090c2f506df666dae779 8882374 libqtwebkit4_2.3.4.dfsg-9.1_amd64.deb
0be21d756a4b5a79fc9a8ef9dcd374b837e607e937c57db5a87fb400ec58ffea 10904 qtwebkit_2.3.4.dfsg-9.1_amd64.buildinfo
Files:
984d4a0d76aa3a9add5d4f9755014fa1 2581 libs optional qtwebkit_2.3.4.dfsg-9.1.dsc
b31e3e98ca910dc9108218678107c222 86252 libs optional qtwebkit_2.3.4.dfsg-9.1.debian.tar.xz
80c317c78dbbdcf4c9d8806c9a4ed40a 115030 libdevel optional libqtwebkit-dev_2.3.4.dfsg-9.1_amd64.deb
ee2d0edc3d09012f041e1312da024ff8 123072 libs optional libqtwebkit-qmlwebkitplugin_2.3.4.dfsg-9.1_amd64.deb
0a6218bfe1ffb5455d9592424e1c512c 90376498 debug extra libqtwebkit4-dbg_2.3.4.dfsg-9.1_amd64.deb
e8964e30084ff70e24453b9b079f7949 8882374 libs optional libqtwebkit4_2.3.4.dfsg-9.1_amd64.deb
091557fbbe76449efa185821686a227e 10904 libs optional qtwebkit_2.3.4.dfsg-9.1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEYv+KdYTgKVaVRgAGdCY7N/W1+RMFAlg1vqQACgkQdCY7N/W1
+RNfdQ/+L3bPD2Ersa4GzlLgNyI9v1uSBcnBErgSAWLBTeFBwXDW08sRJ+rHHecG
4Uz63U4s4zl9JsL+7PvwDe1U3avjER1tIfpj6Yyq5Z3gtoOZVg/zD1DBMKWtFYgW
oaJ50W/ejq82nCCDhrjTaFj9lTvg5oeV0k2sMADKoW7u2YpHb2jWNykjCHZR0mAl
uun+lZrshhj2syxsU6Yr5MVIsjtSFTW6hrgEPNEMQ3JXFEBb8BQVGDin9Ka0aoIm
DLxIF7JP+8s7DCBLuGR2otHDs8fp5GAS+lxIp8L7xiPKp7F1gOYV5Wt8+ihBDiQJ
sV+1mT0UrSQw6R2o2DHyKD9mJ5AUQfBlRTHm1eVxL1QV5BFMWgzRZ4ftFsGOs4Fd
fsThUmfe4z6Phm3VW0ibPXXE6OWkBz0JHbw/yK8qHUtNEtgDUOQjUIJCEBCUAOlM
LLeyUGXuuDQ3XYILMD4xUu8IBBYHVK0AN24+Rc3CzpzZ171XA9qm3tFfW4ymY2rE
C1E+ARdM5dDtv4i6hNjsd3xG/ZjlIO64l5lgLs22cc+A8cy5whDuLiqSHCwTgiA9
K7FKwy3LtEpdJU0/KoEwcFiI4vFDDv+vYH97adA+A+vwwl6ILXrXzg9UlG4CncZA
xVdgdnFpOMI0nd+ZNTy1LdsTAiz5svq3TeRQTyKbqWSukEpmzO4=
=MGfn
-----END PGP SIGNATURE-----
--- End Message ---