new 2.4 & 2.6 release + fix gtk+-2.4 build issues

9 files changed, 145 insertions, 9 deletions

diff --git a/gnome-extra/nautilus-media/ChangeLog b/gnome-extra/nautilus-media/ChangeLog
index 76a2d54521e4..5c046728e6b8 100644
--- a/gnome-extra/nautilus-media/ChangeLog
+++ b/gnome-extra/nautilus-media/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/nautilus-media
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/ChangeLog,v 1.24 2004/03/28 23:03:54 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/ChangeLog,v 1.25 2004/03/30 20:55:52 foser Exp $
+
+*nautilus-media-0.8.0 (30 Mar 2004)
+
+  30 Mar 2004; foser <foser@gentoo.org> nautilus-media-0.8.0.ebuild :
+  Gnome 2.6 final, re-enable libpng dep for thumbnailer
+
+*nautilus-media-0.3.4 (30 Mar 2004)
+
+  30 Mar 2004; foser <foser@gentoo.org> nautilus-media-0.3.{3.1,4}.ebuild :
+  New stable release & add patch to fix compilation vs. gtk+-2.4
 
 *nautilus-media-0.7.0 (29 Mar 2004)
 
diff --git a/gnome-extra/nautilus-media/Manifest b/gnome-extra/nautilus-media/Manifest
index 9587d0dd59e6..8045813c03cd 100644
--- a/gnome-extra/nautilus-media/Manifest
+++ b/gnome-extra/nautilus-media/Manifest
@@ -1,8 +1,11 @@
-MD5 b65b5158b307aba791cb50ebd9797146 nautilus-media-0.3.3.1.ebuild 1116
-MD5 bc244c1a62773d448304d079c9203a37 nautilus-media-0.7.0.ebuild 1051
+MD5 76ecd8dca0bfed16045b3ba9c6dc3e33 nautilus-media-0.3.3.1.ebuild 1209
+MD5 54aa501afba959f1be3ec353ef37617e nautilus-media-0.8.0.ebuild 1023
 MD5 b2b85e979d09a904d244e015508192f3 ChangeLog 3204
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 8f57b8203424e8263f98c261002a4b46 nautilus-media-0.3.4.ebuild 1193
 MD5 4844808c91c365688d4a019007ebddc7 files/nautilus-media-0.2.2-fix_DATADIR.patch 456
+MD5 6b733807d0bc04479ba69ca50432605c files/nautilus-media-0.3.3.1-fix_gtk+-2.4_build.patch 3450
 MD5 0c2327f80932bcd849af97eac43a0ee1 files/digest-nautilus-media-0.3.3.1 75
 MD5 ffd26f62f2aea81dbfe42d8ded49fd27 files/nautilus-media-0.3.3.1-gcc2_fix.patch 659
