GNU bug report logs - #61263
[PATCH] gnu: dbacl: Fix failing check phase.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 61263 in the body.
You can then email your comments to 61263 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: danny <at> spesh.com
To: guix-patches <at> gnu.org
Cc: Danny O'Brien <danny <at> spesh.com>
Subject: [PATCH] gnu: dbacl: Fix failing check phase.
Date: Fri,  3 Feb 2023 21:08:35 -0800

From: Danny O'Brien <danny <at> spesh.com>

* gnu/packages/textutils.scm (dbacl): New patch.
* gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file.
---
 .../dbacl-icheck-multiple-definitions.patch   |  33 +++++
 gnu/packages/textutils.scm                    | 114 +++++++++---------
 2 files changed, 92 insertions(+), 55 deletions(-)
 create mode 100644 gnu/packages/patches/dbacl-icheck-multiple-definitions.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 <danny <at> spesh.com>
+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 151add964e..5ead8dec96 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -705,59 +705,63 @@ (define-public dbacl
   (package
     (name "dbacl")
     (version "1.14.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/dbacl/dbacl/" version "/"
-                           "dbacl-" version ".tar.gz"))
-       (sha256
-        (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz"))
-       (patches (search-patches "dbacl-include-locale.h.patch"))))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/dbacl/dbacl/"
+                                  version
+                                  "/"
+                                  "dbacl-"
+                                  version
+                                  ".tar.gz"))
+              (sha256
+               (base32
+                "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz"))
+              (patches (search-patches "dbacl-include-locale.h.patch"
+                        "dbacl-icheck-multiple-definitions.patch"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       (list
-        (string-append "-I" (assoc-ref %build-inputs "slang")
-                       "/include/slang")
-        (string-append "-I" (assoc-ref %build-inputs "ncurses")
-                       "/include/ncurses"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'delete-sample6-and-japanese
-           (lambda _
-             (substitute* "doc/Makefile.am"
-               (("sample6.txt") "")
-               (("japanese.txt") ""))
-             (delete-file "doc/sample6.txt")
-             (delete-file "doc/japanese.txt")
-             (substitute* (list "src/tests/Makefile.am"
-                                "src/tests/Makefile.in")
-               (("dbacl-jap.shin") "")
-               (("dbacl-jap.sh") ""))
-             #t))
-         (add-after 'unpack 'delete-test
-           ;; See comments about the license.
-           (lambda _
-             (delete-file "src/tests/dbacl-jap.shin")
-             #t))
-         (add-after 'unpack 'fix-test-files
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin")))
-               (substitute* (find-files "src/tests/" "\\.shin$")
-                 (("PATH=/bin:/usr/bin")
-                  "#PATH=/bin:/usr/bin")
-                 (("diff") (string-append (which "diff")))
-                 (("tr") (string-append (which "tr"))))
-               #t)))
-         (replace 'bootstrap
-           (lambda _
-             (invoke "autoreconf" "-vif")
-             #t)))))
-    (inputs
-     (list ncurses perl readline slang))
-    (native-inputs
-     (list libtool autoconf automake pkg-config))
+     `(#:make-flags (list (string-append "-I"
+                                         (assoc-ref %build-inputs "slang")
+                                         "/include/slang")
+                          (string-append "-I"
+                                         (assoc-ref %build-inputs "ncurses")
+                                         "/include/ncurses"))
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'delete-sample6-and-japanese
+                    (lambda _
+                      (substitute* "doc/Makefile.am"
+                        (("sample6.txt")
+                         "")
+                        (("japanese.txt")
+                         ""))
+                      (delete-file "doc/sample6.txt")
+                      (delete-file "doc/japanese.txt")
+                      (substitute* (list "src/tests/Makefile.am"
+                                         "src/tests/Makefile.in")
+                        (("dbacl-jap.shin")
+                         "")
+                        (("dbacl-jap.sh")
+                         "")) #t))
+                  (add-after 'unpack 'delete-test
+                    ;; See comments about the license.
+                    (lambda _
+                      (delete-file "src/tests/dbacl-jap.shin") #t))
+                  (add-after 'unpack 'fix-test-files
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out "/bin")))
+                        (substitute* (find-files "src/tests/" "\\.shin$")
+                          (("PATH=/bin:/usr/bin")
+                           "#PATH=/bin:/usr/bin")
+                          (("diff")
+                           (string-append (which "diff")))
+                          (("tr")
+                           (string-append (which "tr")))) #t)))
+                  (replace 'bootstrap
+                    (lambda _
+                      (invoke "autoreconf" "-vif") #t)))))
+    (inputs (list ncurses perl readline slang))
+    (native-inputs (list libtool autoconf automake pkg-config))
     (home-page "https://www.lbreyer.com/dbacl.html")
     (synopsis "Bayesian text and email classifier")
     (description
@@ -768,13 +772,13 @@ (define-public dbacl
     ;; The software is licensed as GPLv3 or later, but
     ;; includes various sample texts in the doc dir:
     ;; - sample1.txt, sample3 and sampe5.txt are in the public domain,
-    ;;   by Mark Twain.
+    ;; by Mark Twain.
     ;; - sample2.txt, sample4.txt are in the public domain, by Aristotle.
     ;; - sample6.txt is a forwarded email, copyright unknown.
-    ;;   Guix does exclude sample6.txt.
+    ;; Guix does exclude sample6.txt.
     ;; - japanese.txt is a Japanese unoffical translation of the
-    ;;   GNU General Public License, (c) by the Free Software Foundation.
-    ;;   Guix excludes this file.
+    ;; GNU General Public License, (c) by the Free Software Foundation.
+    ;; Guix excludes this file.
     (license (list license:gpl3+ license:public-domain))))
 
 (define-public dotconf

base-commit: c3e50c731d8c175133cae1869e445cbb7a3b4d6f
-- 
2.39.1

Message #10 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: guix-patches <at> gnu.org, danny <at> spesh.com, 61263 <at> debbugs.gnu.org
Cc: Danny O'Brien <danny <at> spesh.com>
Subject: Re: [bug#61263] [PATCH] gnu: dbacl: Fix failing check phase.
Date: Sat, 04 Feb 2023 10:07:38 +0000

Hi Danny,

Low-quality review incoming.

I've merged the two duplicate-looking bugs 61263 & 61270.  What happened?

When adding new patch files, you need also add them to gnu/local.mk's sorted dist_patch_DATA list.  Thanks for submitting it upstream!

Reviewing the rest in K-9 is difficult because of the sweeping indentation changes.  Could you submit a v2 without them?

I suspect I'm disagreeing with 'guix style' and not with you, but the 'source' , '#t', and comment changes are steps back IMO (that poor "/"!).

As a rule, there's no requirement to blanket reformat existing code in Guix.  'guix style' isn't there yet.

Removing the obsolete '#t's entirely is welcome though—in a separate commit.

Thanks!

T G-R

Sent on the go.  Excuse or enjoy my brevity.

Message #16 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Danny O'Brien" <danny <at> spesh.com>
To: Tobias Geerinckx-Rice <me <at> tobias.gr>
Cc: 61263 <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#61263] [PATCH] gnu: dbacl: Fix failing check phase.
Date: Sat, 4 Feb 2023 23:53:29 -0500

[Message part 1 (text/plain, inline)]

On Sat, Feb 04, 2023 at 2:07 AM, Tobias Geerinckx-Rice <me <at> tobias.gr> wrote:

> Hi Danny,
>
> Low-quality review incoming.
>
> I've merged the two duplicate-looking bugs 61263 & 61270. What happened?
>


I think I didn't spot that the earlier submission went through.


> When adding new patch files, you need also add them to gnu/local.mk's
> sorted dist_patch_DATA list. Thanks for submitting it upstream!
>

Ah, will do!



Reviewing the rest in K-9 is difficult because of the sweeping indentation
> changes. Could you submit a v2 without them?
>
> I suspect I'm disagreeing with 'guix style' and not with you, but the
> 'source' , '#t', and comment changes are steps back IMO (that poor "/"!).
>
> As a rule, there's no requirement to blanket reformat existing code in
> Guix. 'guix style' isn't there yet.
>
> Removing the obsolete '#t's entirely is welcome though—in a separate
> commit.
>
> Thanks!
>
> T G-R
>
> Sent on the go. Excuse or enjoy my brevity.
>


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.

Thanks for your suggestions!

d.

[Message part 2 (text/html, inline)]

Message #22 received at 61263 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: "Danny O'Brien" <danny <at> spesh.com>
Cc: 61263 <at> debbugs.gnu.org, Tobias Geerinckx-Rice <me <at> tobias.gr>,
 61270 <at> debbugs.gnu.org
Subject: Re: bug#61270: [PATCH] gnu: dbacl: Fix failing check phase.
Date: Sat, 04 Mar 2023 17:37:27 +0100

Hi Danny,

"Danny O'Brien" <danny <at> spesh.com> 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’.

Message #25 received at 61263 <at> debbugs.gnu.org (full text, mbox):

From: "Danny O'Brien" <danny <at> fil.org>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 61263 <at> debbugs.gnu.org, Tobias Geerinckx-Rice <me <at> tobias.gr>,
 61270 <at> debbugs.gnu.org
Subject: Re: bug#61270: [PATCH] gnu: dbacl: Fix failing check phase.
Date: Sat, 4 Mar 2023 23:24:37 -0800

[Message part 1 (text/plain, inline)]

On Sat, Mar 04, 2023 at 05:37:27PM +0100, Ludovic Courtès wrote:
> Hi Danny,
> 
> "Danny O'Brien" <danny <at> spesh.com> 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: <a235a39729579a7b0f49326fcfc6f5a291074b01.1678000253.git.danny <at> spesh.com>
From: Danny O'Brien <danny <at> spesh.com>
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 <danny <at> spesh.com>
+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 <felgru <at> posteo.net>
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me <at> bonfacemunyoki.com>
 ;;; Copyright © 2022 Gabriel Wicki <gabriel <at> erlikon.ch>
+;;; Copyright © 2022 Danny O'Brien <danny <at> spesh.com>
 ;;;
 ;;; 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

[0001-gnu-dbacl-Fix-failing-check-phase.patch (text/plain, attachment)]

Message #30 received at 61263-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: "Danny O'Brien" <danny <at> fil.org>
Cc: Tobias Geerinckx-Rice <me <at> tobias.gr>,
 Ludovic Courtès <ludo <at> gnu.org>, 61263-done <at> debbugs.gnu.org,
 61270-done <at> debbugs.gnu.org
Subject: Re: bug#61270: [PATCH] gnu: dbacl: Fix failing check phase.
Date: Tue, 21 Mar 2023 22:13:21 -0400

Hi,

"Danny O'Brien" <danny <at> fil.org> writes:

> On Sat, Mar 04, 2023 at 05:37:27PM +0100, Ludovic Courtès wrote:
>> Hi Danny,
>> 
>> "Danny O'Brien" <danny <at> spesh.com> 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:
>

[...]

> 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 <felgru <at> posteo.net>
>  ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me <at> bonfacemunyoki.com>
>  ;;; Copyright © 2022 Gabriel Wicki <gabriel <at> erlikon.ch>
> +;;; Copyright © 2022 Danny O'Brien <danny <at> spesh.com>
>  ;;;
>  ;;; 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

I've installed this change, but dropped your copyright line, as changes
smaller than 10-15 lines of new code are not subjected to copyright.

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.