Subject: [bug#61263] bug#61270: [PATCH] gnu: dbacl: Fix failing check phase.

From: "Danny O'Brien" <[email-masked]>
Date: Sat, 4 Mar 2023 23:24:37 -0800

On Sat, Mar 04, 2023 at 05:37:27PM +0100, Ludovic Courtès wrote:
> Hi Danny,
> 
> "Danny O'Brien" <[email-masked]> skribis:
> 
> > Yep, that was all due to `guix style` — the instructions say to run it, but
> > that may be different if it's just tweaking an existing hand-crafted
> > package description. I'll re-submit.
> 
> Did you get a chance to look into it?  We’re close to the finish line!
> 
> TIA,
> Ludo’.

Let's try this:

>From a235a39729579a7b0f49326fcfc6f5a291074b01 Mon Sep 17 00:00:00 2001
Message-Id: <[email-masked]>
From: Danny O'Brien <[email-masked]>
Date: Sat, 4 Mar 2023 23:09:27 -0800
Subject: [PATCH] gnu: dbacl: Fix failing check phase.

* gnu/packages/textutils.scm (dbacl): New patch.
* gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 .../dbacl-icheck-multiple-definitions.patch   | 33 +++++++++++++++++++
 gnu/packages/textutils.scm                    |  3 +-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/dbacl-icheck-multiple-definitions.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 415955bd3f..dfd0448502 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1027,6 +1027,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/date-output-pkg-config-files.patch	\
   %D%/packages/patches/datefudge-gettimeofday.patch		\
   %D%/packages/patches/dbacl-include-locale.h.patch		\
+  %D%/packages/patches/dbacl-icheck-multiple-definitions.patch		\
   %D%/packages/patches/dbus-helper-search-path.patch		\
   %D%/packages/patches/dbus-c++-gcc-compat.patch		\
   %D%/packages/patches/dbus-c++-threading-mutex.patch		\
diff --git a/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch
new file mode 100644
index 0000000000..e82d0819bb
--- /dev/null
+++ b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch
@@ -0,0 +1,33 @@
+From f5df6813e305372e25b8a2124c491293a176e115 Mon Sep 17 00:00:00 2001
+From: Danny O'Brien <[email-masked]>
+Date: Fri, 3 Feb 2023 16:48:59 -0800
+Subject: [PATCH] Fix failing build of icheck.
+
+Building icheck fails with a duplicate symbol definition 
+error. This allows the icheck executable to compile.
+
+Submitted upstream[1] but not yet moderated/accepted.
+
+[1] https://sourceforge.net/p/dbacl/discussion/239876/thread/87636b0114/
+
+---
+ src/icheck.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/icheck.c b/src/icheck.c
+index efbb6a5..12a3b7a 100644
+--- a/src/icheck.c
++++ b/src/icheck.c
+@@ -39,9 +39,6 @@ extern regex_count_t regex_count;
+ extern empirical_t empirical;
+ 
+ extern int cmd;
+-char *progname = "icheck";
+-char *inputfile = "";
+-long inputline = 0;
+ 
+ extern long system_pagesize;
+ extern void *in_iobuf;
+-- 
+2.39.1
+
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index e5d3a0efc0..1092f1860b 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2021 Felix Gruber <[email-masked]>
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi <[email-masked]>
 ;;; Copyright © 2022 Gabriel Wicki <[email-masked]>
+;;; Copyright © 2022 Danny O'Brien <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -711,7 +712,7 @@ (define-public dbacl
                            "dbacl-" version ".tar.gz"))
        (sha256
         (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz"))
-       (patches (search-patches "dbacl-include-locale.h.patch"))))
+       (patches (search-patches "dbacl-include-locale.h.patch" "dbacl-icheck-multiple-definitions.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-- 
2.39.1

>From a235a39729579a7b0f49326fcfc6f5a291074b01 Mon Sep 17 00:00:00 2001
Message-Id: <[email-masked]>
From: Danny O'Brien <[email-masked]>
Date: Sat, 4 Mar 2023 23:09:27 -0800
Subject: [PATCH] gnu: dbacl: Fix failing check phase.

* gnu/packages/textutils.scm (dbacl): New patch.
* gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 .../dbacl-icheck-multiple-definitions.patch   | 33 +++++++++++++++++++
 gnu/packages/textutils.scm                    |  3 +-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/dbacl-icheck-multiple-definitions.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 415955bd3f..dfd0448502 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1027,6 +1027,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/date-output-pkg-config-files.patch	\
   %D%/packages/patches/datefudge-gettimeofday.patch		\
   %D%/packages/patches/dbacl-include-locale.h.patch		\
+  %D%/packages/patches/dbacl-icheck-multiple-definitions.patch		\
   %D%/packages/patches/dbus-helper-search-path.patch		\
   %D%/packages/patches/dbus-c++-gcc-compat.patch		\
   %D%/packages/patches/dbus-c++-threading-mutex.patch		\
diff --git a/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch
new file mode 100644
index 0000000000..e82d0819bb
--- /dev/null
+++ b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch
@@ -0,0 +1,33 @@
+From f5df6813e305372e25b8a2124c491293a176e115 Mon Sep 17 00:00:00 2001
+From: Danny O'Brien <[email-masked]>
+Date: Fri, 3 Feb 2023 16:48:59 -0800
+Subject: [PATCH] Fix failing build of icheck.
+
+Building icheck fails with a duplicate symbol definition 
+error. This allows the icheck executable to compile.
+
+Submitted upstream[1] but not yet moderated/accepted.
+
+[1] https://sourceforge.net/p/dbacl/discussion/239876/thread/87636b0114/
+
+---
+ src/icheck.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/icheck.c b/src/icheck.c
+index efbb6a5..12a3b7a 100644
+--- a/src/icheck.c
++++ b/src/icheck.c
+@@ -39,9 +39,6 @@ extern regex_count_t regex_count;
+ extern empirical_t empirical;
+ 
+ extern int cmd;
+-char *progname = "icheck";
+-char *inputfile = "";
+-long inputline = 0;
+ 
+ extern long system_pagesize;
+ extern void *in_iobuf;
+-- 
+2.39.1
+
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index e5d3a0efc0..1092f1860b 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2021 Felix Gruber <[email-masked]>
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi <[email-masked]>
 ;;; Copyright © 2022 Gabriel Wicki <[email-masked]>
+;;; Copyright © 2022 Danny O'Brien <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -711,7 +712,7 @@ (define-public dbacl
                            "dbacl-" version ".tar.gz"))
        (sha256
         (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz"))
-       (patches (search-patches "dbacl-include-locale.h.patch"))))
+       (patches (search-patches "dbacl-include-locale.h.patch" "dbacl-icheck-multiple-definitions.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-- 
2.39.1