-MD5 bd1a884111cc1c4a544ade1d1fba11af files/digest-nautilus-media-0.7.0 73
+MD5 808710575f030cb3e97d21b3ba7bad27 files/digest-nautilus-media-0.3.4 73
+MD5 be44dc5a4a7d0d1415b28521542dd518 files/digest-nautilus-media-0.8.0 73
diff --git a/gnome-extra/nautilus-media/files/digest-nautilus-media-0.3.4 b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.3.4
new file mode 100644
index 000000000000..d33c4adcb3c2
--- /dev/null
+++ b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.3.4
@@ -0,0 +1 @@
+MD5 da00eaa7c47bb1685b7c320f8d9afeba nautilus-media-0.3.4.tar.bz2 383338
diff --git a/gnome-extra/nautilus-media/files/digest-nautilus-media-0.7.0 b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.7.0
deleted file mode 100644
index 6c08d909ebd9..000000000000
--- a/gnome-extra/nautilus-media/files/digest-nautilus-media-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 204f560a4a35d82ef2ab90ea7916fbae nautilus-media-0.7.0.tar.bz2 398884
diff --git a/gnome-extra/nautilus-media/files/digest-nautilus-media-0.8.0 b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.8.0
new file mode 100644
index 000000000000..b1892e532333
--- /dev/null
+++ b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.8.0
@@ -0,0 +1 @@
+MD5 78b2cdc9146af482cac52a549440e1ca nautilus-media-0.8.0.tar.bz2 411161
diff --git a/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1-fix_gtk+-2.4_build.patch b/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1-fix_gtk+-2.4_build.patch
new file mode 100644
index 000000000000..9fe7215ab3f7
--- /dev/null
+++ b/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1-fix_gtk+-2.4_build.patch
@@ -0,0 +1,78 @@
+diff -uNr nautilus-media-0.3.3.1/audio-properties-view/Makefile.am nautilus-media-0.3.3.1.patched/audio-properties-view/Makefile.am
+--- nautilus-media-0.3.3.1/audio-properties-view/Makefile.am	2003-06-09 22:58:29.000000000 +0200
++++ nautilus-media-0.3.3.1.patched/audio-properties-view/Makefile.am	2004-03-30 22:32:31.834854936 +0200
+@@ -3,9 +3,6 @@
+ # and change the G_LOG_DOMAIN.
+ 
+ INCLUDES =						\
+-	-DG_DISABLE_DEPRECATED				\
+-	-DGTK_DISABLE_DEPRECATED			\
+-	-DGNOME_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Nautilus-Audio-Properties\"	\
+ 	-DDATADIR=\"$(datadir)\"			\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+diff -uNr nautilus-media-0.3.3.1/audio-properties-view/Makefile.in nautilus-media-0.3.3.1.patched/audio-properties-view/Makefile.in
+--- nautilus-media-0.3.3.1/audio-properties-view/Makefile.in	2003-09-10 20:44:54.000000000 +0200
++++ nautilus-media-0.3.3.1.patched/audio-properties-view/Makefile.in	2004-03-30 22:32:40.455544392 +0200
+@@ -140,9 +140,6 @@
+ install_sh = @install_sh@
+ 
+ INCLUDES = \
+-	-DG_DISABLE_DEPRECATED				\
+-	-DGTK_DISABLE_DEPRECATED			\
+-	-DGNOME_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Nautilus-Audio-Properties\"	\
+ 	-DDATADIR=\"$(datadir)\"			\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+diff -uNr nautilus-media-0.3.3.1/audio-view/Makefile.am nautilus-media-0.3.3.1.patched/audio-view/Makefile.am
+--- nautilus-media-0.3.3.1/audio-view/Makefile.am	2003-06-09 22:58:29.000000000 +0200
++++ nautilus-media-0.3.3.1.patched/audio-view/Makefile.am	2004-03-30 22:32:54.428420192 +0200
+@@ -3,9 +3,6 @@
+ # and change the G_LOG_DOMAIN.
+ 
+ INCLUDES =						\
+-	-DG_DISABLE_DEPRECATED				\
+-	-DGTK_DISABLE_DEPRECATED			\
+-	-DGNOME_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Nautilus-Audio\"		\
+ 	-DDATADIR=\"$(datadir)\"			\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+diff -uNr nautilus-media-0.3.3.1/audio-view/Makefile.in nautilus-media-0.3.3.1.patched/audio-view/Makefile.in
+--- nautilus-media-0.3.3.1/audio-view/Makefile.in	2003-09-10 20:44:54.000000000 +0200
++++ nautilus-media-0.3.3.1.patched/audio-view/Makefile.in	2004-03-30 22:33:57.691802696 +0200
+@@ -140,9 +140,6 @@
+ install_sh = @install_sh@
+ 
+ INCLUDES = \
+-	-DG_DISABLE_DEPRECATED				\
+-	-DGTK_DISABLE_DEPRECATED			\
+-	-DGNOME_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Nautilus-Audio\"		\
+ 	-DDATADIR=\"$(datadir)\"			\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+diff -uNr nautilus-media-0.3.3.1/test-view/Makefile.am nautilus-media-0.3.3.1.patched/test-view/Makefile.am
+--- nautilus-media-0.3.3.1/test-view/Makefile.am	2002-10-26 21:59:33.000000000 +0200
++++ nautilus-media-0.3.3.1.patched/test-view/Makefile.am	2004-03-30 22:33:38.663695408 +0200
+@@ -3,9 +3,6 @@
+ # and change the G_LOG_DOMAIN.
+ 
+ INCLUDES =						\
+-	-DG_DISABLE_DEPRECATED				\
+-	-DGTK_DISABLE_DEPRECATED			\
+-	-DGNOME_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Nautilus-Test\"		\
+ 	-DDATADIR=\"$(datadir)\"			\
+ 	-I$(top_srcdir)					\
+diff -uNr nautilus-media-0.3.3.1/test-view/Makefile.in nautilus-media-0.3.3.1.patched/test-view/Makefile.in
+--- nautilus-media-0.3.3.1/test-view/Makefile.in	2003-09-10 20:44:54.000000000 +0200
++++ nautilus-media-0.3.3.1.patched/test-view/Makefile.in	2004-03-30 22:33:44.879750424 +0200
+@@ -140,9 +140,6 @@
+ install_sh = @install_sh@
+ 
+ INCLUDES = \
+-	-DG_DISABLE_DEPRECATED				\
+-	-DGTK_DISABLE_DEPRECATED			\
+-	-DGNOME_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Nautilus-Test\"		\
+ 	-DDATADIR=\"$(datadir)\"			\
+ 	-I$(top_srcdir)					\
diff --git a/gnome-extra/nautilus-media/nautilus-media-0.3.3.1.ebuild b/gnome-extra/nautilus-media/nautilus-media-0.3.3.1.ebuild
index 80180739074c..d2dec9af8b69 100644
--- a/gnome-extra/nautilus-media/nautilus-media-0.3.3.1.ebuild
+++ b/gnome-extra/nautilus-media/nautilus-media-0.3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/nautilus-media-0.3.3.1.ebuild,v 1.14 2004/03/28 23:03:54 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/nautilus-media-0.3.3.1.ebuild,v 1.15 2004/03/30 20:55:52 foser Exp $
 
 inherit gnome2
 
