Bug#660963: qt4-x11: m68k third attempt
Hi,
I will now try the attached patch (luckily, avr32 already uses the
GCC atomic builtins), since the latter have become available with
GCC as patched in Debian-Ports unreleased repository.
Do you think this could work?
Also, http://lists.debian.org/debian-68k/2012/05/msg00110.html
(and http://lists.debian.org/debian-68k/2012/07/msg00000.html
which the mailing list archive doesn’t show as follow-up) come
to mind… if someone has got an idea…
bye,
//mirabilos
--
«MyISAM tables -will- get corrupted eventually. This is a fact of life. »
“mysql is about as much database as ms access” – “MSSQL at least descends
from a database” “it's a rebranded SyBase” “MySQL however was born from a
flatfile and went downhill from there” – “at least jetDB doesn’t claim to
be a database” -- Tonnerre, psychoschlumpf and myself in #nosec
diff -Nru qt4-x11-4.8.2/debian/changelog qt4-x11-4.8.2/debian/changelog
--- qt4-x11-4.8.2/debian/changelog 2012-06-10 11:09:56.000000000 +0200
+++ qt4-x11-4.8.2/debian/changelog 2012-07-29 21:34:29.000000000 +0200
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.8.2-1+m68k.1) unreleased; urgency=low
+
+ * Add patch to recognise the m68k architecture and use GCC atomic
+ builtins (from debian-ports GCC) like avr32 (Closes: #660963)
+
+ -- Thorsten Glaser <tg@mirbsd.de> Sun, 29 Jul 2012 21:33:38 +0200
+
qt4-x11 (4:4.8.2-1) unstable; urgency=low
* New upstream release.
diff -Nru qt4-x11-4.8.2/debian/patches/m68k.diff qt4-x11-4.8.2/debian/patches/m68k.diff
--- qt4-x11-4.8.2/debian/patches/m68k.diff 1970-01-01 01:00:00.000000000 +0100
+++ qt4-x11-4.8.2/debian/patches/m68k.diff 2012-07-29 21:33:09.000000000 +0200
@@ -0,0 +1,21 @@
+Author: Thorsten Glaser <tg@debian.org>
+Description: Recognise m68k as architecture; use GCC atomic builtins like avr32
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660963
+
+--- /dev/null
++++ b/src/corelib/arch/m68k/arch.pri
+@@ -0,0 +1,3 @@
++#
++# Motorola 68000 and ColdFire (m68k) architecture
++#
+--- a/src/corelib/arch/qatomic_arch.h
++++ b/src/corelib/arch/qatomic_arch.h
+@@ -66,6 +66,8 @@ QT_BEGIN_HEADER
+ # include "QtCore/qatomic_i386.h"
+ #elif defined(QT_ARCH_IA64)
+ # include "QtCore/qatomic_ia64.h"
++#elif defined(QT_ARCH_M68K)
++# include "QtCore/qatomic_avr32.h"
+ #elif defined(QT_ARCH_MACOSX)
+ # include "QtCore/qatomic_macosx.h"
+ #elif defined(QT_ARCH_MIPS)
diff -Nru qt4-x11-4.8.2/debian/patches/series qt4-x11-4.8.2/debian/patches/series
--- qt4-x11-4.8.2/debian/patches/series 2012-06-09 22:57:25.000000000 +0200
+++ qt4-x11-4.8.2/debian/patches/series 2012-07-29 21:29:27.000000000 +0200
@@ -45,3 +45,6 @@
CVE-2011-3922.patch
qt_atomic_sparc64.patch
no_libicu_message.diff
+
+# debian-ports patches
+m68k.diff
Reply to: