Bug#660963: Porting qt4-x11 to Debian/m68k
tags 660963 + patch confirmed
thanks
Hi,
I’ve confirmed that the patch from the attached debdiff works.
bye,
//mirabilos
--
Darwinism never[…]applied to wizardkind. There's a more than fair amount of[…]
stupidity in its gene-pool[…]never eradicated[…]magic evens the odds that way.
It's[…]harder to die for us than[…]muggles[…]wonder if, as technology[…]better
[…]same will[…]happen there too. Dursleys' continued existence indicates so.
--- qt4-x11-4.8.2+dfsg/debian/changelog 2012-11-24 02:10:05.000000000 +0100
+++ qt4-x11-4.8.2+dfsg/debian/changelog 2012-11-25 16:34:22.000000000 +0100
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.8.2+dfsg-3+m68k.2) unreleased; urgency=low
+
+ * Add atomics glue for m68k, reusing avr32 support (Closes: #660963).
+
+ -- Thorsten Glaser <tg@mirbsd.de> Sun, 25 Nov 2012 16:33:39 +0100
+
qt4-x11 (4:4.8.2+dfsg-3) unstable; urgency=medium
* Apply disable-SSL-compression-by-default.patch. Disables SSL compression
--- qt4-x11-4.8.2+dfsg/debian/patches/m68k.diff 1970-01-01 01:00:00.000000000 +0100
+++ qt4-x11-4.8.2+dfsg/debian/patches/m68k.diff 2012-11-25 16:33:20.000000000 +0100
@@ -0,0 +1,22 @@
+Description: Use GCC atomic builtins on m68k, like avr32 does
+Author: Thorsten Glaser <tg@debian.org>
+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,9 @@ QT_BEGIN_HEADER
+ # include "QtCore/qatomic_i386.h"
+ #elif defined(QT_ARCH_IA64)
+ # include "QtCore/qatomic_ia64.h"
++#elif defined(QT_ARCH_M68K)
++/* this works (on Linux) because qatomic_avr32.h uses only GCC builtins */
++# include "QtCore/qatomic_avr32.h"
+ #elif defined(QT_ARCH_MACOSX)
+ # include "QtCore/qatomic_macosx.h"
+ #elif defined(QT_ARCH_MIPS)
--- qt4-x11-4.8.2+dfsg/debian/patches/series 2012-11-23 23:01:43.000000000 +0100
+++ qt4-x11-4.8.2+dfsg/debian/patches/series 2012-11-25 16:31:53.000000000 +0100
@@ -50,3 +50,6 @@
no_libicu_message.diff
QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
fix_use_after_free_qlocale_unix.patch
+
+# debian-ports patches
+m68k.diff
Reply to: