On Apr 1, 2005 8:29 PM, Justin Conover <justin.conover@xxxxxxxxx> wrote:
> On Mar 24, 2005 5:13 AM, djh <djh@xxxxxxxxxxxx> wrote:
> > Aaron Kurtz wrote:
> >
> > >I'm having problems rebuilding xmms on FC4t1...
> > >
> > Here's a patch to make it build with gcc4.
> > Maybe we should just let it die and use bmp instead?
> >
> > David.
> >
> >
> > --- xmms.spec.orig 2005-01-06 04:48:19.000000000 +1000
> > +++ xmms.spec 2005-03-24 20:52:15.000000000 +1000
> > @@ -4,7 +4,7 @@
> > Summary: A media player for X which resembles Winamp.
> > Name: xmms
> > Version: 1.2.10
> > -Release: 11
> > +Release: 12
> > Epoch: 1
> > License: GPL
> > Group: Applications/Multimedia
> > @@ -25,6 +25,7 @@
> > Patch10: arts_output-0.6.0-buffer.patch
> > Patch11: xmms-underquoted.patch
> > Patch12: xmms-alsa-backport.patch
> > +Patch13: xmms-1.2.10-gcc4.patch
> >
> > Requires: gtk+ >= 1:1.2.2, unzip
> > # the desktop file and redhat-menus are redundant requires really
> > @@ -88,6 +89,7 @@
> > %patch6 -p1 -b .alsalib
> > %patch11 -p1 -b .underquoted
> > %patch12 -p0 -b .alsa-backport
> > +%patch13 -p1 -b .gcc4
> >
> > #%patch8 -p1 -b .ja
> >
> > @@ -195,6 +197,9 @@
> > %{_datadir}/xmms/Skins
> >
> > %changelog
> > +* Thu Mar 24 2005 David Hill <djh[at]ii.net> 1:1.2.10-12
> > +- Add gcc4 patch
> > +
> > * Wed Jan 05 2005 Colin Walters <walters@xxxxxxxxxx> 1:1.2.10-11
> > - Change BR on mikmod to mikmod-devel (138057)
> >
> > --- xmms-1.2.10-gcc4.patch.orig 2005-03-24 20:52:15.000000000 +1000
> > +++ xmms-1.2.10-gcc4.patch 2005-03-24 20:52:15.000000000 +1000
> > @@ -0,0 +1,11 @@
> > +--- xmms-1.2.10/General/ir/ir.h.orig 2001-03-05 23:17:44.000000000 +1000
> > ++++ xmms-1.2.10/General/ir/ir.h 2005-03-24 20:48:31.000000000 +1000
> > +@@ -49,8 +49,6 @@
> > + }
> > + irConfig;
> > +
> > +-extern pthread_t irapp_thread;
> > +-extern gboolean keepGoing;
> > + extern irConfig ircfg;
> > + extern gboolean irconf_is_going;
> > +
> >
> >
> > --
> > fedora-test-list mailing list
> > fedora-test-list@xxxxxxxxxx
> > To unsubscribe:
> > http://www.redhat.com/mailman/listinfo/fedora-test-list
> >
> >
> I don't understand what part of this goes into xmms-1.2.10-gcc4.patch
>
> Is it:
>
> --- xmms-1.2.10-gcc4.patch.orig 2005-03-24 20:52:15.000000000 +1000
> +++ xmms-1.2.10-gcc4.patch 2005-03-24 20:52:15.000000000 +1000
> @@ -0,0 +1,11 @@
> --- xmms-1.2.10/General/ir/ir.h.orig 2001-03-05 23:17:44.000000000 +1000
> +++ xmms-1.2.10/General/ir/ir.h 2005-03-24 20:48:31.000000000 +1000
> @@ -49,8 +49,6 @@
> }
> irConfig;
>
> -extern pthread_t irapp_thread;
> -extern gboolean keepGoing;
> extern irConfig ircfg;
> extern gboolean irconf_is_going;
>
If I cp this patch:
https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=112344
Correct the lines in the xmms.spec, I get this error with rpmbuild -bp
Patch #13 (xmms-1.2.10-gcc4.patch):
+ patch -p1 -b --suffix .gcc4 -s
missing header for unified diff at line 3 of patch
The text leading up to this was:
--------------------------
|--- xmms.spec.orig 2005-01-06 04:48:19.000000000 +1000
|+++ xmms.spec 2005-03-24 20:52:15.000000000 +1000
--------------------------
File to patch:
Any ideas?