@@ -38,4 +38,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.2.2-fix_DATADIR.patch
 	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 
+	# fix compilation with gtk+-2.4 (#46056)
+	epatch ${FILESDIR}/${P}-fix_gtk+-2.4_build.patch
+
 }
diff --git a/gnome-extra/nautilus-media/nautilus-media-0.3.4.ebuild b/gnome-extra/nautilus-media/nautilus-media-0.3.4.ebuild
new file mode 100644
index 000000000000..829f3d88aa5e
--- /dev/null
+++ b/gnome-extra/nautilus-media/nautilus-media-0.3.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/nautilus-media-0.3.4.ebuild,v 1.1 2004/03/30 20:55:52 foser Exp $
+
+inherit gnome2
+
+DESCRIPTION="Media plugins for Nautilus (audio view and info tab)"
+HOMEPAGE="http://www.gstreamer.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+IUSE="oggvorbis mad"
+
+RDEPEND=">=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/eel-2
+	>=gnome-base/nautilus-2.2
+	=media-libs/gstreamer-0.6*
+	=media-libs/gst-plugins-0.6*
+	=media-plugins/gst-plugins-gnomevfs-0.6*
+	=media-plugins/gst-plugins-libpng-0.6*
+	oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.6* )
+	mad? ( =media-plugins/gst-plugins-mad-0.6* )"
+
+DEPEND=">=dev-util/intltool-0.18
+	>=dev-util/pkgconfig-0.12.0
+	${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.2.2-fix_DATADIR.patch
+
+	# fix compilation with gtk+-2.4 (#46056)
+	epatch ${FILESDIR}/${PN}-0.3.3.1-fix_gtk+-2.4_build.patch
+
+}
diff --git a/gnome-extra/nautilus-media/nautilus-media-0.7.0.ebuild b/gnome-extra/nautilus-media/nautilus-media-0.8.0.ebuild
index 759d3f66def7..4e0856caa828 100644
--- a/gnome-extra/nautilus-media/nautilus-media-0.7.0.ebuild
+++ b/gnome-extra/nautilus-media/nautilus-media-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/nautilus-media-0.7.0.ebuild,v 1.1 2004/03/28 23:03:54 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/nautilus-media-0.8.0.ebuild,v 1.1 2004/03/30 20:55:52 foser Exp $
 
 inherit gnome2
 
@@ -19,11 +19,10 @@ RDEPEND=">=gnome-base/libgnome-2
 	>=media-libs/gstreamer-0.8
 	>=media-libs/gst-plugins-0.8
 	>=media-plugins/gst-plugins-gnomevfs-0.8
+	>=media-plugins/gst-plugins-libpng-0.8
 	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8
 		>=media-plugins/gst-plugins-ogg-0.8 )
 	mad? ( >=media-plugins/gst-plugins-mad-0.8 )"
-#	>=media-plugins/gst-plugins-libpng-0.8
-# thumbnailer seems broken
 # FIXME : flac support dep (?)
 
 DEPEND=">=dev-util/intltool-0.29