summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2006-02-01 17:32:41 +0000
committerDoug Goldstein <cardoe@gentoo.org>2006-02-01 17:32:41 +0000
commit9cc2f9e60cd90d6acea845ad00b270ebed2f0171 (patch)
tree7686416dccbd9a07c3ccb03b331156ed9ec16869 /sys-apps/dbus
parentRun unit tests. (diff)
downloadhistorical-9cc2f9e60cd90d6acea845ad00b270ebed2f0171.tar.gz
historical-9cc2f9e60cd90d6acea845ad00b270ebed2f0171.tar.bz2
historical-9cc2f9e60cd90d6acea845ad00b270ebed2f0171.zip
New patch for gcj handling detection of jar. Use emake -j1 to let gcj compile. 2 AMD64 fixes as well
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r--sys-apps/dbus/ChangeLog6
-rw-r--r--sys-apps/dbus/Manifest73
-rw-r--r--sys-apps/dbus/dbus-0.60-r4.ebuild159
-rw-r--r--sys-apps/dbus/files/dbus-0.60-gcj-2.patch29
-rw-r--r--sys-apps/dbus/files/dbus-0.60-mono-arguments.patch38
-rw-r--r--sys-apps/dbus/files/dbus-0.60-qdbusmarshall.patch14
-rw-r--r--sys-apps/dbus/files/digest-dbus-0.60-r43
7 files changed, 317 insertions, 5 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index f4d2cc85ef42..6e3e9e3121f3 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/dbus
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.91 2006/01/22 10:25:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.92 2006/02/01 17:32:41 cardoe Exp $
+
+ 01 Feb 2006; Doug Goldstein <cardoe@gentoo.org> ChangeLog:
+ New patch for gcj handling detection of jar. Use emake -j1 to let gcj
+ compile. 2 AMD64 fixes as well.
22 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org> dbus-0.60-r3.ebuild:
ppc stable, bug #113826
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index ed1fee5d4339..f08ca717b21d 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,35 +1,100 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 72b479a441265866f6ac8e6fc078da46 ChangeLog 13310
+MD5 1b20bf345b892204aa9878f5e8c1bfce ChangeLog 13474
+RMD160 0dd5886e933c48c2305920baccc6154c74a89a0b ChangeLog 13474
+SHA256 e4b53f89b9cabcd6d3d7b3125ea9d3c6348ece807f77beb06bdadb0418b90057 ChangeLog 13474
MD5 2f46957776ab8bd83cfd271870d598da dbus-0.23.4-r1.ebuild 3587
+RMD160 01970301a038397859411f5bd87def38978dfa00 dbus-0.23.4-r1.ebuild 3587
+SHA256 48ce34c411e91bedce2d5eb540480e8ad7d4ee9375ae79c38df1a5ede1691cba dbus-0.23.4-r1.ebuild 3587
MD5 9cbbbd99c7ff7776f7b857effba153d2 dbus-0.50-r1.ebuild 3904
+RMD160 69a3ba30658fe9d29b0a229428d3735bd8da38bb dbus-0.50-r1.ebuild 3904
+SHA256 88f3b1c5ff29d8fc30da13c30b108a2ef4915523a43a49d6ea65b1b9cfe64763 dbus-0.50-r1.ebuild 3904
MD5 a69505a0d7305bbb699ba1bc08419cb0 dbus-0.50-r2.ebuild 4340
+RMD160 be0fe501993355101e529051803a134308d31044 dbus-0.50-r2.ebuild 4340
+SHA256 6a22ddf11ed5ab068cff623f2add8fc2cb017d13626af9339cb448e88fdb6059 dbus-0.50-r2.ebuild 4340
MD5 7fab523d7f1b7cb9cd59c83ce244556b dbus-0.60-r3.ebuild 4413
+RMD160 af3fa91db3c5903ec261eb2a9dfc61dbf88eaffa dbus-0.60-r3.ebuild 4413
+SHA256 f7b3f2fda759a0a8d8b7a7d8e9ed90e3d95545d5876d1147a105ba12dc6bc245 dbus-0.60-r3.ebuild 4413
+MD5 25efa60aaeeace2dac7b4dc6a60f458e dbus-0.60-r4.ebuild 4626
+RMD160 ee01fd49b6a35188070a906a6f62a34e16c6eb25 dbus-0.60-r4.ebuild 4626
+SHA256 b2c63c59ab944a7c79905cc8b56562293edb789bf6ac3bb1a4432fe88b8261c6 dbus-0.60-r4.ebuild 4626
MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
+RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243
+SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d files/30-dbus 243
MD5 2a21cd128b106bc728a0566c13e727e3 files/dbus 938
+RMD160 3d2edb8f5bf72acc7a61042c8d8e3860489c1693 files/dbus 938
+SHA256 87b9184c3108d8863ebaff4700e23c52d75a8b71ab76981706f8bf42fb066687 files/dbus 938
MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
+RMD160 17cc72aed94d6fde54dc774f1b0d1a6f7ced6c32 files/dbus-0.23-dbus_session_connect.patch 1185
+SHA256 72284d855b878c58f154b75562a0b639bd0ce232c4e6f8818d8c2f7c1ce16554 files/dbus-0.23-dbus_session_connect.patch 1185
MD5 f3ab25d85c77b7f859d4d2cefc787aef files/dbus-0.23-fd_set.patch 293
+RMD160 e97e8a0f98c6236ebcb251793d71cd2bb7d389f6 files/dbus-0.23-fd_set.patch 293
+SHA256 8517cfe17d5372febdf08f721ad4f91734e9ad33abd33183ce464cd18887f373 files/dbus-0.23-fd_set.patch 293
MD5 403b7724a698be1509916991e87224a4 files/dbus-0.23-pyexecdir.patch 1131
+RMD160 50a6ccad0f9f3462e76a1cba89aa68aedd9e78ad files/dbus-0.23-pyexecdir.patch 1131
+SHA256 b67ab4c3655fbd436f3fda5b8a8cd983d173278af5812b36d92fa0faa11abcd2 files/dbus-0.23-pyexecdir.patch 1131
MD5 db2189cd44431086b05de29565090861 files/dbus-0.23-qt.patch 816
+RMD160 4fe9dbc816c96be14d27d6d03147ead707e2e983 files/dbus-0.23-qt.patch 816
+SHA256 16dba5c994423b6be3c98108a66fac83c4cc738d365174e3135e6ab2dd1425ff files/dbus-0.23-qt.patch 816
MD5 c66dfd4b07508de75f541b24035b74af files/dbus-0.23.2-python_api.patch 571
+RMD160 b87d71f8ea9bb19473bd547634032949991aa9ce files/dbus-0.23.2-python_api.patch 571
+SHA256 f81ab960ebc7b7ef509357e17d3e859243a30eec2c54e8201940be64dc4417bf files/dbus-0.23.2-python_api.patch 571
MD5 038de28fe446b2303c072e96df531500 files/dbus-0.23.2-version_fix.patch 496
+RMD160 aa89233eccb414d573187ead682cf1caf4b2d45e files/dbus-0.23.2-version_fix.patch 496
+SHA256 659558b3f94b4d93cdcd721cb6e7d4b105aba5b404239f0a96c5cb5bca470394 files/dbus-0.23.2-version_fix.patch 496
+MD5 f99c8979a50414039ebe3893916dee05 files/dbus-0.60-gcj-2.patch 800
+RMD160 9ca85170e76d68e9c68f30246a13c9f906d4b66c files/dbus-0.60-gcj-2.patch 800
+SHA256 48468e84c3bcccf3a0bc6f0898e82356720d84a5f4f774e6edb4663c60012cac files/dbus-0.60-gcj-2.patch 800
MD5 aa35611dbe54cc66f70bf0f7c2f50104 files/dbus-0.60-gcj.patch 194
+RMD160 c99f9c06c5e9e44142099c9524c99272635794dc files/dbus-0.60-gcj.patch 194
+SHA256 1c4fc382213a5b32f6c92a2aaab9c08ef49183e0594b9e9c0c626734d46da838 files/dbus-0.60-gcj.patch 194
+MD5 b3b114d7969e310a91ab79077f3b3f4f files/dbus-0.60-mono-arguments.patch 1182
+RMD160 f96d00a1f4d9ef6748c3625e2bfe678116930304 files/dbus-0.60-mono-arguments.patch 1182
+SHA256 5325185ce8db7b66ee7f00ad2c48d435ab4ec3e32bdea255f1bca6296cb6a22b files/dbus-0.60-mono-arguments.patch 1182
MD5 23da3594a8163850b18ac647f3e06213 files/dbus-0.60-mono-docs.patch 564
+RMD160 2706c2573d34dee361b886b80908278ea76bb6be files/dbus-0.60-mono-docs.patch 564
+SHA256 a195a8f1421ec62e6d37f9ab40437d051cbf98533aeb6bddb05ac637cbec30df files/dbus-0.60-mono-docs.patch 564
+MD5 9c8f954ecca28788cf0f48969cde2999 files/dbus-0.60-qdbusmarshall.patch 607
+RMD160 c9c26d63157acf201ef81a3b29b3c2b661502b3c files/dbus-0.60-qdbusmarshall.patch 607
+SHA256 27d63f2b75f10b9814e7e0566f901fb612fe7d0b9024508ad2cfcb7df3196586 files/dbus-0.60-qdbusmarshall.patch 607
MD5 3bdcd526c4ee1d21bad01c30aae6b650 files/dbus-0.60-qt-pc.patch 1563
+RMD160 ec23dd0ba362ca3c9ba99f49c900c89de3f5816c files/dbus-0.60-qt-pc.patch 1563
+SHA256 2493ebd9ea7b91eebb2d828efda70c08b087c3801e87eb077acb7cd0b2764766 files/dbus-0.60-qt-pc.patch 1563
MD5 f1d9631e7b682986d77feccb080e46a4 files/dbus-0.60-qt.patch 453
+RMD160 d38dc02aefb3518900ff7140a47895c2a381e492 files/dbus-0.60-qt.patch 453
+SHA256 bdf3bbcba84a3c21e35785fbdf907ac501ec3bc3fe23e2d8ae94181dddff007a files/dbus-0.60-qt.patch 453
MD5 4fd89997ba6101161202f761bb666167 files/dbus-dnotify_configure-01.diff 2197
+RMD160 7059f7b8bbad594567e364555bac550ecc203da4 files/dbus-dnotify_configure-01.diff 2197
+SHA256 e94b5c4a45791fc90a97f07bcbc1c16a50a633a0633e34bf9180533792564645 files/dbus-dnotify_configure-01.diff 2197
MD5 6f02f0df54613a9e34a452b1c8d92ecb files/dbus-dnotify_watchdirs-01.diff 1252
+RMD160 4b71324248741d78ba694bb969736ad37322628c files/dbus-dnotify_watchdirs-01.diff 1252
+SHA256 0d91b0798d84733e3f381abfd35cac1a5598213792067dd4e000467037c2f20e files/dbus-dnotify_watchdirs-01.diff 1252
MD5 92bb65043e174624ffca3c3ff109a87e files/dbus.init-0.60 944
+RMD160 4fc7bac2373c40efff22e2b6dbb4feaa828e64fe files/dbus.init-0.60 944
+SHA256 2edf071a630debc082d76dc3f9586db9b733ee598ab03277efbbf33bbb160b16 files/dbus.init-0.60 944
MD5 8a28a6744a8a85a487c87eec1e1725b6 files/digest-dbus-0.23.4-r1 64
+RMD160 ec8881d37e34ba16714ec2f7f1dab83c4b561378 files/digest-dbus-0.23.4-r1 64
+SHA256 edabbea54ce1a5eca55736675ce62ccfabe8d21fea5b99b1b8b8b2dafa640bc5 files/digest-dbus-0.23.4-r1 64
MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r1 62
+RMD160 64b3dcf48c7bc1388d73477d5255eb4be04625f0 files/digest-dbus-0.50-r1 62
+SHA256 af421b081d66965fad9b6d7008dac2c1341387e8ef2f226a49d8ddee87eeea63 files/digest-dbus-0.50-r1 62
MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r2 62
+RMD160 64b3dcf48c7bc1388d73477d5255eb4be04625f0 files/digest-dbus-0.50-r2 62
+SHA256 af421b081d66965fad9b6d7008dac2c1341387e8ef2f226a49d8ddee87eeea63 files/digest-dbus-0.50-r2 62
MD5 d1d5323f6bb155eef5cf44b19078aa07 files/digest-dbus-0.60-r3 62
+RMD160 58388295ab4a0c797bc61c1261c6e0905ed7150e files/digest-dbus-0.60-r3 62
+SHA256 cfd4429324733e509efaea4fe88a934ab9bbcb927b6959f4373d14b2177fb15b files/digest-dbus-0.60-r3 62
+MD5 a25549d1b0910ed13259d874259d7999 files/digest-dbus-0.60-r4 232
+RMD160 610b7c232ca7c6cfeb743b60e7fd4a20b1989113 files/digest-dbus-0.60-r4 232
+SHA256 36a3bbab5e321662fa0ad82c00e537aef0bc4f542c97547a5059f0fe1b5098b3 files/digest-dbus-0.60-r4 232
MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
+RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
+SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf metadata.xml 222
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFD3F+d2+ySkm8kpY0RAmeBAKChls/Q8E+yn5TxPECGlbYVVkF6TwCfddFn
-7ESSV/jjjbDTjz3gkMSqQSs=
-=uIV4
+iD8DBQFD4PDgBtvusYtCZMsRAqYnAJ40HIJFgmC/afn8S9I5W3ohXNIangCeJ2H6
+Pln5/tWjLYOCYX+L21J/hRs=
+=Y+fW
-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.60-r4.ebuild b/sys-apps/dbus/dbus-0.60-r4.ebuild
new file mode 100644
index 000000000000..96f4e3e2de8a
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.60-r4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r4.ebuild,v 1.1 2006/02/01 17:32:41 cardoe Exp $
+
+inherit eutils mono python multilib debug qt3 autotools toolchain-funcs
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc gcj gtk mono python qt selinux X xml2"
+
+RDEPEND=">=dev-libs/glib-2.6
+ X? ( || ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 ) )
+ gtk? ( >=x11-libs/gtk+-2.6 )
+ mono? ( >=dev-lang/mono-0.95 )
+ python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 )
+ qt? ( $(qt_min_version 3.3) )
+ selinux? ( sys-libs/libselinux )
+ xml2? ( >=dev-libs/libxml2-2.6.21 )
+ !xml2? ( dev-libs/expat )"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ doc? ( app-doc/doxygen
+ app-text/xmlto
+ mono? ( >=dev-util/monodoc-0.16
+ >=dev-util/mono-tools-1.1.9 ) )"
+
+pkg_setup() {
+ if use gcj && ! built_with_use "=sys-devel/gcc-$(gcc-fullversion)*" gcj; then
+ eerror "To build the Java bindings for dbus, you must re-build gcc"
+ eerror "with the 'gcj' USE flag. Add 'gcj' to USE and re-emerge gcc."
+ die "gcc needs gcj support to use the java bindings"
+ fi
+
+ PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
+}
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # Fix gcj now with gcc4 support
+ epatch "${FILESDIR}"/${PN}-0.60-gcj-2.patch
+ # Fix QT
+ epatch "${FILESDIR}"/${PN}-0.60-qt.patch
+ # Fix .pc file for QT
+ epatch "${FILESDIR}"/${PN}-0.60-qt-pc.patch
+ # Fix Mono Docs
+ epatch "${FILESDIR}"/${PN}-0.60-mono-docs.patch
+ # Fix longlong on AMD64
+ epatch "${FILESDIR}"/${PN}-0.60-qdbusmarshall.patch
+ # Fix sizeof() on AMD64
+ epatch "${FILESDIR}"/${PN}-0.60--mono-arguments.patch
+
+ eautoreconf
+}
+
+src_compile() {
+ local myconf=""
+
+ # Choose which xml library to use
+ if use xml2; then
+ myconf="${myconf} --with-xml=libxml"
+ else
+ myconf="${myconf} --with-xml=expat"
+ fi
+
+ # Only enable mono-docs if both mono and doc is defined
+ use mono && myconf="${myconf} $(use_enable doc mono-docs)"
+
+ if use qt; then
+ myconf="${myconf} --enable-qt3=${QTDIR} QT_MOC=/usr/bin/moc QT3_MOC=${QTDIR}/bin/moc"
+ else
+ myconf="${myconf} --disable-qt --disable-qt3"
+ fi
+
+ econf \
+ $(use_with X x) \
+ $(use_enable gtk) \
+ $(use_enable python) \
+ $(use_enable mono) \
+ $(use_enable kernel_linux dnotify) \
+ $(use_enable gcj) \
+ $(use_enable selinux) \
+ $(use_enable debug verbose-mode) \
+ $(use_enable debug checks) \
+ $(use_enable debug asserts) \
+ --enable-glib \
+ --with-system-pid-file=/var/run/dbus.pid \
+ --with-system-socket=/var/run/dbus/system_bus_socket \
+ --with-session-socket-dir=/tmp \
+ --with-dbus-user=messagebus \
+ $(use_enable doc doxygen-docs) \
+ --disable-xml-docs \
+ ${myconf} \
+ || die "econf failed"
+
+ # Don't build the mono examples, they require gtk-sharp
+ touch ${S}/mono/example/{bus-listener,echo-{server,client}}.exe
+
+ # after the compile, it uses a selinuxfs interface to
+ # check if the SELinux policy has the right support
+ use selinux && addwrite /selinux/access
+
+ # for gcj support
+ emake -j1 || die "make failed"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+
+ # initscript
+ newinitd "${FILESDIR}"/dbus.init-0.60 dbus
+
+ # dbus X session script (#77504)
+ # FIXME : turns out to only work for GDM, better solution needed
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}"/30-dbus
+
+ # needs to exist for the system socket
+ keepdir /var/run/dbus
+
+ keepdir /usr/lib/dbus-1.0/services
+ keepdir /usr/share/dbus-1/services
+
+ dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+ if use doc; then
+ dohtml doc/*html
+ fi
+}
+
+pkg_preinst() {
+ enewgroup messagebus || die "Problem adding messagebus group"
+ enewuser messagebus -1 "-1" -1 messagebus || die "Problem adding messagebus user"
+}
+
+pkg_postrm() {
+ python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/dbus
+}
+
+pkg_postinst() {
+ python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/dbus
+
+ 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\`"
+
+ ewarn
+ ewarn "There have been major ABI/API changes. This version will not"
+ ewarn "work with other packages. We are not responsible for a broken"
+ ewarn "system. The sonames have changed, so you must run a revdep-rebuild"
+ ewarn "afterwards to ensure that the packages dont die."
+ ewarn
+}
diff --git a/sys-apps/dbus/files/dbus-0.60-gcj-2.patch b/sys-apps/dbus/files/dbus-0.60-gcj-2.patch
new file mode 100644
index 000000000000..2366ab138ab4
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.60-gcj-2.patch
@@ -0,0 +1,29 @@
+--- configure.in.old 2005-11-22 21:42:49.000000000 +0100
++++ configure.in 2006-01-25 13:28:47.000000000 +0100
+@@ -210,6 +210,8 @@
+ if test x$enable_gcj = xyes; then
+ if test x$have_gcj = xno ; then
+ AC_MSG_ERROR([Building gcj explicitly required, but gcj not found])
++ else
++ AC_CHECK_PROGS(JAR, gcj-jar fastjar jar)
+ fi
+ fi
+
+@@ -1395,7 +1397,8 @@
+ if test x$enable_gcj = xyes ; then
+ echo \
+ " gcj: ${GCJ}
+- gcjflags: ${GCJFLAGS}"
++ gcjflags: ${GCJFLAGS}
++ jar: ${JAR}"
+ else
+ echo \
+ " gcj: (not enabled)"
+--- gcj/Makefile.am.old 2003-06-23 19:39:48.000000000 +0200
++++ gcj/Makefile.am 2006-01-25 14:36:04.000000000 +0100
+@@ -1,5 +1,4 @@
+ SUBDIRS=org
+-JAR=jar
+
+ CLEANFILES=dbus-1.jar
+
diff --git a/sys-apps/dbus/files/dbus-0.60-mono-arguments.patch b/sys-apps/dbus/files/dbus-0.60-mono-arguments.patch
new file mode 100644
index 000000000000..d5b447c74486
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.60-mono-arguments.patch
@@ -0,0 +1,38 @@
+diff -aur dbus-0.60-orig/mono/Arguments.cs dbus-0.60/mono/Arguments.cs
+--- dbus-0.60-orig/mono/Arguments.cs 2005-03-08 20:36:15.000000000 -0800
++++ dbus-0.60/mono/Arguments.cs 2006-01-28 01:41:59.000000000 -0800
+@@ -10,7 +10,7 @@
+ public class Arguments : IEnumerable, IDisposable
+ {
+ // Must follow sizeof(DBusMessageIter)
+- internal const int DBusMessageIterSize = 14*4;
++ internal static readonly int DBusMessageIterSize = Marshal.SizeOf (typeof(_DBusMessageIter));
+ private static Hashtable dbusTypes = null;
+ private Message message;
+ private IntPtr appenderIter;
+@@ -240,6 +240,25 @@
+ return new ArgumentsEnumerator(this);
+ }
+
++ [StructLayout(LayoutKind.Sequential)]
++ private class _DBusMessageIter
++ {
++ IntPtr dummy1;
++ IntPtr dummy2;
++ int dummy3;
++ int dummy4;
++ int dummy5;
++ int dummy6;
++ int dummy7;
++ int dummy8;
++ int dummy9;
++ int dummy10;
++ int dummy11;
++ int pad1;
++ int pad2;
++ IntPtr pad3;
++ }
++
+ private class ArgumentsEnumerator : IEnumerator
+ {
+ private Arguments arguments;
diff --git a/sys-apps/dbus/files/dbus-0.60-qdbusmarshall.patch b/sys-apps/dbus/files/dbus-0.60-qdbusmarshall.patch
new file mode 100644
index 000000000000..794ba93278eb
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.60-qdbusmarshall.patch
@@ -0,0 +1,14 @@
+--- qt/qdbusmarshall.cpp 23 Sep 2005 13:08:26 -0000 1.1
++++ qt/qdbusmarshall.cpp 19 Dec 2005 21:40:02 -0000
+@@ -69,9 +69,9 @@ static QVariant qFetchParameter(DBusMess
+ case DBUS_TYPE_BOOLEAN:
+ return qIterGet<dbus_bool_t>(it);
+ case DBUS_TYPE_INT64:
+- return qIterGet<dbus_int64_t>(it);
++ return QVariant((qlonglong)qIterGet<dbus_int64_t>(it));
+ case DBUS_TYPE_UINT64:
+- return qIterGet<dbus_uint64_t>(it);
++ return QVariant((qulonglong)qIterGet<dbus_uint64_t>(it));
+ case DBUS_TYPE_STRING:
+ case DBUS_TYPE_OBJECT_PATH:
+ case DBUS_TYPE_SIGNATURE:
diff --git a/sys-apps/dbus/files/digest-dbus-0.60-r4 b/sys-apps/dbus/files/digest-dbus-0.60-r4
new file mode 100644
index 000000000000..d2478aa01cd9
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.60-r4
@@ -0,0 +1,3 @@
+MD5 da9561b5e579cedddc34f53427e99a93 dbus-0.60.tar.gz 1674899
+RMD160 035e0de53c2917b6e4b53a43026191d6de39a5f7 dbus-0.60.tar.gz 1674899
+SHA256 32ff1b1c7388cd2bfd4a23d4b9f460b2265579f1e097f0d4c0261c7e00adf8a8 dbus-0.60.tar.gz 1674899