summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2003-09-14 02:22:55 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2003-09-14 02:22:55 +0000
commitce8648b5dbfe1ff976c8f41daef28e402127a38d (patch)
tree9441768bf12262bb79a3cabbe60c26ca7e8aa6f3 /gnome-extra/nautilus-media
parentAdded Bug # to ChangeLog and let eclass decide default KEYWORDS (diff)
downloadgentoo-2-ce8648b5dbfe1ff976c8f41daef28e402127a38d.tar.gz
gentoo-2-ce8648b5dbfe1ff976c8f41daef28e402127a38d.tar.bz2
gentoo-2-ce8648b5dbfe1ff976c8f41daef28e402127a38d.zip
Patch to fix compilation under gcc2
Diffstat (limited to 'gnome-extra/nautilus-media')
-rw-r--r--gnome-extra/nautilus-media/ChangeLog6
-rw-r--r--gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1.patch17
-rw-r--r--gnome-extra/nautilus-media/nautilus-media-0.3.3.1.ebuild6
3 files changed, 26 insertions, 3 deletions
diff --git a/gnome-extra/nautilus-media/ChangeLog b/gnome-extra/nautilus-media/ChangeLog
index ecf602ec23ce..5ccf9a68f978 100644
--- a/gnome-extra/nautilus-media/ChangeLog
+++ b/gnome-extra/nautilus-media/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-extra/nautilus-media
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/ChangeLog,v 1.13 2003/09/12 19:17:41 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/ChangeLog,v 1.14 2003/09/14 02:22:55 leonardop Exp $
+
+ 13 Sep 2003; L. Boshell <leonardop@gentoo.org>
+ nautilus-media-0.3.3.1.ebuild : Added patch to make it compile with
+ gcc-2
12 Sep 2003; foser <foser@gentoo.org> nautilus-media-0.3.3.1-r1.ebuild :
Moved patch into 0.3.3.1, fixed moved gst-plugins deps
diff --git a/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1.patch b/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1.patch
new file mode 100644
index 000000000000..6f52a0188df3
--- /dev/null
+++ b/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1.patch
@@ -0,0 +1,17 @@
+diff -NurB nautilus-media-0.3.3.1-orig/media-info/media-info.c nautilus-media-0.3.3.1/media-info/media-info.c
+--- nautilus-media-0.3.3.1-orig/media-info/media-info.c 2003-09-13 21:08:38.000000000 -0500
++++ nautilus-media-0.3.3.1/media-info/media-info.c 2003-09-13 21:08:59.000000000 -0500
+@@ -258,11 +258,11 @@
+ gboolean
+ gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp)
+ {
++ GstMediaInfoPriv *priv = info->priv;
++
+ /* if it's NULL then we're sure something went wrong higher up) */
+ if (info == NULL) return FALSE;
+
+- GstMediaInfoPriv *priv = info->priv;
+-
+ g_assert (streamp != NULL);
+ switch (priv->state)
+ {
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 b3490a668984..8e932ce82627 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-2003 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.2 2003/09/12 19:17:41 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/nautilus-media-0.3.3.1.ebuild,v 1.3 2003/09/14 02:22:55 leonardop Exp $
inherit gnome2
@@ -33,5 +33,7 @@ DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
src_unpack() {
unpack ${A}
- cd ${S}; epatch ${FILESDIR}/${PN}-0.2.2-fix_DATADIR.patch
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-0.2.2-fix_DATADIR.patch
+ epatch ${FILESDIR}/${PN}-0.3.3.1.patch
}