openbsd-ports/x11/qt4/patches/patch-src_dbus_qdbusintegrator_cpp
dcoppa 0f85a8da17 Maintenance update to qt-4.8.5 (plus three bugfixes from upstream
via Arch Linux).
Feedback from zhuk@, espie@, and Amit Kulkarni.
ABI/API compatibility analysis done with abi-compliance-checker.

ok espie@ (MAINTAINER)
2013-10-04 13:15:39 +00:00

17 lines
725 B
Plaintext

$OpenBSD: patch-src_dbus_qdbusintegrator_cpp,v 1.3 2013/10/04 13:15:40 dcoppa Exp $
Fixes an invalid conversion error on sparc64.
https://bugreports.qt-project.org/browse/QTBUG-17962
--- src/dbus/qdbusintegrator.cpp.orig Fri Jun 7 07:16:52 2013
+++ src/dbus/qdbusintegrator.cpp Fri Sep 27 10:10:56 2013
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
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(); }