* [bug#64352] [PATCH] gnu: fluxbox: Fix build.
@ 2023-06-29 18:59 Danny Milosavljevic
2023-07-17 22:36 ` Ludovic Courtès
[not found] ` <handler.64352.B.168806533713883.ack@debbugs.gnu.org>
0 siblings, 2 replies; 3+ messages in thread
From: Danny Milosavljevic @ 2023-06-29 18:59 UTC (permalink / raw)
To: 64352; +Cc: Danny Milosavljevic
* 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
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
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#64352] [PATCH] gnu: fluxbox: Fix build.
2023-06-29 18:59 [bug#64352] [PATCH] gnu: fluxbox: Fix build Danny Milosavljevic
@ 2023-07-17 22:36 ` Ludovic Courtès
[not found] ` <handler.64352.B.168806533713883.ack@debbugs.gnu.org>
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2023-07-17 22:36 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 64352
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’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#64352: [PATCH] gnu: fluxbox: Fix build.
[not found] ` <handler.64352.B.168806533713883.ack@debbugs.gnu.org>
@ 2023-08-19 11:28 ` Danny Milosavljevic
0 siblings, 0 replies; 3+ messages in thread
From: Danny Milosavljevic @ 2023-08-19 11:28 UTC (permalink / raw)
To: 64352-done
[-- Attachment #1: Type: text/plain, Size: 104 bytes --]
This fluxbox build fix was pushed to guix master as commit 18b6e309cec3a0c9c7401b131e18612914f1fcf9.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-19 11:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-29 18:59 [bug#64352] [PATCH] gnu: fluxbox: Fix build Danny Milosavljevic
2023-07-17 22:36 ` Ludovic Courtès
[not found] ` <handler.64352.B.168806533713883.ack@debbugs.gnu.org>
2023-08-19 11:28 ` bug#64352: " Danny Milosavljevic
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).