rpms/arts/devel arts-1.5.8-glibc.patch, NONE, 1.1 arts.spec, 1.79, 1.80 arts-1.5.7-glibc.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/arts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28625

Modified Files:
	arts.spec 
Added Files:
	arts-1.5.8-glibc.patch 
Removed Files:
	arts-1.5.7-glibc.patch 
Log Message:
* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.8-2
- hack to get artsdsp buildable (#329671)


arts-1.5.8-glibc.patch:

--- NEW FILE arts-1.5.8-glibc.patch ---
diff -up arts-1.5.8/artsc/artsdsp.c.glibc arts-1.5.8/artsc/artsdsp.c
--- arts-1.5.8/artsc/artsdsp.c.glibc	2007-10-08 04:47:09.000000000 -0500
+++ arts-1.5.8/artsc/artsdsp.c	2007-10-12 11:44:41.000000000 -0500
@@ -203,7 +206,7 @@ static int is_sound_device(const char *p
   return 0;
 }
 
-int open (const char *pathname, int flags, ...)
+int (open) (const char *pathname, int flags, ...)
 {
   va_list args;
   mode_t mode = 0;
@@ -594,7 +597,7 @@ ssize_t write (int fd, const void *buf, 
   return 0;
 }
 
-ssize_t read (int fd, void *buf, size_t count)
+ssize_t (read) (int fd, void *buf, size_t count)
 {
   CHECK_INIT();
 
diff -up arts-1.5.8/artsc/stdioemu.c.glibc arts-1.5.8/artsc/stdioemu.c
--- arts-1.5.8/artsc/stdioemu.c.glibc	2005-09-10 03:13:34.000000000 -0500
+++ arts-1.5.8/artsc/stdioemu.c	2007-10-12 11:45:05.000000000 -0500
@@ -83,9 +86,9 @@ static FILE *fake_fopen(const char *path
 		if(*mptr == '+') open_mode |= 3; /* 3 = readwrite */
 		if(*mptr == 'a') open_mode |= 2; /* append -> write */
   	}
-  	if(open_mode == 1) fdc->fd = open(path,O_RDONLY,0666);
-  	if(open_mode == 2) fdc->fd = open(path,O_WRONLY,0666);
-  	if(open_mode == 3) fdc->fd = open(path,O_RDWR,0666);
+  	if(open_mode == 1) fdc->fd = (open)(path,O_RDONLY,0666);
+  	if(open_mode == 2) fdc->fd = (open)(path,O_WRONLY,0666);
+  	if(open_mode == 3) fdc->fd = (open)(path,O_RDWR,0666);
 
 	if(open_mode && fdc->fd > 0)
 	{


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/arts.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- arts.spec	12 Oct 2007 13:49:50 -0000	1.79
+++ arts.spec	12 Oct 2007 18:20:58 -0000	1.80
@@ -10,7 +10,7 @@
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -21,7 +21,7 @@
 Patch1: arts-1.1.4-debug.patch
 Patch2: arts-1.3.92-glib2.patch
 Patch5: arts-1.3.1-alsa.patch
-Patch6: arts-1.5.7-glibc.patch
+Patch6: arts-1.5.8-glibc.patch
 Patch7: arts-1.5.0-check_tmp_dir.patch
 Patch8: arts-1.5.2-multilib.patch
 # kde#93359
@@ -114,7 +114,10 @@
   --enable-final
 %endif
 
-make %{?_smp_mflags}
+# include hack for artsdsp (see http://bugzilla.redhat.com/329671)
+make %{?_smp_mflags} -k || \
+  sed -i -e "s|-Wp,-D_FORTIFY_SOURCE=2||" artsc/Makefile && \
+  make %{?_smp_mflags}
 
 
 %install
@@ -193,6 +196,9 @@
 
 
 %changelog
+* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.8-2
+- hack to get artsdsp buildable (#329671)
+
 * Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.8-1
 - 1.5.8 (kde-3.5.8)
 


--- arts-1.5.7-glibc.patch DELETED ---