limb pushed to garden (master). "Fix FTBFS."

[notifications at fedoraproject.org]

>From f494a0ad5281b7d81e1794236d6729c6fee40a97 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher at gmail.com>
Date: Thu, 26 Mar 2015 14:23:53 -0500
Subject: Fix FTBFS.


diff --git a/garden-1.0.8-inline.patch b/garden-1.0.8-inline.patch
new file mode 100644
index 0000000..9dbaab9
--- /dev/null
+++ b/garden-1.0.8-inline.patch
@@ -0,0 +1,41 @@
+diff -r -U3 garden-1.0.8.orig/src/stuff.c garden-1.0.8/src/stuff.c
+--- garden-1.0.8.orig/src/stuff.c	2008-12-19 16:33:26.000000000 -0600
++++ garden-1.0.8/src/stuff.c	2015-03-26 14:11:52.979679884 -0500
+@@ -52,7 +52,7 @@
+ float cos_table[ANGLE_1];
+ float sin_table[ANGLE_1];
+ 
+-inline int xpart (int angle, int length);
++int xpart (int angle, int length);
+ 
+ void init_trig (void)
+ {
+@@ -67,12 +67,12 @@
+ 
+ }
+ 
+-inline int xpart (int angle, int length)
++int xpart (int angle, int length)
+ {
+ 	return (cos_table[angle & 1023] * length);
+ }
+ 
+-inline int ypart (int angle, int length)
++int ypart (int angle, int length)
+ {
+ 	return (sin_table[angle & 1023] * length);
+ }
+diff -r -U3 garden-1.0.8.orig/src/stuff.h garden-1.0.8/src/stuff.h
+--- garden-1.0.8.orig/src/stuff.h	2008-12-19 16:33:26.000000000 -0600
++++ garden-1.0.8/src/stuff.h	2015-03-26 14:11:34.076679364 -0500
+@@ -24,8 +24,8 @@
+ int crandom (int number);
+ int turn_towards_angle (int angle, int tangle, int turning);
+ int turn_towards_xy (int x1, int y1, int x2, int y2, int angle, int turning);
+-inline int xpart (int angle, int length);
+-inline int ypart (int angle, int length);
++int xpart (int angle, int length);
++int ypart (int angle, int length);
+ int pulsate (int speed, int amount, int county);
+ int angle_difference (int a1, int a2);
+ 
diff --git a/garden.spec b/garden.spec
index 0b5ed9d..63be6ec 100644
--- a/garden.spec
+++ b/garden.spec
@@ -1,6 +1,6 @@
 Name:           garden
 Version:        1.0.8
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        An innovative old-school 2D vertical shoot-em-up
 
 Group:          Amusements/Games
@@ -9,6 +9,7 @@ URL:            http://garden.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         garden-dso.patch
 Patch1:         garden-printf-format.patch
+Patch2:         garden-1.0.8-inline.patch
 
 BuildRequires:  allegro-devel
 BuildRequires:  desktop-file-utils
@@ -30,6 +31,7 @@ you are dealing with a true piece of art...
 # https://sourceforge.net/tracker/?func=detail&aid=2982590&group_id=242667&atid=1121672
 %patch0 -p1 -b .dso
 %patch1 -p0 -b .format
+%patch2 -p1
 
 %build
 autoreconf -if
@@ -105,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Thu Mar 26 2015 Jonathan Ciesla <limburgher at gmail.com> - 1.0.8-14
+- Patch out inlines to fix FTBFS.
+
 * Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 1.0.8-13
 - Add an AppData file for the software center
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/garden.git/commit/?h=master&id=f494a0ad5281b7d81e1794236d6729c6fee40a97