Add upstream changeset to avoid calling internal constructor in public

header if implicit ASCII conversion is disabled.  Bump revision.

4 files changed, 59 insertions, 2 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index efbc53be515..d8c4bb41868 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2012/01/23 04:14:26 sbd Exp $
+# $NetBSD: Makefile,v 1.69 2012/01/23 08:16:36 joerg Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index f532fbe75ab..b963327ee4a 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2012/01/16 09:00:27 adam Exp $
+$NetBSD: distinfo,v 1.69 2012/01/23 08:16:36 joerg Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 2ba35adca8fb9c66a58eca61a15b21df6213f22e
 RMD160 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 7506dce7743215481fd9fe56920b8a47f07a112e
@@ -43,6 +43,8 @@ SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = 11059a
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 9e4a68fe02204e5fda7272f988d991992dfd281e
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
+SHA1 (patch-src_dbus_qdbusserver.cpp) = 6b49a383ea561e8024184a5939ff143e91a10171
+SHA1 (patch-src_dbus_qdbusserver.h) = 67cc43c0f5e46a0e84b21d5af3ea1e949f26c7b1
 SHA1 (patch-src_network_ssl_qsslsocket__openssl.cpp) = 927582af26ffcfdf5afcb27b36fc27dd5b60865b
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 152b2da94f32e87b649f7f02b11b92145bfc269c
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 3f54beefab0907ed834ec88ecfc84ebf65f84cc5
diff --git a/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp b/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp
new file mode 100644
index 00000000000..832fecd5824
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp
@@ -0,0 +1,38 @@
+$NetBSD: patch-src_dbus_qdbusserver.cpp,v 1.1 2012/01/23 08:16:36 joerg Exp $
+
+http://qt.gitorious.org/qt/qtbase/commit/3de1e6f26b692a8261b40decc2d81286b01c1461
+
+--- src/dbus/qdbusserver.cpp.orig	2011-12-08 05:06:03.000000000 +0000
++++ src/dbus/qdbusserver.cpp
+@@ -83,6 +83,31 @@ QDBusServer::QDBusServer(const QString &
+ }
+ 
+ /*!
++    Constructs a QDBusServer with the given \a parent. The server will listen
++    for connections in \c {/tmp}.
++*/
++QDBusServer::QDBusServer(QObject *parent)
++    : QObject(parent)
++{
++    const QString address = QLatin1String("unix:tmpdir=/tmp");
++
++    if (!qdbus_loadLibDBus()) {
++        d = 0;
++        return;
++    }
++    d = new QDBusConnectionPrivate(this);
++
++    QMutexLocker locker(&QDBusConnectionManager::instance()->mutex);
++    QDBusConnectionManager::instance()->setConnection(QLatin1String("QDBusServer-") + QString::number(reinterpret_cast<qulonglong>(d)), d);
++
++    QObject::connect(d, SIGNAL(newServerConnection(QDBusConnection)),
++                     this, SIGNAL(newConnection(QDBusConnection)));
++
++    QDBusErrorInternal error;
++    d->setServer(q_dbus_server_listen(address.toUtf8().constData(), error), error);
++}
++
++/*!
+     Destructs a QDBusServer
+ */
+ QDBusServer::~QDBusServer()
diff --git a/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.h b/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.h
new file mode 100644
index 00000000000..9df3845a972
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_dbus_qdbusserver.h,v 1.1 2012/01/23 08:16:36 joerg Exp $
+
+http://qt.gitorious.org/qt/qtbase/commit/3de1e6f26b692a8261b40decc2d81286b01c1461
+
+--- src/dbus/qdbusserver.h.orig	2011-12-08 05:06:03.000000000 +0000
++++ src/dbus/qdbusserver.h
+@@ -61,7 +61,8 @@ class Q_DBUS_EXPORT QDBusServer: public 
+ {
+     Q_OBJECT
+ public:
+-    QDBusServer(const QString &address = "unix:tmpdir=/tmp", QObject *parent = 0);
++    explicit QDBusServer(const QString &address, QObject *parent = 0);
++    explicit QDBusServer(QObject *parent = 0);
+     virtual ~QDBusServer();
+ 
+     bool isConnected() const;