diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2024-05-02 18:47:01 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-05-06 23:16:46 +0300 |
| commit | d5d296382611d9de900d160968bf82c006caaaa7 (patch) | |
| tree | eba6ea1c9e93d80f2216c186eee02c9f79a0dc52 | |
| parent | ae1873558ca0d19383bce07a2c8867e1a5cf45cc (diff) | |
| download | guix-d5d296382611d9de900d160968bf82c006caaaa7.tar.gz | |
gnu: wmfire: Fix build.
* gnu/packages/gnustep.scm (wmfire)[source]: Add patch. * gnu/packages/patches/wmfire-dont-inline-draw-fire.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I3e937c5e9dbd8a5e2eebfd92213407d9477a47ab
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/gnustep.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/wmfire-dont-inline-draw-fire.patch | 33 |
3 files changed, 36 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index eaefcc8d3d..0cef8f747b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2204,6 +2204,7 @@ dist_patch_DATA = \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wlroots-hwdata-fallback.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ + %D%/packages/patches/wmfire-dont-inline-draw-fire.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ 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 <jeremy@azazel.net> +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; |