[gambas3] siginfo fix
Tom Callaway
spot at fedoraproject.org
Tue May 29 16:16:46 UTC 2012
commit ee5002ff502a2102b13632294f5cdff324272d45
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue May 29 12:16:43 2012 -0400
siginfo fix
gambas3-3.1.1-linux-siginfo.patch | 12 ++++++++++++
gambas3.spec | 3 +++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/gambas3-3.1.1-linux-siginfo.patch b/gambas3-3.1.1-linux-siginfo.patch
new file mode 100644
index 0000000..48015db
--- /dev/null
+++ b/gambas3-3.1.1-linux-siginfo.patch
@@ -0,0 +1,12 @@
+diff -up gambas3-3.1.1/main/lib/signal/csignal.c.linux-siginfo gambas3-3.1.1/main/lib/signal/csignal.c
+--- gambas3-3.1.1/main/lib/signal/csignal.c.linux-siginfo 2012-05-29 11:41:58.144780636 -0400
++++ gambas3-3.1.1/main/lib/signal/csignal.c 2012-05-29 11:42:14.442645392 -0400
+@@ -40,7 +40,7 @@
+ #define SIGPWR -1
+ #endif
+
+-#if !defined(OS_BSD) && !defined(OS_CYGWIN)
++#if !defined(OS_BSD) && !defined(OS_CYGWIN) && !defined(OS_LINUX)
+ typedef
+ struct siginfo siginfo_t;
+ #endif
diff --git a/gambas3.spec b/gambas3.spec
index 90f5824..88857e7 100644
--- a/gambas3.spec
+++ b/gambas3.spec
@@ -29,6 +29,8 @@ Patch2: %{name}-2.99.1-noliconv.patch
Patch3: gambas3-poppler-0.20.patch
# Use libv4l1
Patch4: %{name}-2.99.1-use-libv4l1.patch
+# Don't conflict with siginfo_t define
+Patch5: gambas3-3.1.1-linux-siginfo.patch
%description
Gambas3 is a free development environment based on a Basic interpreter
@@ -561,6 +563,7 @@ Requires: %{name}-runtime = %{version}-%{release}
%patch2 -p1 -b .noliconv
%patch3 -p1 -b .poppler20
# %patch4 -p1 -b .libv4l1
+%patch5 -p1 -b .linux-siginfo
# We used to patch these out, but this is simpler.
for i in `find . |grep acinclude.m4`; do
sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i
More information about the scm-commits
mailing list