From 66ad3220c177f3aa283882591f0f56df61cbfb61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20F=C3=A6r=C3=B8y?= Date: Sun, 17 Dec 2006 22:05:49 +0000 Subject: [PATCH] Regenerating 0.61-r1 with mips stable only. Package-Manager: portage-2.1.2_rc3-r5 --- sys-apps/dbus/ChangeLog | 10 +- sys-apps/dbus/Manifest | 48 +++++- sys-apps/dbus/dbus-0.61-r1.ebuild | 150 ++++++++++++++++++ .../dbus/files/dbus-0.60-decls-ansi-c.patch | 19 +++ .../files/dbus-0.60-mono-return-null-fix.diff | 22 +++ sys-apps/dbus/files/dbus-0.60-qt-pc.patch | 59 +++++++ .../files/dbus-0.61-i-hate-qt-so-much.patch | 11 ++ .../dbus/files/dbus-0.61-libxml-dep.patch | 20 +++ .../dbus/files/dbus-0.61-qt-disabling.patch | 21 +++ sys-apps/dbus/files/digest-dbus-0.61-r1 | 3 + 10 files changed, 354 insertions(+), 9 deletions(-) create mode 100644 sys-apps/dbus/dbus-0.61-r1.ebuild create mode 100644 sys-apps/dbus/files/dbus-0.60-decls-ansi-c.patch create mode 100644 sys-apps/dbus/files/dbus-0.60-mono-return-null-fix.diff create mode 100644 sys-apps/dbus/files/dbus-0.60-qt-pc.patch create mode 100644 sys-apps/dbus/files/dbus-0.61-i-hate-qt-so-much.patch create mode 100644 sys-apps/dbus/files/dbus-0.61-libxml-dep.patch create mode 100644 sys-apps/dbus/files/dbus-0.61-qt-disabling.patch create mode 100644 sys-apps/dbus/files/digest-dbus-0.61-r1 diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index a140ce1c4b06..8e93afcc6406 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,14 @@ # 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.170 2006/12/17 21:25:19 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.171 2006/12/17 22:05:49 eroyf Exp $ + + 17 Dec 2006; Alexander H. Færøy + +files/dbus-0.60-decls-ansi-c.patch, + +files/dbus-0.60-mono-return-null-fix.diff, +files/dbus-0.60-qt-pc.patch, + +files/dbus-0.61-i-hate-qt-so-much.patch, + +files/dbus-0.61-libxml-dep.patch, +files/dbus-0.61-qt-disabling.patch, + +dbus-0.61-r1.ebuild: + Regenrating dbus-0.61-r1 with mips stable only. 17 Dec 2006; Doug Goldstein -dbus-0.61-r1.ebuild, -dbus-0.62-r1.ebuild: diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index 6cda682d1be3..02f53857ac04 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -5,10 +5,34 @@ AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d files/30-dbus 243 +AUX dbus-0.60-decls-ansi-c.patch 455 RMD160 8e5343c0c50321132f04cd84927a1ac1fe75408d SHA1 69f0aa61245db13c74d90cc08d3509b59784bbc2 SHA256 fac939d8facfddcafc47d8141d5b7804e9734169f3911143419c0d686191cffc +MD5 ed6d35b451adeb05e1bc0980b6016770 files/dbus-0.60-decls-ansi-c.patch 455 +RMD160 8e5343c0c50321132f04cd84927a1ac1fe75408d files/dbus-0.60-decls-ansi-c.patch 455 +SHA256 fac939d8facfddcafc47d8141d5b7804e9734169f3911143419c0d686191cffc files/dbus-0.60-decls-ansi-c.patch 455 +AUX dbus-0.60-mono-return-null-fix.diff 1054 RMD160 558bcde24386162e8e26d42391fb58cdd9fa61eb SHA1 b013b93dbf4c89fccdd3cfe3a6aa0697051e84d1 SHA256 1aabd0c64b541b76680623c30f07c65d0b30f4cf4adec08212c331df22bcd042 +MD5 cd3dd269a14ac3237733a63ffa7f03c9 files/dbus-0.60-mono-return-null-fix.diff 1054 +RMD160 558bcde24386162e8e26d42391fb58cdd9fa61eb files/dbus-0.60-mono-return-null-fix.diff 1054 +SHA256 1aabd0c64b541b76680623c30f07c65d0b30f4cf4adec08212c331df22bcd042 files/dbus-0.60-mono-return-null-fix.diff 1054 +AUX dbus-0.60-qt-pc.patch 1563 RMD160 ec23dd0ba362ca3c9ba99f49c900c89de3f5816c SHA1 790feabc56c9830ed472a51ffa5be2f9663a3efb SHA256 2493ebd9ea7b91eebb2d828efda70c08b087c3801e87eb077acb7cd0b2764766 +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 +AUX dbus-0.61-i-hate-qt-so-much.patch 529 RMD160 9ffd92cce17f43f3ebfe20193a2b1f56c8418ece SHA1 f4b520bc94d61dd6e862dfa8b117b2a581aef69f SHA256 92576bc74a73816e23eb03c5a87d3057c18163d5f692bb7b77767290c6777676 +MD5 6b633200fafa12b01d81713ce5e06248 files/dbus-0.61-i-hate-qt-so-much.patch 529 +RMD160 9ffd92cce17f43f3ebfe20193a2b1f56c8418ece files/dbus-0.61-i-hate-qt-so-much.patch 529 +SHA256 92576bc74a73816e23eb03c5a87d3057c18163d5f692bb7b77767290c6777676 files/dbus-0.61-i-hate-qt-so-much.patch 529 +AUX dbus-0.61-libxml-dep.patch 601 RMD160 801e7293f16105e8a44f44c07e5b36b58e04c56a SHA1 5fc45d6953ac72147f4f86271d678f2b4c0ba817 SHA256 b395e206bffdce94ef61c7e5d037fb7eb74dba55ad1ab5aa04cbac69bd060d20 +MD5 73ce00ee8f58f2d40986041cbb361ec7 files/dbus-0.61-libxml-dep.patch 601 +RMD160 801e7293f16105e8a44f44c07e5b36b58e04c56a files/dbus-0.61-libxml-dep.patch 601 +SHA256 b395e206bffdce94ef61c7e5d037fb7eb74dba55ad1ab5aa04cbac69bd060d20 files/dbus-0.61-libxml-dep.patch 601 AUX dbus-0.61-mono-tools-update.diff 3628 RMD160 b879be64e95be1d80bb97d9bc79bcdca9f42a06f SHA1 db94150fe88447bc2dea92eeb543662e235cf49e SHA256 47dcfafeff7ce3026797a0ff40cc32f1ca6453aa679c6d9548b0383c7ca18404 MD5 95307718b51a47245f0aebcee2dc0467 files/dbus-0.61-mono-tools-update.diff 3628 RMD160 b879be64e95be1d80bb97d9bc79bcdca9f42a06f files/dbus-0.61-mono-tools-update.diff 3628 SHA256 47dcfafeff7ce3026797a0ff40cc32f1ca6453aa679c6d9548b0383c7ca18404 files/dbus-0.61-mono-tools-update.diff 3628 +AUX dbus-0.61-qt-disabling.patch 501 RMD160 a7c1af95cc8dd455387eefad00fa90d86015bbda SHA1 a40e8bdf80b24e8c0492faa1a086a587c41d9bc4 SHA256 acfd9f175223cb2679d37b941cae9d54adbd494be3c0f4f7be7e004c0bd02a20 +MD5 1d1c73d8eea0a6f4ffe70c8091409ad0 files/dbus-0.61-qt-disabling.patch 501 +RMD160 a7c1af95cc8dd455387eefad00fa90d86015bbda files/dbus-0.61-qt-disabling.patch 501 +SHA256 acfd9f175223cb2679d37b941cae9d54adbd494be3c0f4f7be7e004c0bd02a20 files/dbus-0.61-qt-disabling.patch 501 AUX dbus-0.62-match-rule-security-fix.patch 483 RMD160 d22dacf8206c818e74d46397af3ef15834199a04 SHA1 e58e601b7f2a10c74e9bcedec7d7271f274e68e4 SHA256 8cd72800cc190df683a59a4586523f1e8a393744f24d930ba776799e6741b346 MD5 00651662a23f7856287e1f2133adc66b files/dbus-0.62-match-rule-security-fix.patch 483 RMD160 d22dacf8206c818e74d46397af3ef15834199a04 files/dbus-0.62-match-rule-security-fix.patch 483 @@ -25,8 +49,13 @@ AUX dbus.init-1.0 1141 RMD160 36d603e1d3d004ac64b04b3fde79d73a28216f07 SHA1 5096 MD5 511954893c57748b4e0e7ae0b690e44a files/dbus.init-1.0 1141 RMD160 36d603e1d3d004ac64b04b3fde79d73a28216f07 files/dbus.init-1.0 1141 SHA256 d073c1f268a153f181ad80825aba65edb2a338d90f5aa1bd37d659e4250c0711 files/dbus.init-1.0 1141 +DIST dbus-0.61.tar.gz 1735729 RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 SHA1 fdddc695dad64974fb4138fcb04a77a66f1f47f8 SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec DIST dbus-0.62.tar.gz 1737361 RMD160 d653b25726ec96eb324761ebf9efb4a50d1590c0 SHA1 45acea9bd19902791c6dbd8620256caf9d74a667 SHA256 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707 DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca +EBUILD dbus-0.61-r1.ebuild 4128 RMD160 2d69e7505a102f4989b834d956d4f860d62f9ed0 SHA1 befa97a400c842d434393c88e4f594adc166b97f SHA256 b9b7ddf3f9a0efbb6095ea42205176f2e68a5dc222e9572e430b66ae512fc3af +MD5 bfbaba0377bb230275b8a2790f24d058 dbus-0.61-r1.ebuild 4128 +RMD160 2d69e7505a102f4989b834d956d4f860d62f9ed0 dbus-0.61-r1.ebuild 4128 +SHA256 b9b7ddf3f9a0efbb6095ea42205176f2e68a5dc222e9572e430b66ae512fc3af dbus-0.61-r1.ebuild 4128 EBUILD dbus-0.62-r2.ebuild 4213 RMD160 f17b93c7f8585084f7d40971721c428ccbaba3b9 SHA1 1f70051c9e7e3833df56dfa179784c1c824ceda8 SHA256 a5e22c69a9381d255839fe7258e06260a94c223dcd8d1dd2dd7434510cb6bd19 MD5 2e129569563bc919a55091b91826b349 dbus-0.62-r2.ebuild 4213 RMD160 f17b93c7f8585084f7d40971721c428ccbaba3b9 dbus-0.62-r2.ebuild 4213 @@ -35,14 +64,17 @@ EBUILD dbus-1.0.2.ebuild 3263 RMD160 7924fac4b6ba8060490758a437da18fb901cf79f SH MD5 53763378eb9383ad465842ee95077659 dbus-1.0.2.ebuild 3263 RMD160 7924fac4b6ba8060490758a437da18fb901cf79f dbus-1.0.2.ebuild 3263 SHA256 07cadb1a6f9ce849e5b765edff4b2e187169b846490c8d65d112c2128f0d1dcd dbus-1.0.2.ebuild 3263 -MISC ChangeLog 25298 RMD160 ded71cdf641c06302618a8fbf0072985e866f230 SHA1 81cc7e71b6022d3d36818d64ba3110f44b1d472f SHA256 ad5743aa6dcf9fe6b4c657940a6fb249719c9b71cb3a0a29b3b428f79ef9a866 -MD5 1503da9460d2d815ad55ec754b6484bd ChangeLog 25298 -RMD160 ded71cdf641c06302618a8fbf0072985e866f230 ChangeLog 25298 -SHA256 ad5743aa6dcf9fe6b4c657940a6fb249719c9b71cb3a0a29b3b428f79ef9a866 ChangeLog 25298 +MISC ChangeLog 25660 RMD160 505edbd9d64a6955e4dc6fca1bea6becfb7a1219 SHA1 43bf40061dcab8c343d5e39b98ff2ad30cab5aa7 SHA256 40c291ef5449540141e3dcace27a0a434cbc26e12bada330ff35e2f06fad1573 +MD5 658b8856c728ee5b908a8222473d1969 ChangeLog 25660 +RMD160 505edbd9d64a6955e4dc6fca1bea6becfb7a1219 ChangeLog 25660 +SHA256 40c291ef5449540141e3dcace27a0a434cbc26e12bada330ff35e2f06fad1573 ChangeLog 25660 MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222 SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf metadata.xml 222 +MD5 c58edabe96394082b354c8b061117b00 files/digest-dbus-0.61-r1 232 +RMD160 857dde87b1e43ba473ece4ce9945c43eb8dcae25 files/digest-dbus-0.61-r1 232 +SHA256 8ee10bf68b294a8eef518926360a7b538fa9dda198e47b1d9f6367b6de0cdbcd files/digest-dbus-0.61-r1 232 MD5 e00700223b4c2566d3c5b60371b524ff files/digest-dbus-0.62-r2 232 RMD160 020d50c35dbd8578464f56119db955bfb811d61c files/digest-dbus-0.62-r2 232 SHA256 b249fe2b3ac0467d861e39cc171543bac5f489ec77b22ccf68b9ef09a8c68bbe files/digest-dbus-0.62-r2 232 @@ -50,9 +82,9 @@ MD5 497fe5e3a5dfd951a073118e2de14adb files/digest-dbus-1.0.2 235 RMD160 a4e31868ed956d2fcdcd55cc71c7758d9d2bda8c files/digest-dbus-1.0.2 235 SHA256 f398ccc18d90f59f55f826046878cb5dd08b0b1abe1c5fd016b6dacb54891b88 files/digest-dbus-1.0.2 235 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFhbXCoeSe8B0zEfwRAoeRAJ9yVZ377/roMN1nxrOvCNSIajOpsQCbBclU -Pn0eNkRCZAAk1O5B0CmKzAk= -=fe02 +iD8DBQFFhb8x6Xxn2nLwtdQRAiFOAJ4+f4r8MXMuN+syOdMS3tsywJyXEACdE2Zb +XTW6Qayc7mRPAPq0Jhj5OF8= +=jUB6 -----END PGP SIGNATURE----- diff --git a/sys-apps/dbus/dbus-0.61-r1.ebuild b/sys-apps/dbus/dbus-0.61-r1.ebuild new file mode 100644 index 000000000000..0e20f2e3fe18 --- /dev/null +++ b/sys-apps/dbus/dbus-0.61-r1.ebuild @@ -0,0 +1,150 @@ +# 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.61-r1.ebuild,v 1.15 2006/12/17 22:05:49 eroyf Exp $ + +inherit eutils mono python multilib debug qt3 autotools + +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="mips" +IUSE="doc gtk mono python qt3 selinux X" + +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 ) + qt3? ( $(qt_min_version 3.3) ) + selinux? ( sys-libs/libselinux ) + >=dev-libs/libxml2-2.6.21" + # expat code now sucks.. libxml2 is the default + +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( app-doc/doxygen + app-text/xmlto + mono? ( >=dev-util/monodoc-1.1.10 ) )" + +pkg_setup() { + PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig" +} + +src_unpack() { + unpack ${A} + cd ${S} + + # Fix .pc file for QT + epatch "${FILESDIR}"/${PN}-0.60-qt-pc.patch + + # Fix GLIB Declaration for ANSI C + epatch "${FILESDIR}"/${PN}-0.60-decls-ansi-c.patch + + #fix mono-tools depend + epatch "${FILESDIR}"/${PN}-0.61-mono-tools-update.diff + + #fix qt4 disabling + epatch "${FILESDIR}"/${PN}-0.61-qt-disabling.patch + + #fix Trolltech's Makefile blunder + epatch "${FILESDIR}"/${PN}-0.61-i-hate-qt-so-much.patch + + #fix libxml dep + epatch "${FILESDIR}"/${PN}-0.61-libxml-dep.patch + + #fix mono return null + epatch "${FILESDIR}"/${PN}-0.60-mono-return-null-fix.diff + + eautoreconf +} + +src_compile() { + local myconf="" + + # Only enable mono-docs if both mono and doc is defined + use mono && myconf="${myconf} $(use_enable doc mono-docs)" + + if use qt3; then + myconf="${myconf} --enable-qt3=${QTDIR} --with-qt-moc=/usr/bin/moc --with-qt3-moc=${QTDIR}/bin/moc --disable-qt" + else + myconf="${myconf} --disable-qt --disable-qt3 --without-qt-moc --without-qt3-moc" + fi + + econf \ + $(use_with X x) \ + $(use_enable gtk) \ + $(use_enable python) \ + $(use_enable mono) \ + $(use_enable kernel_linux dnotify) \ + --disable-gcj \ + $(use_enable selinux) \ + $(use_enable debug verbose-mode) \ + $(use_enable debug checks) \ + $(use_enable debug asserts) \ + --enable-glib \ + --with-xml=libxml \ + --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 \ + --localstatedir=/var \ + $(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 + + emake || die "make failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + # initscript + newinitd "${FILESDIR}"/dbus.init-0.61 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\`" + echo + einfo "Run etc-update and then run the following:" + einfo "\`/etc/init.d/dbus reload\`" +} diff --git a/sys-apps/dbus/files/dbus-0.60-decls-ansi-c.patch b/sys-apps/dbus/files/dbus-0.60-decls-ansi-c.patch new file mode 100644 index 000000000000..9fdb91a3327e --- /dev/null +++ b/sys-apps/dbus/files/dbus-0.60-decls-ansi-c.patch @@ -0,0 +1,19 @@ +--- dbus/dbus-arch-deps.h.in.orig 2006-02-20 01:09:05.000000000 -0600 ++++ dbus/dbus-arch-deps.h.in 2006-02-20 01:09:23.000000000 -0600 +@@ -29,7 +29,7 @@ + + #include + +-DBUS_BEGIN_DECLS; ++DBUS_BEGIN_DECLS + + #if @DBUS_HAVE_INT64@ + #define DBUS_HAVE_INT64 1 +@@ -51,6 +51,6 @@ + typedef @DBUS_INT16_TYPE@ dbus_int16_t; + typedef unsigned @DBUS_INT16_TYPE@ dbus_uint16_t; + +-DBUS_END_DECLS; ++DBUS_END_DECLS + + #endif /* DBUS_ARCH_DEPS_H */ diff --git a/sys-apps/dbus/files/dbus-0.60-mono-return-null-fix.diff b/sys-apps/dbus/files/dbus-0.60-mono-return-null-fix.diff new file mode 100644 index 000000000000..af7fed7fe6ae --- /dev/null +++ b/sys-apps/dbus/files/dbus-0.60-mono-return-null-fix.diff @@ -0,0 +1,22 @@ +--- mono/Connection.cs.old 2006-02-07 18:13:30.886925672 +0100 ++++ mono/Connection.cs 2006-02-07 18:14:07.426370832 +0100 +@@ -116,7 +116,7 @@ + // Maybe we already have a Connection object associated with + // this rawConnection then return it + IntPtr rawThis = dbus_connection_get_data (rawConnection, slot); +- if (rawThis != IntPtr.Zero) { ++ if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) { + return (DBus.Connection) ((GCHandle)rawThis).Target; + } + } +--- mono/Message.cs.old 2006-02-07 18:11:27.917619848 +0100 ++++ mono/Message.cs 2006-02-07 18:12:36.628174256 +0100 +@@ -110,7 +110,7 @@ + if (slot > -1) { + // If we already have a Message object associated with this rawMessage then return it + IntPtr rawThis = dbus_message_get_data(rawMessage, slot); +- if (rawThis != IntPtr.Zero) ++ if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message)) + return (DBus.Message) ((GCHandle)rawThis).Target; + } + // If it doesn't exist then create a new Message around it diff --git a/sys-apps/dbus/files/dbus-0.60-qt-pc.patch b/sys-apps/dbus/files/dbus-0.60-qt-pc.patch new file mode 100644 index 000000000000..a0dcd5ecaa10 --- /dev/null +++ b/sys-apps/dbus/files/dbus-0.60-qt-pc.patch @@ -0,0 +1,59 @@ +diff -Nur dbus-0.60/Makefile.am dbus-0.60-new/Makefile.am +--- dbus-0.60/Makefile.am 2005-09-30 11:20:08.000000000 -0400 ++++ dbus-0.60-new/Makefile.am 2006-01-02 03:15:23.000000000 -0500 +@@ -6,10 +6,12 @@ + + if HAVE_QT + QT_SUBDIR=qt ++ QT_PC=dbus-qt-1.pc + endif + + if HAVE_QT3 + QT3_SUBDIR=qt3 ++ QT_PC=dbus-qt-1.pc + endif + + if DBUS_USE_GCJ +@@ -36,12 +38,13 @@ + DIST_SUBDIRS=dbus bus doc glib qt qt3 gcj mono python tools test + + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = dbus-1.pc $(GLIB_PC) $(MONO_PC) ++pkgconfig_DATA = dbus-1.pc $(GLIB_PC) $(MONO_PC) $(QT_PC) + + DISTCLEANFILES = \ + dbus-1.pc \ + $(GLIB_PC) \ +- $(MONO_PC) ++ $(MONO_PC) \ ++ $(QT_PC) + + EXTRA_DIST = \ + HACKING \ +diff -Nur dbus-0.60/configure.in dbus-0.60-new/configure.in +--- dbus-0.60/configure.in 2005-11-22 15:42:49.000000000 -0500 ++++ dbus-0.60-new/configure.in 2006-01-02 03:10:40.000000000 -0500 +@@ -1353,6 +1353,7 @@ + doc/Makefile + dbus-1.pc + dbus-glib-1.pc ++dbus-qt-1.pc + dbus-sharp.pc + test/data/valid-config-files/debug-allow-all.conf + test/data/valid-config-files/debug-allow-all-sha1.conf +diff -Nur dbus-0.60/dbus-qt-1.pc.in dbus-0.60-new/dbus-qt-1.pc.in +--- dbus-0.60/dbus-qt-1.pc.in 1969-12-31 19:00:00.000000000 -0500 ++++ dbus-0.60-new/dbus-qt-1.pc.in 2006-01-02 03:10:40.000000000 -0500 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: dbus-qt ++Description: QT integration for the free desktop message bus ++Version: @VERSION@ ++Requires: dbus-1 qt-3.3 ++Libs: -L${libdir} -ldbus-qt-1 ++ ++ diff --git a/sys-apps/dbus/files/dbus-0.61-i-hate-qt-so-much.patch b/sys-apps/dbus/files/dbus-0.61-i-hate-qt-so-much.patch new file mode 100644 index 000000000000..b22d525c8dc4 --- /dev/null +++ b/sys-apps/dbus/files/dbus-0.61-i-hate-qt-so-much.patch @@ -0,0 +1,11 @@ +--- qt/Makefile.am 2006-02-16 19:04:38.000000000 -0500 ++++ qt/Makefile.am.new 2006-03-15 23:39:10.000000000 -0500 +@@ -62,7 +62,7 @@ + $(top_srcdir)/qt/qdbusserver.lo: qdbusserver.moc + $(top_srcdir)/qt/qdbusconnection.lo: qdbusconnection_p.moc + +-CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection.moc ++CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection_p.moc + + libdbus_qt4_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la + libdbus_qt4_1_la_LDFLAGS= -version-info 1:0 -no-undefined diff --git a/sys-apps/dbus/files/dbus-0.61-libxml-dep.patch b/sys-apps/dbus/files/dbus-0.61-libxml-dep.patch new file mode 100644 index 000000000000..f7e122f752bb --- /dev/null +++ b/sys-apps/dbus/files/dbus-0.61-libxml-dep.patch @@ -0,0 +1,20 @@ +--- configure.in 2006-02-24 11:36:29.000000000 -0500 ++++ configure.in.xml 2006-03-15 23:47:31.000000000 -0500 +@@ -9,6 +9,8 @@ + + AM_CONFIG_HEADER(config.h) + ++LIBXML_REQUIRED=2.6.0 ++ + # Honor aclocal flags + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + +@@ -753,7 +755,7 @@ + [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ], + have_expat=false) + +-PKG_CHECK_MODULES(LIBXML, libxml-2.0, have_libxml=true, have_libxml=false) ++PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED, have_libxml=true, have_libxml=false) + + # see what we want to use + dbus_use_libxml=false diff --git a/sys-apps/dbus/files/dbus-0.61-qt-disabling.patch b/sys-apps/dbus/files/dbus-0.61-qt-disabling.patch new file mode 100644 index 000000000000..fc270baef346 --- /dev/null +++ b/sys-apps/dbus/files/dbus-0.61-qt-disabling.patch @@ -0,0 +1,21 @@ +--- dbus-0.61/configure.in.disableqt4 2006-02-28 13:33:47.000000000 +0100 ++++ dbus-0.61/configure.in 2006-02-28 13:33:29.000000000 +0100 +@@ -1033,6 +1033,10 @@ + fi + have_qt=no + else ++ if test x$enable_qt = xno; then ++ have_qt=no; ++ have_qtest=no; ++ else + dnl Qt4 flags + AC_SUBST(DBUS_QT_CFLAGS) + AC_SUBST(DBUS_QT_LIBS) +@@ -1055,6 +1059,7 @@ + + AC_SUBST(DBUS_QTESTLIB_CFLAGS) + AC_SUBST(DBUS_QTESTLIB_LIBS) ++ fi + fi + + AM_CONDITIONAL(HAVE_QT, test x$have_qt = xyes) diff --git a/sys-apps/dbus/files/digest-dbus-0.61-r1 b/sys-apps/dbus/files/digest-dbus-0.61-r1 new file mode 100644 index 000000000000..3d8e00466423 --- /dev/null +++ b/sys-apps/dbus/files/digest-dbus-0.61-r1 @@ -0,0 +1,3 @@ +MD5 cfd4f26004e4304e0dace4d82894e50b dbus-0.61.tar.gz 1735729 +RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 dbus-0.61.tar.gz 1735729 +SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec dbus-0.61.tar.gz 1735729 -- 2.26.2