diff mbox series

[bug#64352] gnu: fluxbox: Fix build.

Message ID 20230629185906.22211-1-dannym@scratchpost.org
State New
Headers show
Series [bug#64352] gnu: fluxbox: Fix build. | expand

Commit Message

Danny Milosavljevic June 29, 2023, 6:59 p.m. UTC 
* gnu/packages/patches/fluxbox-1.3.7-gcc.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/wm.scm (fluxbox)[source](patches): Add it.
---
 gnu/local.mk                                 |  1 +
 gnu/packages/patches/fluxbox-1.3.7-gcc.patch | 16 ++++++++++++++++
 gnu/packages/wm.scm                          |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/fluxbox-1.3.7-gcc.patch

Comments

Ludovic Courtès July 17, 2023, 10:36 p.m. UTC | #1 
Hey Danny,

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> * gnu/packages/patches/fluxbox-1.3.7-gcc.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/wm.scm (fluxbox)[source](patches): Add it.

Go for it!

Ludo’.
Danny Milosavljevic Aug. 19, 2023, 11:28 a.m. UTC | #2 
This fluxbox build fix was pushed to guix master as commit 18b6e309cec3a0c9c7401b131e18612914f1fcf9.
diff mbox series

Patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2b3df5d75a..478a7cb954 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1144,6 +1144,7 @@  dist_patch_DATA =						\
   %D%/packages/patches/flatpak-fix-path.patch			\
   %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch	\
   %D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch	\
+  %D%/packages/patches/fluxbox-1.3.7-gcc.patch			\
   %D%/packages/patches/fontconfig-cache-ignore-mtime.patch	\
   %D%/packages/patches/foobillard++-pkg-config.patch		\
   %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch	\
diff --git a/gnu/packages/patches/fluxbox-1.3.7-gcc.patch b/gnu/packages/patches/fluxbox-1.3.7-gcc.patch
new file mode 100644
index 0000000000..0c805251ac
--- /dev/null
+++ b/gnu/packages/patches/fluxbox-1.3.7-gcc.patch
@@ -0,0 +1,16 @@ 
+Author: Danny Milosavljevic <dannym@scratchpost.org>
+Date: 2023-06-12
+License: expat
+
+diff -ur orig/fluxbox-1.3.7/util/fluxbox-remote.cc fluxbox-1.3.7/util/fluxbox-remote.cc
+--- orig/fluxbox-1.3.7/util/fluxbox-remote.cc	1970-01-01 01:00:01.000000000 +0100
++++ fluxbox-1.3.7/util/fluxbox-remote.cc	2023-05-01 01:11:52.225547895 +0200
+@@ -73,7 +73,7 @@
+     if (strcmp(cmd, "result") == 0) {
+         XTextProperty text_prop;
+         if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0
+-            && text_prop.value > 0
++            && text_prop.value != NULL
+             && text_prop.nitems > 0) {
+ 
+             printf("%s", text_prop.value);
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index c380abc0e8..f5bbf40fcd 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1033,7 +1033,8 @@  (define-public fluxbox
                (base32
                 "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"))
               (patches
-               (search-patches "fluxbox-1.3.7-no-dynamic-cursor.patch"))))
+               (search-patches "fluxbox-1.3.7-no-dynamic-cursor.patch"
+                               "fluxbox-1.3.7-gcc.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags '("CPPFLAGS=-U__TIME__") ;ugly, but for reproducibility