diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2006-01-02 07:11:23 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2006-01-02 07:11:23 +0000 |
| commit | bfec0e905ed7fb82311ce15d721ab87c8d4300ba (patch) | |
| tree | b3a5471176c50e20ca9411530b32f934a1624133 /net-irc | |
| parent | app-admin/eselect-compiler won't be ready for 2006.0, so removing it... (diff) | |
| download | historical-bfec0e905ed7fb82311ce15d721ab87c8d4300ba.tar.gz historical-bfec0e905ed7fb82311ce15d721ab87c8d4300ba.tar.bz2 historical-bfec0e905ed7fb82311ce15d721ab87c8d4300ba.zip | |
Pull in a patch to build xchat with dbus-0.60.
Package-Manager: portage-2.0.53
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/xchat/ChangeLog | 8 | ||||
| -rw-r--r-- | net-irc/xchat/Manifest | 15 | ||||
| -rw-r--r-- | net-irc/xchat/files/2.6.0-dbus-0.60-support.patch | 16 | ||||
| -rw-r--r-- | net-irc/xchat/xchat-2.6.0.ebuild | 5 |
4 files changed, 28 insertions, 16 deletions
diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog index 374fa3766760..d7bd31049ffb 100644 --- a/net-irc/xchat/ChangeLog +++ b/net-irc/xchat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-irc/xchat -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.188 2005/12/26 06:41:59 josejx Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.189 2006/01/02 07:11:23 swegener Exp $ + + 02 Jan 2006; Sven Wegener <swegener@gentoo.org> + +files/2.6.0-dbus-0.60-support.patch, xchat-2.6.0.ebuild: + Pull in a patch to build xchat with dbus-0.60. 26 Dec 2005; Joseph Jezak <josejx@gentoo.org> xchat-2.4.5-r1.ebuild: Marked ppc stable for bug #109744. diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest index 2efefc86b6f8..924c7a7f8133 100644 --- a/net-irc/xchat/Manifest +++ b/net-irc/xchat/Manifest @@ -1,7 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 323f6dc3ea728d521b85e283c293f534 ChangeLog 27863 +MD5 b5a470bfa9441adec40484fefc6079ed ChangeLog 28025 +MD5 681dfd3fea0edc03e7896c59ce38d103 files/2.6.0-dbus-0.60-support.patch 699 MD5 6354e2efb6f0d1323ad8849be7303575 files/44_fix_alignment_endianess.dpatch 8676 MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65 MD5 21bc6820aa6d0c8722509a74c7fccb3d files/digest-xchat-2.4.3 134 @@ -18,11 +16,4 @@ MD5 4634f562e01b219d3bcfb0ae6acb8397 xchat-1.8.11-r1.ebuild 2264 MD5 f70fee92ab2e258ea7be208d0ddfa4b6 xchat-2.4.3.ebuild 2266 MD5 1d96b6a159995e2ba2d2a95ca9b17df1 xchat-2.4.5-r1.ebuild 2362 MD5 b07304c2f6e1aa08bf112928e9558223 xchat-2.4.5.ebuild 2301 -MD5 95d53db19acfbc8d85a8ac0c8d695133 xchat-2.6.0.ebuild 2261 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDr5DJcsIHjyDViGQRAigCAKCyIq1IDbKg+MY5Tbod0OYS3AAMDQCeJ/Ba -rRV0Qve5Wg8KKXqcok+59Bc= -=Js/F ------END PGP SIGNATURE----- +MD5 9a7b105b973c5f9648fe1aac00126176 xchat-2.6.0.ebuild 2315 diff --git a/net-irc/xchat/files/2.6.0-dbus-0.60-support.patch b/net-irc/xchat/files/2.6.0-dbus-0.60-support.patch new file mode 100644 index 000000000000..ac562e7e41e8 --- /dev/null +++ b/net-irc/xchat/files/2.6.0-dbus-0.60-support.patch @@ -0,0 +1,16 @@ +--- plugins/dbus/dbus-plugin.c.orig 2006-01-02 07:03:53.323758200 +0000 ++++ plugins/dbus/dbus-plugin.c 2006-01-02 07:03:29.542130167 +0000 +@@ -152,7 +152,12 @@ + + if (!dbus_g_proxy_call (bus_proxy, "RequestName", &error, + G_TYPE_STRING, DBUS_SERVICE, +- G_TYPE_UINT, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, ++ G_TYPE_UINT, ++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) ++ DBUS_NAME_FLAG_DO_NOT_QUEUE, ++#else ++ DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, ++#endif + G_TYPE_INVALID, + G_TYPE_UINT, &request_name_result, + G_TYPE_INVALID)) diff --git a/net-irc/xchat/xchat-2.6.0.ebuild b/net-irc/xchat/xchat-2.6.0.ebuild index bae2d72ce89a..93aefde7b2ec 100644 --- a/net-irc/xchat/xchat-2.6.0.ebuild +++ b/net-irc/xchat/xchat-2.6.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.0.ebuild,v 1.5 2005/11/05 15:10:51 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.0.ebuild,v 1.6 2006/01/02 07:11:23 swegener Exp $ inherit eutils versionator @@ -38,6 +38,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/xc260-fix-fetext.diff + epatch "${FILESDIR}"/${PV}-dbus-0.60-support.patch # use libdir/xchat/plugins as the plugin directory if [ $(get_libdir) != "lib" ] ; then |