openbsd-ports/x11/qt4/patches/patch-src_dbus_qdbusintegrator_cpp

$OpenBSD: patch-src_dbus_qdbusintegrator_cpp,v 1.4 2016/11/07 09:46:29 dcoppa Exp $

Fixes an invalid conversion error on sparc64.

https://bugreports.qt.io/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(); }
$ file /usr/local/lib/qt4/bin/{findtr,syncqt} /usr/local/lib/qt4/bin/findtr: a /usr/bin/perl -w script text executable /usr/local/lib/qt4/bin/syncqt: a /usr/bin/perl -w script text executable These are both perl scripts, so use INSTALL_SCRIPT instead of INSTALL_PROGRAM. While here: qt-project.org -> qt.io in some comments. 2016-11-07 09:46:29 +00:00			$OpenBSD: patch-src_dbus_qdbusintegrator_cpp,v 1.4 2016/11/07 09:46:29 dcoppa Exp $
Bug-fix update to qt-4.7.2. Tested in a bulk build by landry@ OK espie@ 2011-04-03 13:35:30 +00:00
			`Fixes an invalid conversion error on sparc64.`
$ file /usr/local/lib/qt4/bin/{findtr,syncqt} /usr/local/lib/qt4/bin/findtr: a /usr/bin/perl -w script text executable /usr/local/lib/qt4/bin/syncqt: a /usr/bin/perl -w script text executable These are both perl scripts, so use INSTALL_SCRIPT instead of INSTALL_PROGRAM. While here: qt-project.org -> qt.io in some comments. 2016-11-07 09:46:29 +00:00
			`https://bugreports.qt.io/browse/QTBUG-17962`
Bug-fix update to qt-4.7.2. Tested in a bulk build by landry@ OK espie@ 2011-04-03 13:35:30 +00:00
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			`--- 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`
Bug-fix update to qt-4.7.2. Tested in a bulk build by landry@ OK espie@ 2011-04-03 13:35:30 +00:00			`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(); }`