From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kP/kMLvo3WOJHwAAbAwnHQ (envelope-from ) for ; Sat, 04 Feb 2023 06:10:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YITlMLvo3WOm9gAAauVa8A (envelope-from ) for ; Sat, 04 Feb 2023 06:10:19 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5EB01327E7 for ; Sat, 4 Feb 2023 06:10:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOAoP-0001FY-6r; Sat, 04 Feb 2023 00:10:05 -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 ) id 1pOAoN-0001F3-3C for guix-patches@gnu.org; Sat, 04 Feb 2023 00:10:03 -0500 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 1pOAoM-0006fa-Ly for guix-patches@gnu.org; Sat, 04 Feb 2023 00:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pOAoM-0003iZ-CI for guix-patches@gnu.org; Sat, 04 Feb 2023 00:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61263] [PATCH] gnu: dbacl: Fix failing check phase. Resent-From: danny@spesh.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Feb 2023 05:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61263@debbugs.gnu.org Cc: Danny O'Brien X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167548735914226 (code B ref -1); Sat, 04 Feb 2023 05:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2023 05:09:19 +0000 Received: from localhost ([127.0.0.1]:40401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOAnd-0003hM-5k for submit@debbugs.gnu.org; Sat, 04 Feb 2023 00:09:19 -0500 Received: from lists.gnu.org ([209.51.188.17]:35730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOAnX-0003hA-59 for submit@debbugs.gnu.org; Sat, 04 Feb 2023 00:09:15 -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 ) id 1pOAnW-0001C1-SB for guix-patches@gnu.org; Sat, 04 Feb 2023 00:09:10 -0500 Received: from relay10.mail.gandi.net ([2001:4b98:dc4:8::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pOAnU-0006a7-BZ for guix-patches@gnu.org; Sat, 04 Feb 2023 00:09:10 -0500 Received: (Authenticated sender: outgoing@spesh.com) by mail.gandi.net (Postfix) with ESMTPSA id 128D3240002; Sat, 4 Feb 2023 05:08:59 +0000 (UTC) From: danny@spesh.com Date: Fri, 3 Feb 2023 21:08:35 -0800 Message-Id: <2f81f17ea425ae674aedb7f92826e58c8bea4412.1675487305.git.danny@spesh.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2001:4b98:dc4:8::230; envelope-from=danny@spesh.com; helo=relay10.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675487419; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/dfNG8R+9MFbCbFrA8m1rqeYr1D61/k2TyZIq4IsN9k=; b=PXO0D43U0CFbxrl01fjZTKhfvNk0bClgM6AOu92Wgwn8hPlaox9yCeu1iU6RcvX4Ws44Gz HaAJQtxxUbYlwBh0KX5V14jnYgPApnT8t+HJ1XWf3DLCAIoNQtRbnM5pqOIoNEsmV9pJT8 tGatsdoJiF9ZjrRelFXbb3R+wS4HfO654NNBmrlRAeNJWnQjZs+8KMnB2f2t6RG6VZQKDl iPqA5LzIi5Fko8h91Opp2yZcQDf4kMbO8ul8QrV4MYOOGDh8JUGEOowc31OSygWjHTswCJ yo0OthWyjjDUOZMN28H7o5DiYKtffRHI86pUNGEMryvRSettG9kfFst+/jP3EA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675487419; a=rsa-sha256; cv=none; b=XwaJrJ7tiW19/VHSHpW4naFdvAocOwjGXW1JiGFlc6VnjouBIkL6QTY/cGLemae/ydxheX wMYVfx9iXYJ59HovPYi8los4zonIEi/ytREwLLy8MSkAczArTm+vfWqhVUqzmV0CfFo5K6 gJIwkxhOo/h60GDho8aLrY2/2hRLAwCoW91BRrt0H9b/dYx/vL4j7ijkYU2FGgRPPBDlIL mz4lMyHNZdi13CnB66W6366nMsGfCgTWKpah+w4U44sHGMYHWbtekD8UtgMG1+3XFJb9ZN aMxvpcS9QSfDoBNazdvtjaYV+CUYldWjBdL8nSFznrqGMo9rk+qtcKg9e0y+vg== X-Migadu-Queue-Id: 5EB01327E7 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.18 X-Spam-Score: -3.18 X-TUID: 5QCqqCwNhivh From: Danny O'Brien * 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 +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