kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove patch for src/dbus/qdbusserver.cpp

Browse source 
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
This commit is contained in:
abs 2012-04-10 18:45:28 +00:00
parent 561bd53946
commit 9c02aa2399
3 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
x11/qt4-libs/Makefile
View file

@ -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"

3
x11/qt4-libs/distinfo
View file

@ -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

38
x11/qt4-libs/patches/patch-src_dbus_qdbusserver.cpp
View file

@ -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()