readd qt support, bug #65504

5 files changed, 238 insertions, 6 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index b51a318b11a9..3b071b2080c1 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.22 2004/12/17 19:57:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.23 2004/12/29 18:42:56 lanius Exp $
+
+*dbus-0.22-r3 (29 Dec 2004)
+
+  29 Dec 2004; Heinrich Wendel <lanius@gentoo.org> +files/dbus-0.22-qt.patch,
+  +dbus-0.22-r3.ebuild:
+  readd qt support, bug #65504
 
   17 Dec 2004; Markus Rothe <corsair@gentoo.org> dbus-0.22-r2.ebuild:
   Stable on ppc64
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index a2531e755339..799559ea4c46 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,11 +1,14 @@
-MD5 d71881dafafaedea9fc40a7ce309c883 ChangeLog 3340
-MD5 161dbdd90b13a224e0ed46d87d3426cf dbus-0.22-r1.ebuild 2857
 MD5 f30a48ba3a091f1e1472804d8fefba8d dbus-0.22-r2.ebuild 3213
+MD5 161dbdd90b13a224e0ed46d87d3426cf dbus-0.22-r1.ebuild 2857
+MD5 3732fa0cf4fb16a058d5b46f2b410c65 dbus-0.22-r3.ebuild 3230
+MD5 d71881dafafaedea9fc40a7ce309c883 ChangeLog 3340
 MD5 5b5bcd9c1a432b2c8157b0004a073f72 metadata.xml 224
 MD5 5ad50ae94f784548fc0d6f1364ce23bb files/dbus 544
-MD5 0bbcecc888e29256a5b9a8b1b110099c files/dbus-0.22-bus_driver_know_thyself.patch 1373
-MD5 89670f39c616e08e472a236ed9079b34 files/dbus-0.22-mono_bindings.patch 5122
-MD5 0c8ee5b60e0dd01baea0e398f7ee5559 files/dbus-0.22-mono_service_owner.patch 905
 MD5 032a780f5d3dd0c743f2b932424fd39c files/dbus-0.22-python_int64.patch 5448
 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r1 62
 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r2 62
+MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r3 62
+MD5 0c8ee5b60e0dd01baea0e398f7ee5559 files/dbus-0.22-mono_service_owner.patch 905
+MD5 89670f39c616e08e472a236ed9079b34 files/dbus-0.22-mono_bindings.patch 5122
+MD5 0bbcecc888e29256a5b9a8b1b110099c files/dbus-0.22-bus_driver_know_thyself.patch 1373
+MD5 03e75c073a6db22f85e5c58b795a6e42 files/dbus-0.22-qt.patch 2191
diff --git a/sys-apps/dbus/dbus-0.22-r3.ebuild b/sys-apps/dbus/dbus-0.22-r3.ebuild
new file mode 100644
index 000000000000..23387ee6c192
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.22-r3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.22-r3.ebuild,v 1.1 2004/12/29 18:42:56 lanius Exp $
+
+# because of the experimental nature debug by default
+inherit debug eutils mono python
+
+# FIXME : fix docs
+#IUSE="X gtk qt python mono doc xml2"
+IUSE="X gtk qt python mono xml2"
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
+HOMEPAGE="http://www.freedesktop.org/software/dbus/"
+SRC_URI="http://www.freedesktop.org/software/dbus/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+KEYWORDS="~x86 ~ppc ~amd64 ~ppc64"
+
+RDEPEND=">=dev-libs/glib-2
+	xml2? ( >=dev-libs/libxml2-2.6 )
+	!xml2? ( dev-libs/expat )
+	X? ( virtual/x11 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	python? ( >=dev-lang/python-2.2
+		>=dev-python/pyrex-0.9 )
+	!ppc64? (
+		mono? ( >=dev-dotnet/mono-0.95 )
+	)
+	qt? ( >=x11-libs/qt-3 )"
+
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+#	doc? ( app-doc/doxygen
+#		app-text/xmlto )"
+
+# needs gcj, we have no neat way of knowing if it was enabled
+#	java? ( sys-devel/gcc )
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-python_int64.patch
+
+	local cs
+	# a few cvs patches for beagle
+	cd ${S}/mono
+	for cs in *.cs; do
+		einfo "Removing CR from ${cs}"
+		sed -e "s/\r//" ${cs} > ${cs}.new
+		mv ${cs}.new ${cs}
+	done;
+	epatch ${FILESDIR}/${P}-mono_bindings.patch
+	cd ${S}/bus
+	epatch ${FILESDIR}/${P}-bus_driver_know_thyself.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mono_service_owner.patch
+
+	epatch ${FILESDIR}/${P}-qt.patch
+
+	cd ${S}
+	automake || die
+
+}
+
+src_compile() {
+
+	local myconf
+
+	if use xml2; then
+		myconf="--with-xml=libxml";
+	else
+		myconf="--with-xml=expat";
+	fi
+
+	econf \
+		`use_enable X x` \
+		`use_enable gtk` \
+		`use_enable qt` \
+		`use_enable python` \
+		`use_enable mono` \
+		--enable-glib \
+		--enable-verbose-mode \
+		--enable-checks \
+		--enable-asserts \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-system-socket=/var/lib/dbus/system_bus_socket \
+		--with-session-socket-dir=/tmp \
+		--disable-doxygen-docs \
+		--disable-xml-docs \
+		--disable-mono-docs \
+		${myconf} \
+		|| die
+
+#		`use_enable doc doxygen-docs` \
+#		`use_enable doc xml-docs` \
+
+	# do not build the mono examples, they need gtk-sharp
+	touch ${S}/mono/example/echo-{server,client}.exe
+
+	# this gets around a lib64 sandbox bug. note that this addpredict is
+	# added automatically by sandbox.c for lib.
+	addpredict /usr/lib64/python2.3/
+	addpredict /usr/lib64/python2.2/
+	addpredict /usr/lib64/python2.1/
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	# initscript
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/dbus
+
+	# needs to exist for the system socket
+	keepdir /var/lib/dbus
+
+	keepdir /usr/lib/dbus-1.0/services
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO doc/*html
+
+}
+
+pkg_preinst() {
+
+	enewgroup messagebus || die "Problem adding messagebus group"
+	enewuser messagebus -1 /bin/false /dev/null messagebus || die "Problem adding messagebus user"
+
+}
+
+pkg_postinst() {
+
+	einfo "To start the DBUS system-wide messagebus by default"
+	einfo "you should add it to the default runlevel :"
+	einfo "\`rc-update add dbus default\`"
+
+}
diff --git a/sys-apps/dbus/files/dbus-0.22-qt.patch b/sys-apps/dbus/files/dbus-0.22-qt.patch
new file mode 100644
index 000000000000..369c626f921d
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.22-qt.patch
@@ -0,0 +1,78 @@
+--- configure.in.org	2004-12-13 14:08:57.676399648 +0100
++++ configure.in	2004-12-13 14:09:31.113316464 +0100
+@@ -812,6 +812,7 @@
+         if test -f "$dir/qglobal.h"; then
+             have_qt=yes
+             DBUS_QT_CXXFLAGS="-I$dir"
++			DBUS_QT_LIBS="-I$QTDIR/lib/libqt-mt.la"
+        fi
+     done
+ fi
+@@ -821,18 +822,6 @@
+    AC_MSG_RESULT([not found])
+ fi
+ 
+-dnl linking to kdecore will give us a bit of help from libtool
+-if (! kde-config >& /dev/null); then
+-    have_qt=no
+-else
+-    kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
+-    if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
+-        have_qt=no
+-    else
+-        DBUS_QT_LIBS="$kdelibs/libkdecore.la"
+-    fi
+-fi
+-
+ if test x$have_qt = xno ; then
+     AC_MSG_WARN([Qt development libraries not found])
+ fi
+--- qt/connection.h	2004-08-10 05:03:37.000000000 +0200
++++ /home/heino/connection.h	2004-12-13 14:07:26.804214320 +0100
+@@ -50,6 +50,7 @@
+     Message borrowMessage();
+     Message popMessage();
+     void stealBorrowMessage( const Message& );
++    void dbus_connection_setup_with_qt_main (DBusConnection *connection);
+ 
+   public slots:
+     void open( const QString& );
+--- qt/connection.cpp	2004-05-04 07:35:48.000000000 +0200
++++ /home/heino/connection.cpp	2004-12-13 14:07:11.503540376 +0100
+@@ -156,6 +156,13 @@
+ {
+ }
+ 
++void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection)
++{
++  d->setConnection( connection );
++}
++
++
++
+ /////////////////////////////////////////////////////////
+ 
+ #include "connection.moc"
+--- qt/integrator.cpp	2003-12-02 11:44:22.000000000 +0100
++++ /home/heino/integrator.cpp	2004-12-13 14:07:38.260472704 +0100
+@@ -162,13 +162,18 @@
+ 
+ void Integrator::slotRead( int fd )
+ {
+-  Q_UNUSED( fd );
++  QIntDictIterator<Watch>	it( m_watches );
++  for ( ; it.current(); ++it )
++    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_READABLE );
++
+   emit readReady();
+ }
+ 
+ void Integrator::slotWrite( int fd )
+ {
+-  Q_UNUSED( fd );
++  QIntDictIterator<Watch>       it( m_watches );
++  for ( ; it.current(); ++it )
++    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_WRITABLE );
+ }
+ 
+ void Integrator::slotTimeout( DBusTimeout *timeout )
diff --git a/sys-apps/dbus/files/digest-dbus-0.22-r3 b/sys-apps/dbus/files/digest-dbus-0.22-r3
new file mode 100644
index 000000000000..d2af6e21be95
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.22-r3
@@ -0,0 +1 @@
+MD5 6b1c2476ea8b82dd9fb7f29ef857cb9f dbus-0.22.tar.gz 1248780