Bug#647265: fix for FTBFS with generic arch and possibly sparc64
tags 660963 + patch
thanks
Hi,
days later, I’ve successfully built qt4-x11 on m68k.
Rejoice!
bye,
//mirabilos
--
15:41⎜<Lo-lan-do:#fusionforge> Somebody write a testsuite for helloworld :-)
--- qt4-x11-4.7.4/debian/changelog 2012-01-06 08:54:46.000000000 +0100
+++ qt4-x11-4.7.4/debian/changelog 2012-02-25 16:52:05.000000000 +0100
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.7.4-2+m68k.1) unreleased; urgency=low
+
+ * Apply patch from upstream bugtracker to fix FTBFS with generic arch
+ and possibly sparc64. (Closes: #647265) (Closes: #660963)
+
+ -- Thorsten Glaser <tg@mirbsd.de> Sat, 25 Feb 2012 15:51:23 +0000
+
qt4-x11 (4:4.7.4-2) unstable; urgency=low
* Update debian/rules: build documentation in dh_auto_install so it is only
--- qt4-x11-4.7.4/debian/patches/atomics_not_const.diff 1970-01-01 01:00:00.000000000 +0100
+++ qt4-x11-4.7.4/debian/patches/atomics_not_const.diff 2012-02-25 16:31:17.000000000 +0100
@@ -0,0 +1,15 @@
+DP: fix from Anthony Groyer in https://bugreports.qt-project.org/browse/QTBUG-22479 comment
+
+Index: qt4-x11-4.7.4/src/dbus/qdbusintegrator.cpp
+===================================================================
+--- qt4-x11-4.7.4.orig/src/dbus/qdbusintegrator.cpp 2011-08-23 12:02:27.000000000 +0000
++++ qt4-x11-4.7.4/src/dbus/qdbusintegrator.cpp 2012-02-25 15:30:39.000000000 +0000
+@@ -71,7 +71,7 @@
+ static bool isDebugging;
+ #define qDBusDebug if (!::isDebugging); else qDebug
+
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }
--- qt4-x11-4.7.4/debian/patches/series 2012-01-06 08:54:28.000000000 +0100
+++ qt4-x11-4.7.4/debian/patches/series 2012-02-25 16:27:43.000000000 +0100
@@ -53,3 +53,4 @@
blacklist-diginotar-cert.diff
openssl_no_ssl2.patch
Remove_QtHelp_dependency_on_QtXml.patch
+atomics_not_const.diff
Reply to: