rpms/xmms/devel xmms-1.2.10-gcc4.patch,NONE,1.1 xmms.spec,1.1,1.2

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15515

Modified Files:
	xmms.spec 
Added Files:
	xmms-1.2.10-gcc4.patch 
Log Message:

patch to build xmms with gcc4


xmms-1.2.10-gcc4.patch:

--- NEW FILE xmms-1.2.10-gcc4.patch ---
--- 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;
 


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms.spec	4 Apr 2005 17:59:12 -0000	1.1
+++ xmms.spec	6 Apr 2005 04:57:33 -0000	1.2
@@ -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,12 @@
 %{_datadir}/xmms/Skins
 
 %changelog
+* Wed Apr  6 2005 Seth Vidal <skvidal at phy.duke.edu> 1:1.2.10-12
+- Apply patch from David Hill RH bz: 152138
+
+* 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 at redhat.com> 1:1.2.10-11
 - Change BR on mikmod to mikmod-devel (138057)