Tobias Geerinckx-Rice <me@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at submit) by debbugs.gnu.org; 4 Feb 2023 07:46:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Feb 04 02:46:46 2023
Received: from localhost ([127.0.0.1]:40551 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pODFv-0006ZJ-2k
for submit <at> debbugs.gnu.org; Sat, 04 Feb 2023 02:46:46 -0500
Received: from lists.gnu.org ([209.51.188.17]:40610)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <danny@HIDDEN>) id 1pO9Rk-0007Oq-Bx
for submit <at> debbugs.gnu.org; Fri, 03 Feb 2023 22:42:39 -0500
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 <danny@HIDDEN>) id 1pO9Rk-0005G2-3u
for guix-patches@HIDDEN; Fri, 03 Feb 2023 22:42:36 -0500
Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <danny@HIDDEN>) id 1pO9Rh-0005qz-QX
for guix-patches@HIDDEN; Fri, 03 Feb 2023 22:42:35 -0500
Received: by mail-pl1-x62d.google.com with SMTP id b5so7171055plz.5
for <guix-patches@HIDDEN>; Fri, 03 Feb 2023 19:42:32 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fil.org; s=google;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=/dfNG8R+9MFbCbFrA8m1rqeYr1D61/k2TyZIq4IsN9k=;
b=FIPWwZWat1Ii2pTMhOAMtay1oJ5hCWtQ5ItLs03rDrXlUiIgrXPdaeIxJdKU0gsiGD
kSQ0PywOHst3+qaXnsmz1q7/rYfj4YO4Vr/1Icrsax274EokAU10LnqTTAK8ft1Xk6Au
Jlp1VivAfqJCmK3VfB02aR33B+6A2zHt/8NUKzZURLrCuEfm5lgy7jAWiS0kx5Xbdi+X
c2hpa/BZybE24u8s9/2bB1K3bIiLj5bt/qrkL8mXajvzSXlHrqe/CpDwsu8TxKXpP6Gn
DFCWV1gy1pDv0NaCxBRHnLgMgMMluLIPLxo2NfLxb/bE4iPtiMpUMvafJVoNL29q6hs7
g2uQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=/dfNG8R+9MFbCbFrA8m1rqeYr1D61/k2TyZIq4IsN9k=;
b=J5ltmnASWuyw0h8Ae4h/zn6u3U+RXD16bRzrSVvJF+YJwu5ASiulzWp1ckbGOKwib9
BRgx6UPSN3sP4IJtWqMsJBf7yUsMx9QgF3mwyHSEcRCJV1ZYvAGX80zcOwBnyw+/3V+u
ie1E6cGPizcRebCx7PeX2YeeLNDkjtdsmwum74D9ZC4Q1OvPcgO8Gr/hYpk2LJW3/GHQ
wkA9ehjbVBc0wmfz95JbSTgAXcL77ur5QgkyYb5JciF7Jt57E017FMtvp/EtGu3eyXWg
ZqlNSyrUpWz3RoCm7xrC4I5RjH5m8AXJkU5+03F7tt9Bzax3J9pOsYUuOHElb1BNZa75
xlPw==
X-Gm-Message-State: AO0yUKW2vrxsLKblRDTsWkZOfwHoeOf05tMBCrzPmkiSprs2lCOkQKbt
TRjw3gkDnZb16hXGD7RXJjXL9JKqlRwCaq5G
X-Google-Smtp-Source: AK7set+cTyoN6n226KmLm9z7JrvWf/w2bOnVpnimt4V9Gys7w/oLuW2/SOJfl/geAuQUHISXTXPNVQ==
X-Received: by 2002:a17:902:dac8:b0:196:59a0:bffe with SMTP id
q8-20020a170902dac800b0019659a0bffemr15737812plx.17.1675482151174;
Fri, 03 Feb 2023 19:42:31 -0800 (PST)
Received: from fil.org ([2601:645:8000:d359:7f6b:6157:dd65:fada])
by smtp.gmail.com with ESMTPSA id
q16-20020a170902edd000b001966308ca0dsm2375065plk.167.2023.02.03.19.42.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 03 Feb 2023 19:42:30 -0800 (PST)
From: danny@HIDDEN
X-Google-Original-From: danny@HIDDEN
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: dbacl: Fix failing check phase.
Date: Fri, 3 Feb 2023 19:42:18 -0800
Message-Id: <2f81f17ea425ae674aedb7f92826e58c8bea4412.1675482130.git.danny@HIDDEN>
X-Mailer: git-send-email 2.39.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::62d;
envelope-from=danny@HIDDEN; helo=mail-pl1-x62d.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
X-Mailman-Approved-At: Sat, 04 Feb 2023 02:46:33 -0500
Cc: Danny O'Brien <danny@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
From: Danny O'Brien <danny@HIDDEN>
* 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@HIDDEN>
+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
danny@HIDDEN:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#61270; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.