From patchwork Thu Jun 29 18:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 51436 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8F62D27BBE2; Thu, 29 Jun 2023 20:03:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66CE227BBE9 for ; Thu, 29 Jun 2023 20:03:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEwv4-0006WT-TY; Thu, 29 Jun 2023 15:03:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEwv1-0006WD-0w for guix-patches@gnu.org; Thu, 29 Jun 2023 15:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEwv0-0005Mm-N3 for guix-patches@gnu.org; Thu, 29 Jun 2023 15:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qEwv0-0003cm-4l for guix-patches@gnu.org; Thu, 29 Jun 2023 15:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64352] [PATCH] gnu: fluxbox: Fix build. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Jun 2023 19:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64352 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64352@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168806533713883 (code B ref -1); Thu, 29 Jun 2023 19:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jun 2023 19:02:17 +0000 Received: from localhost ([127.0.0.1]:54030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEwuH-0003br-AY for submit@debbugs.gnu.org; Thu, 29 Jun 2023 15:02:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:57084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEwuC-0003bg-Ex for submit@debbugs.gnu.org; Thu, 29 Jun 2023 15:02:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEwuC-0006Rn-4H for guix-patches@gnu.org; Thu, 29 Jun 2023 15:02:12 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEwu9-0005Df-IZ for guix-patches@gnu.org; Thu, 29 Jun 2023 15:02:11 -0400 Received: from nova.lan (84-115-230-178.cable.dynamic.surfer.at [84.115.230.178]) by dd30410.kasserver.com (Postfix) with ESMTPSA id 1AFF41120035; Thu, 29 Jun 2023 21:02:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=scratchpost.org; s=kas202303142049; t=1688065320; bh=Z2sd6XnJ5Gxe/Bd3zxVsLLjmwkihuEvUZOJ0venCWJc=; h=From:To:Cc:Subject:Date:From; b=NIvB+NiOLsQx8R+3+epYpV6NHBuVfou/8/DkUfNiwqOpBOrz8juOn/9QkPfVk0XsE 21IJxEmGU75f1AA3HsppF5II7WNSbQGQGE3FIjuGTS84KsvRfyMzscCfMSkG7B3FJu /shhlQt7Pscmwm1AjngnsMh5DCJrSArLXzeSaawKyfNVIfL0l0nFOAkIeobTvlUeU4 hwQs4HNOwkPlOEtFIpHfbygPa/+rifXByNAuAKh1MbC07IOL4ak8xvamyo+OYre/Ce avjpYa+Debbk3rspktcM1psj3py5BVDhjOJB2uclMXcVkdV6Q1ZGEgsHJsc99eP4Aa yAdpvdD2W/ZBA== From: Danny Milosavljevic Date: Thu, 29 Jun 2023 20:59:06 +0200 Message-Id: <20230629185906.22211-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spamd-Bar: + Received-SPF: pass client-ip=85.13.145.193; envelope-from=dannym@scratchpost.org; helo=dd30410.kasserver.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 +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