From patchwork Sun Dec 1 20:59:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 34362 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 0181727BBEA; Sun, 1 Dec 2024 21:00:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2446327BBE2 for ; Sun, 1 Dec 2024 21:00:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHr37-00005O-8o; Sun, 01 Dec 2024 16:00: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 1tHr31-0008U9-Ey for guix-patches@gnu.org; Sun, 01 Dec 2024 16:00:10 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tHr2x-0005iE-Bu for guix-patches@gnu.org; Sun, 01 Dec 2024 16:00:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:In-Reply-To:References:Subject; bh=CjNgtTvn/JF31IY906/ca36EfCChHzuGTFesRRrbsh8=; b=qq3ZWK2eyJ3wlbx7qTDxO96StN6QM9x7wOs3zJ6T6YITaZt5qqcdiqhUFDDgOLB8NbkhB2Z5qzJ9ldGPsP+q7cA+hhIAu25Ej61NOkInzDn16M3+YX6KiffX3T+fmFaR3s0bZUlhYg1TziumVJPZU97R9vTjCaEb/YjNwD7M7TUgp9J0r2fNE8HYajtL0tV0ure9FEN9A/HQUvoeDI3GY/IzvzhPHUAclmdaWf8LL8NQEIdrIEq2RM6X62Ovx7GtthjcVf006N64DXB/CQZl+Wgxu2s/zS/u90E0stKnvQuswF8Swnf6K5YpWIFhDrEDvZHUxygroepVwqSILH/5UQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHr2x-0008Hc-61 for guix-patches@gnu.org; Sun, 01 Dec 2024 16:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v3 1/5] gnu: Add (gnu packages dictd). References: In-Reply-To: Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Dec 2024 21:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74411 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74411@debbugs.gnu.org Cc: Runciter Received: via spool by 74411-submit@debbugs.gnu.org id=B74411.173308679031781 (code B ref 74411); Sun, 01 Dec 2024 21:00:03 +0000 Received: (at 74411) by debbugs.gnu.org; 1 Dec 2024 20:59:50 +0000 Received: from localhost ([127.0.0.1]:53246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr2j-0008GW-Ss for submit@debbugs.gnu.org; Sun, 01 Dec 2024 15:59:50 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]:28023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr2e-0008GC-Vg for 74411@debbugs.gnu.org; Sun, 01 Dec 2024 15:59:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1733086778; x=1733345978; bh=CjNgtTvn/JF31IY906/ca36EfCChHzuGTFesRRrbsh8=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=L3HC6MIV+7bL/yeTpIXR2NB9Wl3uhaxMfdzex3thzmFPVw+/jR+rWgWUUU5N05xso mQKZAz/2rZ2P9fX147E+lJUdCnV+PdyLg8VHeuc4cyVG85uXv8iq6DdJ3Ytt3fVjGc 7IpbOY+OylbT9AH5Zucs5/xL5L1Mkw9+1QhwMFGWh+EF3iJKjLjQCEiEe3YrwskMSE nntP63EHUHDccWxs88a8BFvSLQ2F/IMmV/l2uK8DCvS51BiepAffRn8Xy4E/jEBNgW uO1S22jegg59wtcITSdmF2JdeDwJsqC/QLPIpB6DLxlRjh2ZRNRy6Df4RJ+qPUtwCY npXw+EcuxpIHg== Date: Sun, 01 Dec 2024 20:59:35 +0000 Message-ID: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 3cdb9b807519d4ed84791ecdcd36b0fc517bbb2a MIME-Version: 1.0 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: , Reply-to: Runciter X-ACL-Warn: , Runciter via Guix-patches X-Patchwork-Original-From: Runciter via Guix-patches via From: Runciter 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/dictd.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Runciter --- gnu/local.mk | 2 ++ gnu/packages/dictd.scm | 63 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 gnu/packages/dictd.scm base-commit: b790db7589858fc77989b4d1f369c52bca6d6e7c diff --git a/gnu/local.mk b/gnu/local.mk index a97e988add..7004d02547 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -67,6 +67,7 @@ # Copyright © 2024 David Elsing # Copyright © 2024 Ashish SHUKLA # Copyright © 2024 Fabio Natali +# Copyright © 2024 Runciter # # This file is part of GNU Guix. # @@ -239,6 +240,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/decker.scm \ %D%/packages/dhall.scm \ %D%/packages/dico.scm \ + %D%/packages/dictd.scm \ %D%/packages/dictionaries.scm \ %D%/packages/diffoscope.scm \ %D%/packages/digest.scm \ diff --git a/gnu/packages/dictd.scm b/gnu/packages/dictd.scm new file mode 100644 index 0000000000..8e025a2f04 --- /dev/null +++ b/gnu/packages/dictd.scm @@ -0,0 +1,63 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Runciter +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages dictd) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module ((guix licenses) #:select (gpl2+)) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages autotools)) + +(define-public libmaa + (package + (name "libmaa") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dict/libmaa/" + "libmaa-" + version + "/libmaa-" + version + ".tar.gz")) + (sha256 + (base32 "1idi4c30pi79g5qfl7rr9s17krbjbg93bi8f2qrbsdlh78ga19ar")))) + (native-inputs (list libtool)) + (arguments + (list + ;; Change -Werror to -Wno-error, reproduce other default flags + ;; Do not error out on warnings related to snprintf function + #:make-flags #~'("CFLAGS=-DHAVE_CONFIG_H -Wall -Wno-error -g -O2 $(VERCFLAGS) -I. -I${srcdir}") + #:test-target "test")) + (build-system gnu-build-system) + (synopsis "Low-level data structures used by the dictd program") + (description + "The libmaa library provides many low-level +data structures which are helpful for writing compilers, including hash +tables, sets, lists, debugging support, and memory management. Although +libmaa was designed and implemented as a foundation for the Khepara +transformation system, the data structures are generally applicable to a +wide range of programming problems. + +The memory management routines are especially helpful for improving the +performance of memory-intensive applications.") + (home-page "https://sourceforge.net/projects/dict/") + (license gpl2+))) From patchwork Sun Dec 1 20:59:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 34363 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 19FC027BBEA; Sun, 1 Dec 2024 21:01:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C76C127BBE9 for ; Sun, 1 Dec 2024 21:01:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHr41-0000GA-Ef; Sun, 01 Dec 2024 16:01:11 -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 1tHr3u-0000FQ-9c for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tHr3u-00060X-0o for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=TdW9KUINRg0S/HPaYKzY5IJKruUqP0tddOHYY8Svhd8=; b=N7hHDUPPgeYivXWrIXyqS2TFtCsyfc+KdKxSORwq6Yt+xxiBL9nltczv0mBZHuZVaar1ZhIGLBldhpUAevud7TAICLFTYVqschJIi80XdjQMkTpJJ3DuTeNNCT6MXjA7tBEH/EkOmBEMTBwttzPkrcm6i2kGvapEGGPtmmex+gp7J1QQtZhOTzalDhjwC+SfV0JMLXrYU+rjNrzTOAn+eV/mV3UQVSEiOZTmeUqZbbJhlzg7dwR9blgMS8kjE0gYai2E3cdQV6Hj8CKp66mf7e4VOiXcT1Z88tg0lM5v8vUuYJWc5bRkyjzFZPhEY69HD0IXBIGvVJ6uVtNcDPONHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHr3t-0008RV-O2 for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v3 2/5] gnu: Add dictd. Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Dec 2024 21:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74411 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74411@debbugs.gnu.org Cc: Runciter Received: via spool by 74411-submit@debbugs.gnu.org id=B74411.173308680631955 (code B ref 74411); Sun, 01 Dec 2024 21:01:01 +0000 Received: (at 74411) by debbugs.gnu.org; 1 Dec 2024 21:00:06 +0000 Received: from localhost ([127.0.0.1]:53252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr2z-0008J4-Hh for submit@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:06 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:14507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr2x-0008Gp-Ac for 74411@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1733086797; x=1733345997; bh=TdW9KUINRg0S/HPaYKzY5IJKruUqP0tddOHYY8Svhd8=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=Ok0L1V3aiEi1rKTlLSx02pSLoKVdu4k3OoMNVSEBtDGqEVcdD1yVlErKM7NVFGsAQ 1tvfyxkm1kW3O2wBsnAVf2Ve56zDlcCIdJYV95OCEkYHtrdHbnExJsGpjW+KzSjW1r Dz+oDNx6ZKAboylJrskRXWXPOm7rIUT4OFWtvZaQMnixbLn0kvusa03F4+SPjfWNK9 U8DJK6DbB5u4OGMem4sCdHRVsCU8A2uknYP7bazM8mDaM16eN894jAvAvGaVgsCMap F+K3K/pTBAwhVkf3/l0sAzHhiDJ9btuV7b1+2br9M8nh+gXP0BQtpnKu3lNXF04lMe KV/l0JcfdXrsw== Date: Sun, 01 Dec 2024 20:59:53 +0000 Message-ID: <6784ab4908bc9c1217cabf7f54c96d91e1915364.1733086737.git.runciter@whispers-vpn.org> In-Reply-To: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> References: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 9899438f873e1df5f40070a2e79cf5bd2be5e684 MIME-Version: 1.0 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: , Reply-to: Runciter X-ACL-Warn: , Runciter via Guix-patches X-Patchwork-Original-From: Runciter via Guix-patches via From: Runciter 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/dictd.scm (dictd-1.13.1): New variable. Signed-off-by: Runciter --- gnu/packages/dictd.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dictd.scm b/gnu/packages/dictd.scm index 8e025a2f04..5456b39d9b 100644 --- a/gnu/packages/dictd.scm +++ b/gnu/packages/dictd.scm @@ -23,7 +23,10 @@ (define-module (gnu packages dictd) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages autotools)) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) + #:use-module (gnu packages compression)) (define-public libmaa (package @@ -61,3 +64,37 @@ (define-public libmaa performance of memory-intensive applications.") (home-page "https://sourceforge.net/projects/dict/") (license gpl2+))) + +(define-public dictd + (package + (name "dictd") + (version "1.13.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dict/dictd/" + "dictd-" + version + "/dictd-" + version + ".tar.gz")) + (sha256 + (base32 "06racmv25ihwgwf67fgj2703ik0m5i2cjzcxasa88kc92rysdwg4")))) + (inputs (list libmaa zlib)) + (native-inputs (list libtool bison flex)) + (arguments + (list + #:test-target "test")) + (build-system gnu-build-system) + (synopsis "@command{dict}, @command{dictd} and @command{dictfmt} programs") + (description + "The DICT Interchange Format (DICF) is a human-readable + format for the interchange of dictionary databases for the use with +DICT protocol client/server software. + +This package provides a client @command{dict} and a server program +@command{dictd} for the DICT protocol, as well as a utility +@command{dictfmt} to convert various dictionary formats into +dictionaries that can be served by @command{dictd} or @command{dicos}") + (home-page "https://sourceforge.net/projects/dict/") + (license gpl2+))) From patchwork Sun Dec 1 21:00:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 34365 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 5A1E727BBE2; Sun, 1 Dec 2024 21:01:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CAABC27BBE2 for ; Sun, 1 Dec 2024 21:01:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHr4E-0000IG-U0; Sun, 01 Dec 2024 16:01:26 -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 1tHr3u-0000FV-N1 for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tHr3u-00060k-E0 for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=uG0dDk/raJ3grzOOJUWMfN4KhjjzZnSK/cNbzS/BspU=; b=Kxp8LnU6Fj/8UDQBS0VKxHEUQPQkeei4Cbt61pxA2leziLM9omEJps0Gnh9Cg6HC/FqS94YwL6PzcwZjOmyQbzpbGLKORKfECaj76DS5XfuunZDTKOcak/L1c+FzCgyZmaxEnBJ8YP7kdvHCjtryPqSFKh1g7YTgPJ7MAlN3z4dyCRrd5OZQX9SOVCKAcXjDlrThsONMni1//YdA6qli8BRkO5+W1gOVaP4ht/rJfrW74gSiKHmZu3jN3VrmEgkqUL6TJIh1ezq2JcsyJS9RYuWNyKA7afKMNrSfRi1K22ogE75q1ExJnAN0Sn+/132DgmcecGwIr8IhE3WpOll+bA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHr3u-0008Rf-9I for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v3 3/5] gnu: Add freedict-tools. Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Dec 2024 21:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74411 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74411@debbugs.gnu.org Cc: Runciter Received: via spool by 74411-submit@debbugs.gnu.org id=B74411.173308681932350 (code B ref 74411); Sun, 01 Dec 2024 21:01:02 +0000 Received: (at 74411) by debbugs.gnu.org; 1 Dec 2024 21:00:19 +0000 Received: from localhost ([127.0.0.1]:53261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr3D-0008Pd-9G for submit@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:19 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:43843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr3B-0008O0-3U for 74411@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1733086811; x=1733346011; bh=uG0dDk/raJ3grzOOJUWMfN4KhjjzZnSK/cNbzS/BspU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=kCD5xoPsnSrCDY3Kwn+sT8WEcfMQ1uhZM1BavbbV8oKKWEmS24HUuj8jpB9TcCDhX zjPADOLMUgk9qhR2toVon39E4A+S79RH3tizjrJ4z0EJTiRRhKN+chnY+mjOGElqFc hgCm8dfvuX0B6+TL3czVwiEP2UqE8vEsxqkTJdi6QcaMHLdlVSIRtl2yvrNptgt5eV Iac+HQQWm5ZfVoF8+4rchTp6s7H0dmMBrNvGyAj0mfsYsC4LJ0V1OXDIsRWjHf55zz AumZ7Vc/Yyi8DIqJwEHfo8eSaxAxBvzVYmzEIQMhFNmdo3PLslqFe8ey6lDkP36ME7 lqByhcrtOjUEQ== Date: Sun, 01 Dec 2024 21:00:05 +0000 Message-ID: <8e0e8a272dfabae8164a9662089f6370dc6f51ad.1733086737.git.runciter@whispers-vpn.org> In-Reply-To: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> References: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 2e2fcd3ccaad0f4ceeb8b61c497f4a8748d7440a MIME-Version: 1.0 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: , Reply-to: Runciter X-ACL-Warn: , Runciter via Guix-patches X-Patchwork-Original-From: Runciter via Guix-patches via From: Runciter 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/dictionaries.scm (freedict-tools-0.6.0): New variable. Signed-off-by: Runciter --- gnu/packages/dictionaries.scm | 54 ++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 3f9b59c960..3141d6d46d 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -28,6 +28,7 @@ (define-module (gnu packages dictionaries) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) @@ -55,7 +56,10 @@ (define-module (gnu packages dictionaries) #:use-module (gnu packages compression) #:use-module (gnu packages tcl) #:use-module (gnu packages web) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (gnu packages dictd) + #:use-module (gnu packages speech) + #:use-module (gnu packages perl)) (define-public vera @@ -466,3 +470,51 @@ (define-public skk-jisyo for SKK Japanese input systems, and various dictionary files. @file{SKK-JISYO.L} can be used with @code{emacs-ddskk} or @code{uim} package.") (license license:gpl2+)))) + +(define-public freedict-tools + (package + (name "freedict-tools") + (version "0.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freedict/tools") + (commit "3596640e6e0582cc5fb76a342e5d8e7413aa4b34"))) + (sha256 + (base32 "1raayynvn1j8x0ck8pnbbljl6zxnsyzzil7y54xz03dpj7k9w7mk")))) + (inputs (list espeak-ng + python + perl + gzip + tar + libxslt + dictd + perl-libxml)) + (arguments + (list + #:tests? #f + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-prefix-in-makefile + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("PREFIX \\?=.*") + (string-append "PREFIX = " + #$output "\n"))) + (substitute* "mk/dicts.mk" + (("available_platforms := src dictd slob") + "available_platforms := dictd"))))))) + (build-system gnu-build-system) + (synopsis "Build and manage FreeDict dictionaries") + (description + "FreeDict is a project that offers over 140 free +dictionaries in about 45 languages, with the right to study, change and +modify them. You can use them offline on your computer or mobile phone +and export them to any format and application. + +In order to limit store size and build complexity, only the build +targets that build dictionaries in dictd format are retained when this +Guix package is installed.") + (home-page "https://freedict.org") + (license license:gpl2+))) From patchwork Sun Dec 1 21:00:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 34364 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 CDD2B27BBEA; Sun, 1 Dec 2024 21:01:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7244927BBE2 for ; Sun, 1 Dec 2024 21:01:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHr46-0000GK-KW; Sun, 01 Dec 2024 16:01:16 -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 1tHr3v-0000Fk-HP for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tHr3u-00060x-U2 for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=KA7MoKEu5zZGMzujDHwzyBZla8mbyNRRI/zqtc541aQ=; b=jcGytOn42LHvyB7kFQe2erDC3g9WVVGs74NQVHu/EgIWxJQqOjctEStLj0fn8NxuznL7z6MWwMAoXVu8I4a0I3oQacQ2IBnZQO5bwZQk1jwNcSAxVJmmjvf7jilqmxKwVvjZ7j4Ta07Lr6LLnuGELhwqmulT4OVMlZmpBDRT5gHxwDg40/dRbHAp6QIaWuxjQbt0Y7WHqdthhjAU/+AJUjUZD/oKHpR95+t4C3tuMTiCvrz2iWOpQrx9BF4EeR+xFeL1MXKtu165xAbaHqt3o1Kwp5Pt2yC7ov6bEfPnkr+wijVmHdwZVeyV2GnAPrHiwqZOTv8WTFvZ7qqXLsZH5w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHr3u-0008Rm-P3 for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v3 4/5] gnu: Add freedict-dictionaries. Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Dec 2024 21:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74411 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74411@debbugs.gnu.org Cc: Runciter Received: via spool by 74411-submit@debbugs.gnu.org id=B74411.173308682932375 (code B ref 74411); Sun, 01 Dec 2024 21:01:02 +0000 Received: (at 74411) by debbugs.gnu.org; 1 Dec 2024 21:00:29 +0000 Received: from localhost ([127.0.0.1]:53265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr3M-0008Q7-Py for submit@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:29 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:32971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr3K-0008Ps-6R for 74411@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1733086820; x=1733346020; bh=KA7MoKEu5zZGMzujDHwzyBZla8mbyNRRI/zqtc541aQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=gtVZuxrqAP6sikMxQEkznP01xrxRPEUoTZweMrAjsfwgfoqaN+jG3Ydb5WJ0egDEm XnodgnoLZaTy2+wOfofVS+x0pXjudWSuKu2b6iY/f67mqtocyoK5hJqy4oEgocBZEi lPuBJRtAcWcZFBD88+gGBrnV9HhFimoeiGfC3rllmUMkdzw9vAecjPs+lEaSV7PEhI eWV59xW7rV1hcCVjDDFBcin+17yOcwJRlUebqIBSxNYzETfXmQCwsLlxwgzk1enuep a9SRtR5WmNU4hdhx0UkJbb4X/lYGEobo9mCV7H+lsWhptMv2iqR52V/POb0202h5tU 3Sd5igiUQTY0Q== Date: Sun, 01 Dec 2024 21:00:16 +0000 Message-ID: In-Reply-To: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> References: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 62e30861744716e1a8cd4c3a29c27bd023fc20fd MIME-Version: 1.0 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: , Reply-to: Runciter X-ACL-Warn: , Runciter via Guix-patches X-Patchwork-Original-From: Runciter via Guix-patches via From: Runciter 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/dictionaries (freedict-dictionaries): New variable. Signed-off-by: Runciter --- gnu/packages/dictionaries.scm | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 3141d6d46d..e6f9f7f5a8 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2020 Lu hux ;;; Copyright © 2022 ROCKTAKEY +;;; Copyright © 2022 Runciter ;;; ;;; This file is part of GNU Guix. ;;; @@ -518,3 +519,44 @@ (define-public freedict-tools Guix package is installed.") (home-page "https://freedict.org") (license license:gpl2+))) + +(define-public freedict-dictionaries + (package + (name "freedict-dictionaries") + (version "914b5f7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freedict/fd-dictionaries") + (commit "914b5f754b695e9422bf951837b0682a077e244e"))) + (sha256 + (base32 "0a8k5rq94rl1nmz0354sx2gmyqica0yjavirh5v5wdybkfq8nv83")))) + (inputs (list espeak-ng libxslt dictd perl-libxml freedict-tools)) + (native-inputs (list python perl)) + (arguments + (list + ;; "validation" target fails because of hardcoded + ;; path /usr/bin/xmllint in freedict-tools + #:tests? #f + #:make-flags #~(list (string-append "PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-tools-prefix-in-makefile + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("FREEDICT_TOOLS \\?= ../tools") + (string-append "export FREEDICT_TOOLS = " + #$(file-append + freedict-tools + "/share/freedict"))))))))) + (build-system gnu-build-system) + (synopsis "Multilingual dictionaries compiled to the DICT format") + (description + "FreeDict is a project that offers over 140 free + dictionaries in about 45 languages, with the right to study, change and + modify them. You can use them offline on your computer or mobile phone + and export them to any format and application.") + (home-page "https://freedict.org") + (license license:gpl2+))) From patchwork Sun Dec 1 21:00:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 34366 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 A112227BBE2; Sun, 1 Dec 2024 21:01:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 3B20D27BBEA for ; Sun, 1 Dec 2024 21:01:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHr4J-0000KI-IZ; Sun, 01 Dec 2024 16:01:27 -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 1tHr3v-0000Fq-Tn for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tHr3v-000614-H7 for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=cpozZIQMH2y9OYC+MWEyuWScUeC5l5rvw4+4wYnWQ2Q=; b=eRwKqGI50uqhDnljRN9LFnV1Q3ACDhdS4yR8v5CGUOlwdx4U5ebkcK4encolBYvaF80/+Ktq0AdMn/Oa5+L9jlmItD64LzvL5H4tMBACGqxZbbZV2o3MXLsh/VTJ65YEw66Vw5/dN4WY8f3dNCEc8WmMkBtH4It3AsQI0yE94RaNylrBUnGxSjq5T6UyBhjZL+ian4mv8XaCibmsTHlwwdcisce0c+s+FntDicBjB2bu8c8UP6XWfIHvEsiRIM9grYSSnTbH1EkAItJfHoCXoia8/cSqjlJ5AGWO51wfg8wZIfI/n1eTmB2PbMU0rcAuHmuXccaEmSCOlVVL6qIOyg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHr3v-0008Rv-AF for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v3 5/5] gnu: freedict-tools: Fix non-determinism of dictzip compressed file headers. Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Dec 2024 21:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74411 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74411@debbugs.gnu.org Cc: Runciter Received: via spool by 74411-submit@debbugs.gnu.org id=B74411.173308684332407 (code B ref 74411); Sun, 01 Dec 2024 21:01:03 +0000 Received: (at 74411) by debbugs.gnu.org; 1 Dec 2024 21:00:43 +0000 Received: from localhost ([127.0.0.1]:53269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr3b-0008Qd-90 for submit@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:43 -0500 Received: from mail-10625.protonmail.ch ([79.135.106.25]:61411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr3Z-0008QN-40 for 74411@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1733086834; x=1733346034; bh=cpozZIQMH2y9OYC+MWEyuWScUeC5l5rvw4+4wYnWQ2Q=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=aMPk+Uj8VFDhyrgHrSTJ+oQIkYRFT4JcjicFqX59hqvd7YetPfigUnqzG05VoHwfm S2jBU7lTeeWwsMp4ijVYn9d0TMs38UTAaSCxrbbQhzbnhCifMxniSoz52tdhfxzSl/ l+ZqYTNoaQIzGsqli4EMbNqTIe+VzqKw4N2AJBVqDkuhzQNtqP99zemVjgE15qWfYO c0vP3pl2r2ZvRyKyJRWRhsPvd+hR52Z2C3IzmH3UWEOEPTJzkP9LfkX+y2WNumqRI0 882Y+7BMSJCe3Bxs/xNwPbCh1W1JmYoaE6nKmZiqOEAP2l4M4b60n9KBEYAOPsp3mg 2DaEPZOBJ1/GA== Date: Sun, 01 Dec 2024 21:00:29 +0000 Message-ID: <7eff2fc08e8f01e7f696b40d4addcd1646fd65e4.1733086737.git.runciter@whispers-vpn.org> In-Reply-To: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> References: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 7d828cfd997610de88867c9599943bf9e96c66dd MIME-Version: 1.0 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: , Reply-to: Runciter X-ACL-Warn: , Runciter via Guix-patches X-Patchwork-Original-From: Runciter via Guix-patches via From: Runciter 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 Reset .dict file mtime to start of the epoch before compressing with dictzip. * gnu/packages/patches/freedict-tools-fix-determinism.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/dictionaries.scm (freedict-tools): Use it. Signed-off-by: Runciter --- gnu/local.mk | 1 + gnu/packages/dictionaries.scm | 3 ++- .../freedict-tools-fix-determinism.patch | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/freedict-tools-fix-determinism.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7004d02547..f6b465441a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1291,6 +1291,7 @@ dist_patch_DATA = \ %D%/packages/patches/fpc-glibc-2.34-compat.patch \ %D%/packages/patches/fpm-newer-clamp-fix.patch \ %D%/packages/patches/freecad-vtk-9.3.patch \ + %D%/packages/patches/freedict-tools-fix-determinism.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-libtiff-compat.patch \ %D%/packages/patches/freeimage-libraw-0.21-compat.patch \ diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index e6f9f7f5a8..da86b4f797 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -483,7 +483,8 @@ (define-public freedict-tools (url "https://github.com/freedict/tools") (commit "3596640e6e0582cc5fb76a342e5d8e7413aa4b34"))) (sha256 - (base32 "1raayynvn1j8x0ck8pnbbljl6zxnsyzzil7y54xz03dpj7k9w7mk")))) + (base32 "1raayynvn1j8x0ck8pnbbljl6zxnsyzzil7y54xz03dpj7k9w7mk")) + (patches (search-patches "freedict-tools-fix-determinism.patch")))) (inputs (list espeak-ng python perl diff --git a/gnu/packages/patches/freedict-tools-fix-determinism.patch b/gnu/packages/patches/freedict-tools-fix-determinism.patch new file mode 100644 index 0000000000..ad100bbba9 --- /dev/null +++ b/gnu/packages/patches/freedict-tools-fix-determinism.patch @@ -0,0 +1,22 @@ +The compression utility dictzip writes the compressed file's mtime in a header +of the compressed file. No command-line switch is documented to control or +suppress this behavior. This makes the build of packages relying on +freedict-tools such as freedict-dictionaries non-deterministic. + +This patch sets the mtime of the .dict file to be compressed by dictzip to the +start of the epoch on the Greenwich meridian, restoring build determinism. + +diff --git a/mk/dicts.mk b/mk/dicts.mk +index 08e8923..e671cf3 100644 +--- a/mk/dicts.mk ++++ b/mk/dicts.mk +@@ -265,7 +265,8 @@ $(BUILD_DICTD)/%.dict $(BUILD_DICTD)/%.index: $(BUILD_DICTD)/%.c5 query-dictd + dictfmt --without-time -t --headword-separator %%% $(DICTFMTFLAGS) $* < $(notdir $<) + + $(BUILD_DICTD)/%.dict.dz: $(BUILD_DICTD)/%.dict +- dictzip -k $< ++ touch -m -d "$$(date -u -R -d @0)" $< && \ ++ dictzip -k $< + + # prevent make from removing our precious file + .PRECIOUS: $(BUILD_DICTD)/$(dictname).dict