diff options
| author | abs <abs@pkgsrc.org> | 2012-04-10 18:45:28 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2012-04-10 18:45:28 +0000 |
| commit | 587e68169503b9498c478002aaa51346cf8ec8bf (patch) | |
| tree | d67b3ba3613890811aa37fe173358d9b9f29240a /x11 | |
| parent | 3e10b11bd0bfdff61275bf880544db36cbf39c3d (diff) | |
| download | pkgsrc-587e68169503b9498c478002aaa51346cf8ec8bf.tar.gz | |
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 (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/Makefile | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp | 38 |
3 files changed, 3 insertions, 41 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 59aac0d8102..a7e8e9cad3b 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -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 --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 1896f693108..ff4e3471dc9 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -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_JavaScriptCore_wtf_Threading.h) = 10bfe59 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 --git a/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp b/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp deleted file mode 100644 index 832fecd5824..00000000000 --- a/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp +++ /dev/null @@ -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() |