summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/gnustep.scm3
-rw-r--r--gnu/packages/patches/wmfire-dont-inline-draw-fire.patch33
2 files changed, 35 insertions, 1 deletions
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index 2819993d73..b88866f7b7 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -320,7 +320,8 @@ display, and can run a user-specified program on mouse click.")
(base32
"101grahd80n97y2dczb629clmcgiavdpbbwy78kk5wgs362m12z3"))
(patches
- (search-patches "wmfire-update-for-new-gdk-versions.patch"))))
+ (search-patches "wmfire-dont-inline-draw-fire.patch"
+ "wmfire-update-for-new-gdk-versions.patch"))))
(build-system gnu-build-system)
(inputs
(list gtk+-2 libgtop))
diff --git a/gnu/packages/patches/wmfire-dont-inline-draw-fire.patch b/gnu/packages/patches/wmfire-dont-inline-draw-fire.patch
new file mode 100644
index 0000000000..b36124b268
--- /dev/null
+++ b/gnu/packages/patches/wmfire-dont-inline-draw-fire.patch
@@ -0,0 +1,33 @@
+https://sources.debian.org/data/main/w/wmfire/1.2.4-7/debian/patches/08_removed-inline-from-function-with-extern-linkage.patch
+
+Description: remove inline from function with extern linkage
+ Fixes FTBFS with gcc 9.
+Author: Jeremy Sowden <[email protected]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925858
+Last-Update: 2019-06-22
+Forwarded: not-needed
+
+---
+ src/wmfire.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/wmfire.c
++++ b/src/wmfire.c
+@@ -111,7 +111,7 @@
+ void change_flame(int);
+ GdkCursor *setup_cursor();
+ void burn_spot(int, int, int);
+-inline void draw_fire(unsigned int);
++void draw_fire(unsigned int);
+ static void make_wmfire_dockapp();
+ void read_config(int, char **);
+ void do_help(void);
+@@ -504,7 +504,7 @@
+ /* Draw fire */
+ /******************************************/
+
+-inline void
++void
+ draw_fire(unsigned int load)
+ {
+ int x, y, i, j;