From patchwork Thu Nov 21 00:49:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 70618 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 711A527BBEA; Thu, 21 Nov 2024 00:51:40 +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 D997D27BBE2 for ; Thu, 21 Nov 2024 00:51:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDvPX-0004M6-5M; Wed, 20 Nov 2024 19:51:07 -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 1tDvPS-0004Kh-SH for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:03 -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 1tDvPS-0006vY-HH for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51: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:From:Date:To:In-Reply-To:References:Subject; bh=TVf9YFmeKw5Pvx4HIhz6BIb+gnIPH/oYv2Et0YPowrc=; b=E1DRRfgc52+LqVcz2Bazf6mVtOMrIqfjn3ldRQc8n9hr9Agrl7tSxxJCLteSURmuOlTNCAbIcvczEhFsOc5h1znUiftrNvtbsooMwAfHTCiX2uYJtEmSkxofG4CXU1FQeqiGEfQujnB5W0H18CgiQqx4hANzFcBSdiEILv33wnwjQWMVpWvn2SY9tQkYytAsq92/ggsopF2ci8F/Rb1i0KRDRziYTEqNgUA0INQDnRYhSeHx30F7AlK8yc57O1XdeICRdmKGDUH5kCH3/Wm6eBRSLOgkwSAcvPN+bWDRxiPSs/Wmnm/mZbHAVyaFuSezBm609t4giJDhNgGxgzKgZw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDvPS-0001rS-Ay for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v2 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: Thu, 21 Nov 2024 00:51: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.17321502066748 (code B ref 74411); Thu, 21 Nov 2024 00:51:02 +0000 Received: (at 74411) by debbugs.gnu.org; 21 Nov 2024 00:50:06 +0000 Received: from localhost ([127.0.0.1]:48407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOW-0001kL-SW for submit@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:05 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:48443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOT-0001iu-Aq for 74411@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1732150193; x=1732409393; bh=TVf9YFmeKw5Pvx4HIhz6BIb+gnIPH/oYv2Et0YPowrc=; 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=Pnt+87zfwGlpbD7JtlRlHEwN4yZSmSKh1QwhsPm1W6LWbLHRH16dHB3FULq47BE9r yKk2UrYuCTROWqiRhQOhPb7dfkGY+4WVaoiQ6IHFC60+CUaMu9j8SZfcKeq9YNyIuk 4OI/+iIOwDEGXSzqAbnNoQBB+QMd70vjsO+0wHZ149XO+aTtkj7ZIF2trQc57INEUt /9AHAs/x1d6RGUfp/sBNIHXZLxJ2wp80xD+5XI+C6N6paAzJmf1aSYoa+AzZHDEuBx txTnPv7Od9II//zQP+bh/IzyPztP16Cwp8/N6rt0jXQelq+6Wn8CIvXcWzrmi3Y0wc u5mR/1/NPlq/A== Date: Thu, 21 Nov 2024 00:49:51 +0000 Message-ID: Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 3b0441a252f5d0027cf73299f3e06ca7e84fe14e 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 | 61 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 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..fed41def64 --- /dev/null +++ b/gnu/packages/dictd.scm @@ -0,0 +1,61 @@ +;;; 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-1.3.2 + (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 + #: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 Thu Nov 21 00:49:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 70616 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 CDCB327BBE2; Thu, 21 Nov 2024 00:51:34 +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 814B227BBE2 for ; Thu, 21 Nov 2024 00:51:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDvPX-0004MN-Cq; Wed, 20 Nov 2024 19:51:07 -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 1tDvPT-0004Ki-7q for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:03 -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 1tDvPS-0006vd-Vv for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51: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=LTdokqQHnw2rrZwqnCAyHAw2M8R6+lZPYfTESbBx6Mw=; b=tBAddCFgsH1bUUmlCN0NWb086A6bV/2HIMfX6f0/GLFOADgvf2I5kJM14rRlWgyqVJ9cqp5FD9UcBFch6sU/w6zr2pSP9Tru9yZPBUZE5GYL/so5PvM20kCsoLUroQAfmm03pk1ohp+s4XJiBy+j60vswPyQ1Np82CvluP7b9F1iMnwBkDysCW1LhVOskDaylIaZcaMNDM5OM8cndXbjgcP64FcdUNMh8rrBtIRSO7r4iSOnkRHAReymiuP1hNZ77pVBHIVoC9fL20qzz04QB06hGnY9bN7xjQzCd60bgS/3iQZfAS4rXGjKKbdqw/kXs4TyckYFrHR2JNp8uJlybw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDvPS-0001rZ-Qq for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v2 2/5] gnu: Add dictd-1.13.1. Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Nov 2024 00:51: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.17321502127042 (code B ref 74411); Thu, 21 Nov 2024 00:51:02 +0000 Received: (at 74411) by debbugs.gnu.org; 21 Nov 2024 00:50:12 +0000 Received: from localhost ([127.0.0.1]:48414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOd-0001pP-Tt for submit@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:12 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]:12893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOb-0001k3-RE for 74411@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1732150203; x=1732409403; bh=LTdokqQHnw2rrZwqnCAyHAw2M8R6+lZPYfTESbBx6Mw=; 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=LH0Bo3utCAQge9vGkOriGp6rLt9lBPmpFhIcFetIMVQjut++itz+NMTtaxY5Pu8G9 M9nB8eVwKRJIdaGFvrXLjEIkdaaBlNmrvGYl3VVD3gK9gScctKRWbSDFRhtq8wXYTv uFcTv2sivbUD9ZMDzaHhKV52ayXG1GOr42gW0Q1BDDCqsxT7GP9EJWUCQK+pPl11qp n+c5b9sLz5jGiRgsUEjQKImBoCiRumcLIoRQeoL0IKnOfHLTGVtbjIJ6ZLtHTfyFsf sC/v5bZd5xD8SebhG/itZROm7TtDrgmwReUjJ9uqMj26vOiWGgQCIdiLDXIkXHnhw3 +WOBXbGAkFuMQ== Date: Thu, 21 Nov 2024 00:49:59 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 119317227:user:proton X-Pm-Message-ID: affea22045fc1eb68935e53506988b6b938e2d44 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 fed41def64..732f2bb6cc 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-1.3.2 (package @@ -59,3 +62,37 @@ (define-public libmaa-1.3.2 the performance of memory-intensive applications.") (home-page "https://sourceforge.net/projects/dict/") (license gpl2+))) + +(define-public dictd-1.13.1 + (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-1.3.2 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 Thu Nov 21 00:50:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 70614 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 7A0F827BBEA; Thu, 21 Nov 2024 00:51:16 +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 2E26427BBE2 for ; Thu, 21 Nov 2024 00:51:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDvPU-0004LG-UM; Wed, 20 Nov 2024 19:51:04 -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 1tDvPT-0004Kk-Ow for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:03 -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 1tDvPT-0006vi-GO for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51: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=wKEn7CY3lfEDwh/9XpQT4BZR9A4XdZSE8/w0vx4cpk4=; b=oOqN/HT2LwdbwJfFhUkVbc1bDep4Pf+p7lhiiREErlxOkdYBTtORZ0kylvcFCeB2O3FAbgtLogF3goPoBGzW32vQc6SoH+CaXewlkbtO7ckD4mbbaPNcrJAFLJeroCGsCgioDaSTdEKaN7+dCAo7uiygjuLlCrc8lF/G5/pFtJT0DqClaEVqIDJ9lSvMPqgAvYPnANvxdKdqUnGUIyMmuN0ho7nE4/ALXLUvszWmIL1NS68AqrrCEbTGa62PXBX50+PCTsYPCd5DSrUD7HH+nr5Mu2E4tb2mZNkw01cM17fvlGy3UCP5/iahhfK4kmHr4QKMvoFslIW9a5oxr69knw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDvPT-0001rh-Bq for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v2 3/5] gnu: Add freedict-tools-0.6.0. Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Nov 2024 00:51: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.17321502167070 (code B ref 74411); Thu, 21 Nov 2024 00:51:03 +0000 Received: (at 74411) by debbugs.gnu.org; 21 Nov 2024 00:50:16 +0000 Received: from localhost ([127.0.0.1]:48419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOh-0001py-EE for submit@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:15 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:37397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOf-0001mI-Pw for 74411@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1732150207; x=1732409407; bh=wKEn7CY3lfEDwh/9XpQT4BZR9A4XdZSE8/w0vx4cpk4=; 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=JP4MGM5f57dkE5S0dKY7CBu8F2ixxXMzxtuelvJ9DhsB66Y5zjswIPK7U87HBTj+P 5QgfYG7mF1TtwvHciA9YslpL1l+Wh9GHznlAbl4/xCNRhvjn3iHC5cL68lzSLAr+D6 qQN1JoQqABAB90BYjwgaMJhjyUgPPQpK+snxkejP/I3hcVZKMuH5aDAZ+SfWT0kYGI 2I6TTnjClQVhes86F/rDZ5raYxz7Lz5wHNo4vrxzsYkABpZgt2AiDPP4ALug/Ypanw J88OKRx51PGatuzytGf3zyDqHGfb6GhXrTn6cdCdTjn+OKOt7jb7mrLx9WRFHs3sA7 A6ZZreuptYcaQ== Date: Thu, 21 Nov 2024 00:50:05 +0000 Message-ID: <97e68e5bd9933f46b34309dc6dccda8ce9cec646.1732150157.git.runciter@whispers-vpn.org> In-Reply-To: References: Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 86aaf9292c1d27c044a04a67c6f57c674d03d669 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 | 55 ++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 3f9b59c960..3470d8d945 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,52 @@ (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-0.6.0 + (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-1.13.1 + 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 "FreeDict tools to import, export (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 Thu Nov 21 00:50:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 70615 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 A9FCB27BBEA; Thu, 21 Nov 2024 00:51:30 +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 5C4DC27BBE2 for ; Thu, 21 Nov 2024 00:51:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDvPX-0004Mn-K5; Wed, 20 Nov 2024 19:51:07 -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 1tDvPU-0004L6-Ca for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:04 -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 1tDvPU-0006vq-4D for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:04 -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=cP7TwCi20WYvMl+V8vl72RNvfzaCyMORVKA1qOQ58NM=; b=gEEbfy4yMHbDLRmVO3wC971zd2Yhpxwn6XYghUV2fIpDRShSvzPDgCm2bIyCRgNUpSqEQYanp700M0b62DxM/XXET2Mdg3pMmADOCAXalpjwh6GTXVeMbBqWvHXBU5C+tcsJlcFPHSrSmmPC0Z6SBXlJCBCbCzXyDeowrsg5e5dnvLRvbLO0uJoYyKqBFbVWAzTVCGFOveBs0DsGhaRITWQBxi1EPz7K0uFsAoOzitlP9LEpElTpjPEKzhKJrcR5yiXMf4DHphoYmt2zmAj4/p4QmnB2PJhSk3SeVaYbMbPXDOzAp6mxR/cRJVPx7l7QUePcDIOZBIOmNAGptUT+tw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDvPT-0001ro-Ue for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v2 4/5] gnu: Add freedict-dictionaries. Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Nov 2024 00:51: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.17321502217090 (code B ref 74411); Thu, 21 Nov 2024 00:51:03 +0000 Received: (at 74411) by debbugs.gnu.org; 21 Nov 2024 00:50:21 +0000 Received: from localhost ([127.0.0.1]:48423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOm-0001qH-Vy for submit@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:21 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:14035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOk-0001po-P3 for 74411@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1732150212; x=1732409412; bh=cP7TwCi20WYvMl+V8vl72RNvfzaCyMORVKA1qOQ58NM=; 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=fUcvFwlQoGcjfA1Lg1EssRQtvWiIHYk3qaJOPH4lZ+Nwc7aUne5fYbCcUgpxRLnog vk1kUvRpGXhptHfSF6sqpYC4J864tpHAT5EVSoE0Bq1vxDN/e4xkNer80fC9ekFcqj OrQR/lSqRqEY7FlmIy1bt2GgaE21Wj24vWeTT00L6BwJG7uab+zbDilg27PD93CHgK h9Ig1KyweaMCplUi8XpxPUUCzVaqAdULIWYYg4hAGWWerneJW1G0NRAuLsf5eEvUhZ Nn87LGm6Z+v6wLk75S5ULMUwe61ICXfUUqGmdyiElB6UYt3tLNny4SYGubtXq8TQss GeyQRqXSB/+7w== Date: Thu, 21 Nov 2024 00:50:10 +0000 Message-ID: <1dcd87131c679a4d7e80d9d4c9c44807fb00cf0a.1732150157.git.runciter@whispers-vpn.org> In-Reply-To: References: Feedback-ID: 119317227:user:proton X-Pm-Message-ID: c0bee939c1a6952a9d4f098d90834a3296d58c37 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 | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 3470d8d945..3e5d991890 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. ;;; @@ -519,3 +520,50 @@ (define-public freedict-tools-0.6.0 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 + python + perl + gzip + tar + libxslt + dictd-1.13.1 + perl-libxml + freedict-tools-0.6.0)) + (arguments + (list + #: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-0.6.0 + "/share/freedict"))))))))) + (build-system gnu-build-system) + (synopsis "Freedict multilingual dictionaries compiled to the dictd +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 Thu Nov 21 00:50:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Runciter X-Patchwork-Id: 70617 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 4A0F027BBE2; Thu, 21 Nov 2024 00:51:35 +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 C3DD227BBEA for ; Thu, 21 Nov 2024 00:51:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDvPX-0004MJ-A2; Wed, 20 Nov 2024 19:51:07 -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 1tDvPU-0004LT-W0 for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:05 -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 1tDvPU-0006vw-M0 for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:04 -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=o1fuGecQbM04OSgkUDhyZjq6I6YPNE0bmaH+q9XNUVk=; b=UIh3Kcn4dXdLJcv/5Xt8xpE3xl88W39iRWPgXl1z4n1KfnikE2X8zIt7fBQpGcjmla4UcKheeE8a2LYC0JUtghJEYHzD3OGpig0i+tOy3RRFhhJNV8GzS44PtumTXX6auTwBAMhRfjY+oslOO1VEzaO4NAwCUy5s9GV0XWMitbJjyhboTj0K+IyhsSBAK8MhH2Y2rZCfmpLVK+9LHWwnzW32+zCR3h7KZ0NDBZoirMuY5Xk/X3lTxEk8paEYf6wFrUOLrYFQHEZ81Pbd7pdcSMB+NatIjL0uRX0+SDenkb+aR1WJswi9rAKOiv0l288xIt04OpYEbm5b4hq3XlwwMA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDvPU-0001rw-GX for guix-patches@gnu.org; Wed, 20 Nov 2024 19:51:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v2 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: Thu, 21 Nov 2024 00:51:04 +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.17321502307111 (code B ref 74411); Thu, 21 Nov 2024 00:51:04 +0000 Received: (at 74411) by debbugs.gnu.org; 21 Nov 2024 00:50:30 +0000 Received: from localhost ([127.0.0.1]:48427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOv-0001qd-HV for submit@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:29 -0500 Received: from mail-10627.protonmail.ch ([79.135.106.27]:23375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDvOt-0001qI-89 for 74411@debbugs.gnu.org; Wed, 20 Nov 2024 19:50:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1732150220; x=1732409420; bh=o1fuGecQbM04OSgkUDhyZjq6I6YPNE0bmaH+q9XNUVk=; 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=FwSVAnMVImy0GOLgiljQr+hVF7OlVEFVgu0enVNBadvwtW4iRGi6PFnx4i3fOSuCs BSRyGmdalfaXXDu0i6cgTAQH3ovynMfyYgZjDaFMxWLmV41vZYA8Zq78iDqf1zIdvA 8PoWapTKg3+2LfIPoo5LwU1ir6ReJ9tlIG8vDonc+Cqtz4mJxhAuAltvsQ3mTYajbA yX5sxxQ/mjQ1lgg8CjY6WYp7VRtjTyOH6Fz87Xmhi7kPxLM1MhewTA8hqgwN7SN1xr GQ75vmEJC2Zf4HGfgltVj3o6njQU+KPXiOUjauQ1JFxIs30xv5OhP0z7OVOf+y+194 lC94f0I1BdOqg== Date: Thu, 21 Nov 2024 00:50:17 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 06e5889d7cdcb3e3a95ea9adbd2cbd8d10c49031 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 3e5d991890..a6daf209e3 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -483,7 +483,8 @@ (define-public freedict-tools-0.6.0 (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