[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Remove patch for src/dbus/qdbusserver.cpp

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e449b6f6ce6
branches:  trunk
changeset: 602306:1e449b6f6ce6
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue Apr 10 18:45:28 2012 +0000

description:
Remove patch for src/dbus/qdbusserver.cpp
Its not needed for building qt4-libs, and broke the build of qt4-qdbus
So far up to building kdepim4 from kde4 with this change

diffstat:

 x11/qt4-libs/Makefile                               |   3 +-
 x11/qt4-libs/distinfo                               |   3 +-
 x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp |  38 ---------------------
 3 files changed, 3 insertions(+), 41 deletions(-)

diffs (70 lines):

diff -r d374f5dd51e0 -r 1e449b6f6ce6 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Tue Apr 10 15:31:00 2012 +0000
+++ b/x11/qt4-libs/Makefile     Tue Apr 10 18:45:28 2012 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2012/04/09 09:12:49 adam Exp $
+# $NetBSD: Makefile,v 1.74 2012/04/10 18:45:28 abs Exp $
 
 PKGNAME=       qt4-libs-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"
diff -r d374f5dd51e0 -r 1e449b6f6ce6 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Tue Apr 10 15:31:00 2012 +0000
+++ b/x11/qt4-libs/distinfo     Tue Apr 10 18:45:28 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.73 2012/04/09 09:12:49 adam Exp $
+$NetBSD: distinfo,v 1.74 2012/04/10 18:45:29 abs Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.1.tar.gz) = a074d0f605f009e23c63e0a4cb9b71c978146ffc
 RMD160 (qt-everywhere-opensource-src-4.8.1.tar.gz) = 538e626fae80ca8ca5aac575919f469a9827ad4f
@@ -47,6 +47,5 @@
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
-SHA1 (patch-src_dbus_qdbusserver.cpp) = 6b49a383ea561e8024184a5939ff143e91a10171
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 67744fd7eb821cbff5a763c85fc080270bd86922
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
diff -r d374f5dd51e0 -r 1e449b6f6ce6 x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp
--- a/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp       Tue Apr 10 15:31:00 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$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()