jreznik pushed to arts (epel7). "- hack to get artsdsp buildable (#329671)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 15:10:34 UTC 2015
>From db320fe9cde56ab77df7fab87337de8fc283f817 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri, 12 Oct 2007 18:20:58 +0000
Subject: - hack to get artsdsp buildable (#329671)
diff --git a/arts-1.5.7-glibc.patch b/arts-1.5.7-glibc.patch
deleted file mode 100644
index c669476..0000000
--- a/arts-1.5.7-glibc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- arts-1.5.7/artsc/artsdsp.c.glibc 2005-10-10 09:52:27.000000000 -0500
-+++ arts-1.5.7/artsc/artsdsp.c 2007-08-03 07:29:48.000000000 -0500
-@@ -203,7 +203,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 +594,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 --git a/arts-1.5.8-glibc.patch b/arts-1.5.8-glibc.patch
new file mode 100644
index 0000000..8a2362f
--- /dev/null
+++ b/arts-1.5.8-glibc.patch
@@ -0,0 +1,37 @@
+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)
+ {
diff --git a/arts.spec b/arts.spec
index 85131a0..aa7fdb5 100644
--- a/arts.spec
+++ b/arts.spec
@@ -10,7 +10,7 @@ Summary: aRts (analog realtime synthesizer) - the KDE sound system
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 @@ Source1: gslconfig-wrapper.h
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 @@ unset QTDIR && . /etc/profile.d/qt.sh
--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 @@ rm -rf %{buildroot}
%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)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/arts.git/commit/?h=epel7&id=db320fe9cde56ab77df7fab87337de8fc283f817
More information about the scm-commits
mailing list