diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2005-03-13 18:34:40 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2005-03-13 18:34:40 +0000 |
| commit | a1227de4e41176384d7bf949672441b3e0e34679 (patch) | |
| tree | 7ffe75d01716baca51221a19b705bc11d97656d1 | |
| parent | Stable on ppc64 (diff) | |
| download | gentoo-2-a1227de4e41176384d7bf949672441b3e0e34679.tar.gz gentoo-2-a1227de4e41176384d7bf949672441b3e0e34679.tar.bz2 gentoo-2-a1227de4e41176384d7bf949672441b3e0e34679.zip | |
Patch to fix GCC4 compilation
(Portage version: 2.0.51.19)
| -rw-r--r-- | media-plugins/bmp-crossfade/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/bmp-crossfade/Manifest | 7 | ||||
| -rw-r--r-- | media-plugins/bmp-crossfade/bmp-crossfade-0.3.8-r2.ebuild | 3 | ||||
| -rw-r--r-- | media-plugins/bmp-crossfade/files/0.3.8-gcc4.patch | 16 |
4 files changed, 27 insertions, 5 deletions
diff --git a/media-plugins/bmp-crossfade/ChangeLog b/media-plugins/bmp-crossfade/ChangeLog index 48f23f584aca..b9cd87e467b1 100644 --- a/media-plugins/bmp-crossfade/ChangeLog +++ b/media-plugins/bmp-crossfade/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/bmp-crossfade # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-crossfade/ChangeLog,v 1.5 2005/01/09 11:58:53 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-crossfade/ChangeLog,v 1.6 2005/03/13 18:34:40 halcy0n Exp $ + + 13 Mar 2005; Mark Loeser <halcy0n@gentoo.org> +files/0.3.8-gcc4.patch, + bmp-crossfade-0.3.8-r2.ebuild: + Patch to fix compilation under GCC4. *bmp-crossfade-0.3.8-r2 (09 Jan 2005) diff --git a/media-plugins/bmp-crossfade/Manifest b/media-plugins/bmp-crossfade/Manifest index 49ab7f16c9c8..b7bedd8b2d22 100644 --- a/media-plugins/bmp-crossfade/Manifest +++ b/media-plugins/bmp-crossfade/Manifest @@ -1,5 +1,6 @@ -MD5 2f0777083af0174ce1bd41254816dfad bmp-crossfade-0.3.8-r2.ebuild 995 -MD5 a64a5431fb0c81cb126a263925d40f31 ChangeLog 1316 +MD5 c8592cbf03100f2330153fe20565f00f ChangeLog 1462 +MD5 db45dad9a5400a2ba6ad627c383de38b bmp-crossfade-0.3.8-r2.ebuild 1032 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248 -MD5 9bd20128f860dc9821976ce49fd6f70f files/digest-bmp-crossfade-0.3.8-r2 72 +MD5 fc3a672afea37ae64a575207d55eae94 files/0.3.8-gcc4.patch 657 MD5 65b7984b615809f5dbb31cb05601fc12 files/0.3.8-bmp.patch 3434 +MD5 9bd20128f860dc9821976ce49fd6f70f files/digest-bmp-crossfade-0.3.8-r2 72 diff --git a/media-plugins/bmp-crossfade/bmp-crossfade-0.3.8-r2.ebuild b/media-plugins/bmp-crossfade/bmp-crossfade-0.3.8-r2.ebuild index 2ada7dcd6879..92bc74cbe42b 100644 --- a/media-plugins/bmp-crossfade/bmp-crossfade-0.3.8-r2.ebuild +++ b/media-plugins/bmp-crossfade/bmp-crossfade-0.3.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-crossfade/bmp-crossfade-0.3.8-r2.ebuild,v 1.1 2005/01/09 11:58:53 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-crossfade/bmp-crossfade-0.3.8-r2.ebuild,v 1.2 2005/03/13 18:34:40 halcy0n Exp $ IUSE="" inherit eutils @@ -24,6 +24,7 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/${PV}-bmp.patch + epatch ${FILESDIR}/${PV}-gcc4.patch cp interface.c interface-2.0.c cp support.c support-2.0.c } diff --git a/media-plugins/bmp-crossfade/files/0.3.8-gcc4.patch b/media-plugins/bmp-crossfade/files/0.3.8-gcc4.patch new file mode 100644 index 000000000000..8c1095aacb7e --- /dev/null +++ b/media-plugins/bmp-crossfade/files/0.3.8-gcc4.patch @@ -0,0 +1,16 @@ +diff --exclude=.deps -ur xmms-crossfade-0.3.8-orig/monitor.h xmms-crossfade-0.3.8/monitor.h +--- xmms-crossfade-0.3.8-orig/monitor.h 2005-03-13 02:11:01.000000000 -0500 ++++ xmms-crossfade-0.3.8/monitor.h 2005-03-13 02:12:25.000000000 -0500 +@@ -34,9 +34,9 @@ + void xfade_start_monitor (); + void xfade_stop_monitor (); + +-extern GtkWidget *monitor_win; +-extern GtkWidget *monitor_display_drawingarea; ++static GtkWidget *monitor_win; ++static GtkWidget *monitor_display_drawingarea; + extern GtkEntry *monitor_output_entry; +-extern GtkProgress *monitor_output_progress; ++static GtkProgress *monitor_output_progress; + + #endif /* _MONITOR_H_ */ |