diff options
| author |   Joe McCann <joem@gentoo.org> | 2006-01-04 17:18:06 +0000 |
|---|---|---|
| committer | Joe McCann <joem@gentoo.org> | 2006-01-04 17:18:06 +0000 |
| commit | ce590710458ae6594877ca05ce5d815f5938d612 (patch) | |
| tree | 46c49282db1bc52d5ddbcfb41c1388f896ca8e15 /media-video | |
| parent | Version bump, bunch of new use flags to reflect the real dependencies. (diff) | |
| download | historical-ce590710458ae6594877ca05ce5d815f5938d612.tar.gz historical-ce590710458ae6594877ca05ce5d815f5938d612.tar.bz2 historical-ce590710458ae6594877ca05ce5d815f5938d612.zip | |
add patch to compile with dbus-0.60, remove dbus mask
Package-Manager: portage-2.1_pre1
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/totem/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/totem/Manifest | 5 | ||||
| -rw-r--r-- | media-video/totem/files/totem-dbus-0.60.patch | 20 | ||||
| -rw-r--r-- | media-video/totem/totem-1.2.0-r2.ebuild | 8 |
4 files changed, 32 insertions, 7 deletions
diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog index 4b5adc84aa1d..9ac92c5db1d5 100644 --- a/media-video/totem/ChangeLog +++ b/media-video/totem/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/totem # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.90 2006/01/02 07:31:17 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.91 2006/01/04 17:18:06 joem Exp $ + + 04 Jan 2006; Joe McCann <joem@gentoo.org> +files/totem-dbus-0.60.patch, + totem-1.2.0-r2.ebuild: + add patch to compile with dbus-0.60, remove dbus mask 02 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org> totem-1.2.0-r1.ebuild, totem-1.2.0-r2.ebuild: diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index 121ff75370a5..c60e1f4becad 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,4 +1,4 @@ -MD5 a0dad0962262030a6d0e1df56ffe7de0 ChangeLog 12692 +MD5 ec7ceab2842581de966f7c5d5dc07f78 ChangeLog 12844 MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65 MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r1 65 MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r2 65 @@ -6,7 +6,8 @@ MD5 cccfa415897f1198d6cb702e258b85a9 files/totem-1.0.4-fbsd.patch 1190 MD5 d8432eb528995986645e6e70fdccba48 files/totem-1.2.0-gecko-sdk.patch 1178 MD5 faed9bfdf2ea1835a17c9e56e7738ac1 files/totem-1.2.0-gmoduledep.patch 1535 MD5 d64b50de60d0223b68b67b7788086b5b files/totem-1.2.0-lang_it_fix.patch 834 +MD5 06e5959e07633fd5260c6935f547d0d4 files/totem-dbus-0.60.patch 562 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521 MD5 6645b9eed7d922972cb815cadddf7d89 totem-1.0.4.ebuild 2709 MD5 d7a1624ffff28b89921b884b1b2565cc totem-1.2.0-r1.ebuild 3200 -MD5 97456b1f934824181fbe6a59f5bb6ea8 totem-1.2.0-r2.ebuild 3108 +MD5 1a9fb7f6f615ad5d6f058e6ab391c3f2 totem-1.2.0-r2.ebuild 3154 diff --git a/media-video/totem/files/totem-dbus-0.60.patch b/media-video/totem/files/totem-dbus-0.60.patch new file mode 100644 index 000000000000..1f0b081280f3 --- /dev/null +++ b/media-video/totem/files/totem-dbus-0.60.patch @@ -0,0 +1,20 @@ +=================================================================== +RCS file: /cvs/gnome/totem/src/totem-mozilla-viewer.c,v +retrieving revision 1.27 +retrieving revision 1.28 +diff -u -r1.27 -r1.28 +--- src/totem-mozilla-viewer.c 2005/08/10 16:44:10 1.27 ++++ src/totem-mozilla-viewer.c 2005/11/28 18:36:44 1.28 +@@ -42,6 +42,11 @@ + + #define OPTION_IS(x) (strcmp(argv[i], x) == 0) + ++/* For newer D-Bus version */ ++#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT ++#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT 0 ++#endif ++ + typedef enum { + STATE_PLAYING, + STATE_PAUSED, + diff --git a/media-video/totem/totem-1.2.0-r2.ebuild b/media-video/totem/totem-1.2.0-r2.ebuild index 64bcc86d7fc2..d16ee012a696 100644 --- a/media-video/totem/totem-1.2.0-r2.ebuild +++ b/media-video/totem/totem-1.2.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r2.ebuild,v 1.5 2006/01/02 07:31:18 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r2.ebuild,v 1.6 2006/01/04 17:18:06 joem Exp $ inherit autotools eutils multilib gnome2 @@ -54,8 +54,7 @@ RDEPEND=">=dev-libs/glib-2.6.3 win32codecs? ( =media-plugins/gst-plugins-pitfdll-0.8* ) ) nsplugin? ( >=net-libs/gecko-sdk-1.7 - >=sys-apps/dbus-0.35 - !>=sys-apps/dbus-0.60 )" + >=sys-apps/dbus-0.35)" DEPEND="${RDEPEND} app-text/scrollkeeper @@ -90,7 +89,8 @@ src_unpack() { epatch ${FILESDIR}/${PN}-1.2.0-lang_it_fix.patch # Add gmodule depend epatch ${FILESDIR}/${PN}-1.2.0-gmoduledep.patch - + #patch to compile with dbus-0.60 + epatch ${FILESDIR}/${PN}-dbus-0.60.patch eautoreconf gnome2_omf_fix help/*/Makefile.in |