From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 02 17:39:13 2023 Received: (at submit) by debbugs.gnu.org; 2 Sep 2023 21:39:13 +0000 Received: from localhost ([127.0.0.1]:38796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcYKm-000375-VI for submit@debbugs.gnu.org; Sat, 02 Sep 2023 17:39:13 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcYKi-00036m-4G for submit@debbugs.gnu.org; Sat, 02 Sep 2023 17:39:11 -0400 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 1qcYKS-0006wP-Dk for guix-patches@gnu.org; Sat, 02 Sep 2023 17:38:52 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qcYKP-0000Y9-PW for guix-patches@gnu.org; Sat, 02 Sep 2023 17:38:52 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 6933B20D34 for ; Sat, 2 Sep 2023 23:38:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id AD64980098; Sat, 2 Sep 2023 23:38:39 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id acz0704rmtyZ; Sat, 2 Sep 2023 23:38:39 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id F2B4A80092; Sat, 2 Sep 2023 23:38:38 +0200 (CEST) From: Bruno Victal To: guix-patches@gnu.org Subject: [PATCH] gnu: enblend-enfuse: Build documentation. Date: Sat, 2 Sep 2023 22:38:36 +0100 Message-Id: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.105.233; envelope-from=mirai@makinata.eu; helo=smtpm2.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Notes: * transfig is not needed according to the NEWS since 4.2. * help2man is not optional. * gnu/packages/photo.scm (enblend-enfuse)[native-inputs]: Remove libxml2, tidy-html and transfig. Replace imagemagick with imagemagick/stable. Add graphviz-minimal, font-ghostscript, librsvg, m4, perl-readonly, texlive-texloganalyser, texlive-bold-extra, texlive-cm-mf-extra-bold, texlive-comment, texlive-float, texlive-enumitem, texlive-mdwtools, texlive-hyphenat, texlive-index, texlive-listings, texlive-microtype, texlive-etoolbox, texlive-nag, texlive-ragged2e, texlive-shorttoc, texlive-bigfoot, texlive-xstring and hevea. [arguments]<#:phases>: Restyle. Add 'fontconfig-cache, exclude-doc-from-check and 'install-doc. Replace 'build and 'install. --- Notes regarding the phases: * Saves approx ⅓ of the total build time by not rebuilding the docs over and over again. gnu/packages/photo.scm | 100 ++++++++++++++++++++++++++++++++++------- 1 file changed, 84 insertions(+), 16 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index b290e2b29a..323be6f28a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020. 2021, 2022 Vinicius Monego ;;; Copyright © 2022, 2023 John Kehayias ;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ (define-module (gnu packages photo) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages graphics) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -70,8 +72,10 @@ (define-module (gnu packages photo) #:use-module (gnu packages libusb) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages ocaml) #:use-module (gnu packages opencl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -376,14 +380,34 @@ (define-public enblend-enfuse (list pkg-config perl perl-timedate + help2man ;; For building the documentation. gnuplot - help2man - imagemagick - libxml2 - (texlive-updmap.cfg) - tidy-html - transfig)) + graphviz-minimal ; for 'dot' + font-ghostscript + imagemagick/stable + librsvg + m4 + perl-readonly + texlive-texloganalyser + (texlive-updmap.cfg + (list texlive-bold-extra + texlive-cm-mf-extra-bold + texlive-comment + texlive-float + texlive-enumitem + texlive-mdwtools + texlive-hyphenat + texlive-index + texlive-listings + texlive-microtype + texlive-etoolbox ;used but not propagated by microtype + texlive-nag + texlive-ragged2e + texlive-shorttoc + texlive-bigfoot + texlive-xstring)) + hevea)) (inputs (list boost gsl @@ -395,16 +419,60 @@ (define-public enblend-enfuse vigra zlib)) (arguments - (list #:configure-flags - #~(list "--enable-openmp") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'add-missing-include - (lambda _ - (substitute* "src/minimizer.h" - ;; Fix error: ‘numeric_limits’ is not a member of ‘std’. - (("#include " line) - (string-append line "\n#include ")))))))) + (list + #:configure-flags + #~(list "--enable-openmp") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-missing-include + (lambda _ + (substitute* "src/minimizer.h" + ;; Fix error: ‘numeric_limits’ is not a member of ‘std’. + (("#include " line) + (string-append line "\n#include "))))) + (add-before 'build 'fontconfig-cache + (lambda _ + (setenv "XDG_CACHE_HOME" (mkdtemp "/tmp/cache-XXXXXX")))) + ;; XXX: There's some extreme sillyness when building the + ;; documentation. It gets rebuilt thrice, during build, check and + ;; install, possibly due to the effects of the invocation of + ;; UPDATED_ON in doc/Makefile. + ;; I suspect the package might also have reproducibility issues + ;; with the manual and src/DefaultSig.pm. (not an exhaustive list) + ;; It's worth asking upstream for help with adding support + ;; for SOURCE_DATE_EPOCH. + (add-after 'configure 'exclude-doc-from-check + (lambda _ + (substitute* "doc/Makefile" + (("^(check:).+$" _ rule) + (string-append rule "\n"))))) + ;; XXX: Skip building the docs since they're rebuilt again + ;; during install. + (replace 'build + (lambda args + (with-directory-excursion "src" + (apply (assoc-ref %standard-phases 'build) args)))) + ;; XXX: Save another doc rebuild when installing. + (replace 'install + ;; Intercept and insert a make-flag for this phase only. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install" + (cons "MAYBE_DOC=" make-flags)))) + ;; XXX: 'make install' doesn't install the docs. + (add-after 'install 'install-doc + (lambda* (#:key make-flags #:allow-other-keys) + ;; Install examples first, for which the 'install' rule works. + (with-directory-excursion "doc/examples" + (apply invoke "make" "install" make-flags)) + ;; The docs have to be installed with specific rules. + (with-directory-excursion "doc" + (apply invoke "make" + "install-ps-local" + "install-html-local" + "install-dvi-local" + ;; Do not overwhelm the console by printing the source + ;; to stdout. + (cons "V=0" make-flags)))))))) (home-page "https://enblend.sourceforge.net/") (synopsis "Tools for combining and blending images") (description base-commit: 5ff0c8997a2ddf71af477883584a5f9ccd9b757f -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 05 09:14:40 2023 Received: (at 65706) by debbugs.gnu.org; 5 Sep 2023 13:14:40 +0000 Received: from localhost ([127.0.0.1]:55055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdVt9-00030t-PA for submit@debbugs.gnu.org; Tue, 05 Sep 2023 09:14:40 -0400 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]:48369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdVt5-00030Z-5h for 65706@debbugs.gnu.org; Tue, 05 Sep 2023 09:14:39 -0400 Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-4122129390eso14473901cf.0 for <65706@debbugs.gnu.org>; Tue, 05 Sep 2023 06:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693919667; x=1694524467; darn=debbugs.gnu.org; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=0Hqq+qOY1JwOA58Q4C26sBEEFqJtV6YcW+odWCmth54=; b=Anqou7J8c7hxHeZDTgphimi6X/N2iezc84IJOxwbhyuYbrbLxq6Do+lSdUwCp8lL9v 0xqOA6Muljm1b3rhQw4gDH+1ItQocgzAJgQJTmZband0newCMC8jvXYTMTZFEkFhjZW6 b/miTQ03zW0J9qUIrpZBAOu13DgXOz0Nwhf1+qAhGIpGJZGzjh0PbDqp9QfnseldfZ0m r7WPUldMfY02/Vy8jvl6woOK5IlSHf2U672Ceiyvid460tmvF33XKCzAR1Qu7iSZR5+0 86bV8HHTh/8MGbZ3gdXTWLO41aKbDBQhl3NpLw+QR2plCK6e9FN/wejpgEXNHVAeZamZ JRqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693919667; x=1694524467; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0Hqq+qOY1JwOA58Q4C26sBEEFqJtV6YcW+odWCmth54=; b=eMilcLqdshugtVVl4x5BMEg9uIVhON1RNAiW5xB584e38rE6Lysvw26EOEZI+P3iuH orw8fh+tZBCoCKWXfJXAiQF5e70fYEL3zwvbO3MkBpmtO16XBQ3nSA3OfMGhl9LFJAID rC8yH9Us/MGSt2ZIjuSMpNvP7wWG9ELpTwwrCn2xKJYMDnsJAhUr6Q+glKkE8ATMrTc4 dRHeySyDJbd91PdCV5dzvterc+oObO1tWtMpN9l9lWM9g9qUZwMyLQKDkR00DfTkGx1B GZvy5OwaRXz/bgULMOtgsMYOm75TTNF1LmJ27wsP9Qc66dYPIy9Oe/YxRGvLDZYoEcVb wnbw== X-Gm-Message-State: AOJu0Yzi5kcQnspqtXM1G9oJ5Eu+FeQcDPfqsko5vHXdvIxwbjLZdxRl nd03r+z4tVrnt976xeVDHgbuCMkKjVwz4Q== X-Google-Smtp-Source: AGHT+IHJumFVjs3dzpa6F9BsTD1ySoBsRAnmjtq7kFXTL9/BpD5MtFxVnppOxTl2YlS6VnD4SrPkmg== X-Received: by 2002:a05:622a:10f:b0:406:94af:c912 with SMTP id u15-20020a05622a010f00b0040694afc912mr15280599qtw.54.1693919667499; Tue, 05 Sep 2023 06:14:27 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id x5-20020ac87ec5000000b00413152fb99esm4317710qtj.49.2023.09.05.06.14.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 06:14:26 -0700 (PDT) From: Maxim Cournoyer To: Bruno Victal Subject: Re: bug#65706: [PATCH] gnu: enblend-enfuse: Build documentation. In-Reply-To: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> (Bruno Victal's message of "Sat, 2 Sep 2023 22:38:36 +0100") References: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Date: Tue, 05 Sep 2023 09:14:25 -0400 Message-ID: <875y4on4ni.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65706 Cc: 65706@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Bruno, Bruno Victal writes: > Notes: > * transfig is not needed according to the NEWS since 4.2. > * help2man is not optional. > > * gnu/packages/photo.scm (enblend-enfuse)[native-inputs]: Remove libxml2, > tidy-html and transfig. Replace imagemagick with imagemagick/stable. Add > graphviz-minimal, font-ghostscript, librsvg, m4, perl-readonly, > texlive-texloganalyser, texlive-bold-extra, texlive-cm-mf-extra-bold, > texlive-comment, texlive-float, texlive-enumitem, texlive-mdwtools, > texlive-hyphenat, texlive-index, texlive-listings, texlive-microtype, > texlive-etoolbox, texlive-nag, texlive-ragged2e, texlive-shorttoc, > texlive-bigfoot, texlive-xstring and hevea. > [arguments]<#:phases>: Restyle. Add 'fontconfig-cache, exclude-doc-from-check > and 'install-doc. Replace 'build and 'install. > --- Should the doc be installed under a 'doc' output (at least if there's more than man pages or info manuals) ? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 05 10:59:53 2023 Received: (at 65706) by debbugs.gnu.org; 5 Sep 2023 14:59:53 +0000 Received: from localhost ([127.0.0.1]:57686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXWy-0003Kq-HT for submit@debbugs.gnu.org; Tue, 05 Sep 2023 10:59:53 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:34306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXWw-0003Ke-7l for 65706@debbugs.gnu.org; Tue, 05 Sep 2023 10:59:51 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id E3EF120FA1; Tue, 5 Sep 2023 16:59:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 51D2680060; Tue, 5 Sep 2023 16:59:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id fFEGeVdNTaUE; Tue, 5 Sep 2023 16:59:43 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6EFC7800AA; Tue, 5 Sep 2023 16:59:43 +0200 (CEST) From: Bruno Victal To: 65706@debbugs.gnu.org Subject: [PATCH v2] gnu: enblend-enfuse: Build documentation. Date: Tue, 5 Sep 2023 15:59:38 +0100 Message-Id: <1222de9925d3a85970baf278d17f393b5b14b48b.1693925945.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> References: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65706 Cc: Bruno Victal , maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Notes: * transfig is not needed according to the NEWS since 4.2. * help2man is not optional. * gnu/packages/photo.scm (enblend-enfuse)[native-inputs]: Remove libxml2, tidy-html and transfig. Replace imagemagick with imagemagick/stable. Add graphviz-minimal, font-ghostscript, librsvg, m4, perl-readonly, texlive-texloganalyser, texlive-bold-extra, texlive-cm-mf-extra-bold, texlive-comment, texlive-float, texlive-enumitem, texlive-mdwtools, texlive-hyphenat, texlive-index, texlive-listings, texlive-microtype, texlive-etoolbox, texlive-nag, texlive-ragged2e, texlive-shorttoc, texlive-bigfoot, texlive-xstring and hevea. [arguments]<#:phases>: Restyle. Add 'fontconfig-cache, 'exclude-doc-from-check and 'install-doc. Replace 'build and 'install. [outputs]: Add 'doc. --- gnu/packages/photo.scm | 101 ++++++++++++++++++++++++++++++++++------- 1 file changed, 85 insertions(+), 16 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index b290e2b29a..5157a24fb9 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020. 2021, 2022 Vinicius Monego ;;; Copyright © 2022, 2023 John Kehayias ;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ (define-module (gnu packages photo) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages graphics) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -70,8 +72,10 @@ (define-module (gnu packages photo) #:use-module (gnu packages libusb) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages ocaml) #:use-module (gnu packages opencl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -376,14 +380,34 @@ (define-public enblend-enfuse (list pkg-config perl perl-timedate + help2man ;; For building the documentation. gnuplot - help2man - imagemagick - libxml2 - (texlive-updmap.cfg) - tidy-html - transfig)) + graphviz-minimal ; for 'dot' + font-ghostscript + imagemagick/stable + librsvg + m4 + perl-readonly + texlive-texloganalyser + (texlive-updmap.cfg + (list texlive-bold-extra + texlive-cm-mf-extra-bold + texlive-comment + texlive-float + texlive-enumitem + texlive-mdwtools + texlive-hyphenat + texlive-index + texlive-listings + texlive-microtype + texlive-etoolbox ;used but not propagated by microtype + texlive-nag + texlive-ragged2e + texlive-shorttoc + texlive-bigfoot + texlive-xstring)) + hevea)) (inputs (list boost gsl @@ -395,16 +419,61 @@ (define-public enblend-enfuse vigra zlib)) (arguments - (list #:configure-flags - #~(list "--enable-openmp") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'add-missing-include - (lambda _ - (substitute* "src/minimizer.h" - ;; Fix error: ‘numeric_limits’ is not a member of ‘std’. - (("#include " line) - (string-append line "\n#include ")))))))) + (list + #:configure-flags + #~(list "--enable-openmp") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-missing-include + (lambda _ + (substitute* "src/minimizer.h" + ;; Fix error: ‘numeric_limits’ is not a member of ‘std’. + (("#include " line) + (string-append line "\n#include "))))) + (add-before 'build 'fontconfig-cache + (lambda _ + (setenv "XDG_CACHE_HOME" (mkdtemp "/tmp/cache-XXXXXX")))) + ;; XXX: There's some extreme sillyness when building the + ;; documentation. It gets rebuilt thrice, during build, check and + ;; install, possibly due to the effects of the invocation of + ;; UPDATED_ON in doc/Makefile. + ;; I suspect the package might also have reproducibility issues + ;; with the manual and src/DefaultSig.pm. (not an exhaustive list) + ;; It's worth asking upstream for help with adding support + ;; for SOURCE_DATE_EPOCH. + (add-after 'configure 'exclude-doc-from-check + (lambda _ + (substitute* "doc/Makefile" + (("^(check:).+$" _ rule) + (string-append rule "\n"))))) + ;; XXX: Skip building the docs since they're rebuilt again + ;; during install. + (replace 'build + (lambda args + (with-directory-excursion "src" + (apply (assoc-ref %standard-phases 'build) args)))) + ;; XXX: Save another doc rebuild when installing. + (replace 'install + ;; Intercept and insert a make-flag for this phase only. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install" + (cons "MAYBE_DOC=" make-flags)))) + ;; XXX: 'make install' doesn't install the docs. + (add-after 'install 'install-doc + (lambda* (#:key make-flags #:allow-other-keys) + ;; Install examples first, for which the 'install' rule works. + (with-directory-excursion "doc/examples" + (apply invoke "make" "install" make-flags)) + ;; The docs have to be installed with specific rules. + (with-directory-excursion "doc" + (apply invoke "make" + "install-ps-local" + "install-html-local" + "install-dvi-local" + ;; Do not overwhelm the console by printing the source + ;; to stdout. + (cons "V=0" make-flags)))))))) + (outputs '("out" "doc")) (home-page "https://enblend.sourceforge.net/") (synopsis "Tools for combining and blending images") (description base-commit: 5ff0c8997a2ddf71af477883584a5f9ccd9b757f -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 06 17:02:06 2023 Received: (at 65706) by debbugs.gnu.org; 6 Sep 2023 21:02:06 +0000 Received: from localhost ([127.0.0.1]:38006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdzf3-0004oD-U3 for submit@debbugs.gnu.org; Wed, 06 Sep 2023 17:02:06 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:46255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdzey-0004nd-0Y for 65706@debbugs.gnu.org; Wed, 06 Sep 2023 17:02:03 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-76ef8b91a72so18353385a.0 for <65706@debbugs.gnu.org>; Wed, 06 Sep 2023 14:01:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694034112; x=1694638912; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=AR3kCjxp3ounlzFx8sYgLZAglNdYomSSfskRNJsTnkM=; b=erYmHnjTVNCmfx7aUXub5pxnigA0gi2v9j8ijiINMSRzUkc4XXXlOe/OS0T+Fxlcw1 V7dSHq6PAGDBxvQTKKIIviKxU5gqft0jVJPX2UM9jqp2ygb3l8VdIqCpTeaDvtM5y92d nZ/2fXLJBegoyoDA2+qscoXcRuujpQFAFqyGTRUvmINWNkhpDrJkcIICprm6uCGKdx8d rF1sd59fPkV+qob0uCBCeFsxWmg6hqd4oXfvlcQ3/d8xionqwChlY+EthtZut2jlLmOs D/CBuXbsDYA+oaSlJEb/vajQI6z++3eKlmfd1zlY+eRzzvKcLFCUpT0ABNW09/awA8/j B7NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694034112; x=1694638912; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=AR3kCjxp3ounlzFx8sYgLZAglNdYomSSfskRNJsTnkM=; b=LZen5BD2xZWcQTjaN2IaiTP83F8DvKJS5iDEFBUijBiBQ9dEYQviX8wrs0NV6k75jI P7NoCqbUQdaddICWJx90icnet3ke7/AD2NFu4N2f39TZOWKJM8CkoxoWt+snf2rO+GxG H3yyNf4+7CujPJdtZku0UbQ3c/74w/2t9KD/KRAC0O5Z/6aXFX0FOUb7h4fQDPniXI58 oHQCkd97fSTqClBSQpcU9dQIQQl8cK46A0I+fLWiwjey5H0gcHv4xnRu51AwIzVj6NIN 7jETGR7sBN4DyfWy/n63jmXM3q5VvdpoOsOc1VPUn2zBvIWpiYaB320S5jikUf7VnxZW 8D2A== X-Gm-Message-State: AOJu0Yw51Cq4TooRCXwpogEpVwz0P6OrYLTQ3S1udwOfitNuZnmX3fB/ 7LrIn9ocWqTdUFf9tUyaHr9FtAtrbw+7cA== X-Google-Smtp-Source: AGHT+IE/fuq7VGmmgXtlI4DLn6CxaLn8SBRBQguJ/VguBbbF2aL3yr00kJ2DDRMUS6bYgUeMkcL4ug== X-Received: by 2002:a05:620a:c50:b0:76c:d007:b544 with SMTP id u16-20020a05620a0c5000b0076cd007b544mr20075356qki.26.1694034112379; Wed, 06 Sep 2023 14:01:52 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id v23-20020ae9e317000000b00767c961eb47sm5243044qkf.43.2023.09.06.14.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 14:01:52 -0700 (PDT) From: Maxim Cournoyer To: Bruno Victal Subject: Re: [PATCH v2] gnu: enblend-enfuse: Build documentation. References: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> <1222de9925d3a85970baf278d17f393b5b14b48b.1693925945.git.mirai@makinata.eu> Date: Wed, 06 Sep 2023 17:01:51 -0400 In-Reply-To: <1222de9925d3a85970baf278d17f393b5b14b48b.1693925945.git.mirai@makinata.eu> (Bruno Victal's message of "Tue, 5 Sep 2023 15:59:38 +0100") Message-ID: <87tts7ow1s.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65706 Cc: 65706@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Bruno Victal writes: > Notes: > * transfig is not needed according to the NEWS since 4.2. > * help2man is not optional. > > * gnu/packages/photo.scm (enblend-enfuse)[native-inputs]: Remove libxml2, > tidy-html and transfig. Replace imagemagick with imagemagick/stable. Add > graphviz-minimal, font-ghostscript, librsvg, m4, perl-readonly, > texlive-texloganalyser, texlive-bold-extra, texlive-cm-mf-extra-bold, > texlive-comment, texlive-float, texlive-enumitem, texlive-mdwtools, > texlive-hyphenat, texlive-index, texlive-listings, texlive-microtype, > texlive-etoolbox, texlive-nag, texlive-ragged2e, texlive-shorttoc, > texlive-bigfoot, texlive-xstring and hevea. > [arguments]<#:phases>: Restyle. Add 'fontconfig-cache, 'exclude-doc-from-= check > and 'install-doc. Replace 'build and 'install. > [outputs]: Add 'doc. [...] > (inputs > (list boost > gsl > @@ -395,16 +419,61 @@ (define-public enblend-enfuse > vigra > zlib)) > (arguments > - (list #:configure-flags > - #~(list "--enable-openmp") > - #:phases > - #~(modify-phases %standard-phases > - (add-after 'unpack 'add-missing-include > - (lambda _ > - (substitute* "src/minimizer.h" > - ;; Fix error: =E2=80=98numeric_limits=E2=80=99 is n= ot a member of =E2=80=98std=E2=80=99. > - (("#include " line) > - (string-append line "\n#include ")))))))) > + (list > + #:configure-flags > + #~(list "--enable-openmp") > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'add-missing-include > + (lambda _ > + (substitute* "src/minimizer.h" > + ;; Fix error: =E2=80=98numeric_limits=E2=80=99 is not a = member of =E2=80=98std=E2=80=99. > + (("#include " line) > + (string-append line "\n#include "))))) > + (add-before 'build 'fontconfig-cache > + (lambda _ > + (setenv "XDG_CACHE_HOME" (mkdtemp "/tmp/cache-XXXXXX")))) > + ;; XXX: There's some extreme sillyness when building the > + ;; documentation. It gets rebuilt thrice, during build, check = and > + ;; install, possibly due to the effects of the invocation of > + ;; UPDATED_ON in doc/Makefile. > + ;; I suspect the package might also have reproducibility issues > + ;; with the manual and src/DefaultSig.pm. (not an exhaustive l= ist) > + ;; It's worth asking upstream for help with adding support > + ;; for SOURCE_DATE_EPOCH. Stylistic nitpick: we don't voice the comments using the first person (e.g. 'I') in the code typically; we try to stick to being descriptive and factual. If it's worth asking upstream, we should ask them now, and link to the upstream issue in the comment to track its resolution :-). > + (add-after 'configure 'exclude-doc-from-check > + (lambda _ > + (substitute* "doc/Makefile" > + (("^(check:).+$" _ rule) > + (string-append rule "\n"))))) > + ;; XXX: Skip building the docs since they're rebuilt again > + ;; during install. > + (replace 'build > + (lambda args > + (with-directory-excursion "src" > + (apply (assoc-ref %standard-phases 'build) args)))) > + ;; XXX: Save another doc rebuild when installing. > + (replace 'install > + ;; Intercept and insert a make-flag for this phase only. > + (lambda* (#:key make-flags #:allow-other-keys) > + (apply invoke "make" "install" > + (cons "MAYBE_DOC=3D" make-flags)))) > + ;; XXX: 'make install' doesn't install the docs. > + (add-after 'install 'install-doc > + (lambda* (#:key make-flags #:allow-other-keys) > + ;; Install examples first, for which the 'install' rule wo= rks. > + (with-directory-excursion "doc/examples" > + (apply invoke "make" "install" make-flags)) > + ;; The docs have to be installed with specific rules. > + (with-directory-excursion "doc" > + (apply invoke "make" > + "install-ps-local" > + "install-html-local" > + "install-dvi-local" > + ;; Do not overwhelm the console by printing the s= ource > + ;; to stdout. > + (cons "V=3D0" make-flags)))))))) > + (outputs '("out" "doc")) nitpick: it's more conventional to have the 'outputs' field before the 'build-system' one. Otherwise, I built it locally and it LGTM. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 16 12:49:50 2023 Received: (at 65706) by debbugs.gnu.org; 16 Sep 2023 16:49:50 +0000 Received: from localhost ([127.0.0.1]:48415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhYUP-0003m6-Uv for submit@debbugs.gnu.org; Sat, 16 Sep 2023 12:49:50 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:38024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhYUK-0003ln-HJ for 65706@debbugs.gnu.org; Sat, 16 Sep 2023 12:49:48 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 0483A20D15; Sat, 16 Sep 2023 18:49:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 5CBBC8009D; Sat, 16 Sep 2023 18:49:34 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id rvsqxyD-uhLT; Sat, 16 Sep 2023 18:49:33 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 8044F8009B; Sat, 16 Sep 2023 18:49:33 +0200 (CEST) From: Bruno Victal To: 65706@debbugs.gnu.org Subject: [PATCH v3 2/2] gnu: enblend-enfuse: Build documentation. Date: Sat, 16 Sep 2023 17:49:28 +0100 Message-ID: <889b910e360872c0a9df5deccf5995a0eb31353b.1694882968.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> References: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65706 Cc: Bruno Victal , maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Notes: * transfig is not needed according to the NEWS since 4.2. * help2man is not optional. * gnu/packages/photo.scm (enblend-enfuse)[native-inputs]: Remove libxml2, tidy-html and transfig. Replace imagemagick with imagemagick/stable. Add graphviz-minimal, font-ghostscript, librsvg, m4, perl-readonly, texlive-texloganalyser, texlive-bold-extra, texlive-cm-mf-extra-bold, texlive-comment, texlive-float, texlive-enumitem, texlive-mdwtools, texlive-hyphenat, texlive-index, texlive-listings, texlive-microtype, texlive-etoolbox, texlive-nag, texlive-ragged2e, texlive-shorttoc, texlive-bigfoot, texlive-xstring and hevea. [arguments]<#:phases>: Add 'fontconfig-cache, 'exclude-doc-from-check and 'install-doc. Replace 'build and 'install. [outputs]: Add 'doc. --- gnu/packages/photo.scm | 82 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 8 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 39f4ce10d6..78ae61c799 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020. 2021, 2022 Vinicius Monego ;;; Copyright © 2022, 2023 John Kehayias ;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ (define-module (gnu packages photo) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages graphics) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -70,8 +72,10 @@ (define-module (gnu packages photo) #:use-module (gnu packages libusb) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages ocaml) #:use-module (gnu packages opencl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -89,7 +93,6 @@ (define-module (gnu packages photo) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) - #:use-module (gnu packages xfig) #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module ((srfi srfi-1) #:hide (zip)) @@ -387,14 +390,34 @@ (define-public enblend-enfuse (list pkg-config perl perl-timedate + help2man ;; For building the documentation. gnuplot - help2man - imagemagick - libxml2 - (texlive-updmap.cfg) - tidy-html - transfig)) + graphviz-minimal ; for 'dot' + font-ghostscript + imagemagick/stable + librsvg + m4 + perl-readonly + texlive-texloganalyser + (texlive-updmap.cfg + (list texlive-bold-extra + texlive-cm-mf-extra-bold + texlive-comment + texlive-float + texlive-enumitem + texlive-mdwtools + texlive-hyphenat + texlive-index + texlive-listings + texlive-microtype + texlive-etoolbox ;used but not propagated by microtype + texlive-nag + texlive-ragged2e + texlive-shorttoc + texlive-bigfoot + texlive-xstring)) + hevea)) (inputs (list boost gsl @@ -407,7 +430,50 @@ (define-public enblend-enfuse zlib)) (arguments (list - #:configure-flags #~(list "--enable-openmp"))) + #:configure-flags #~(list "--enable-openmp") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'fontconfig-cache + (lambda _ + (setenv "XDG_CACHE_HOME" (mkdtemp "/tmp/cache-XXXXXX")))) + ;; XXX: There's some extreme sillyness when building the + ;; documentation. It gets rebuilt thrice, during build, check and + ;; install, possibly due to the effects of the invocation of + ;; UPDATED_ON in doc/Makefile. + ;; Reported: + (add-after 'configure 'exclude-doc-from-check + (lambda _ + (substitute* "doc/Makefile" + (("^(check:).+$" _ rule) + (string-append rule "\n"))))) + ;; XXX: Skip building the docs since they're rebuilt again + ;; during install. + (replace 'build + (lambda args + (with-directory-excursion "src" + (apply (assoc-ref %standard-phases 'build) args)))) + ;; XXX: Save another doc rebuild when installing. + (replace 'install + ;; Intercept and insert a make-flag for this phase only. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install" + (cons "MAYBE_DOC=" make-flags)))) + ;; XXX: 'make install' doesn't install the docs. + (add-after 'install 'install-doc + (lambda* (#:key make-flags #:allow-other-keys) + ;; Install examples first, for which the 'install' rule works. + (with-directory-excursion "doc/examples" + (apply invoke "make" "install" make-flags)) + ;; The docs have to be installed with specific rules. + (with-directory-excursion "doc" + (apply invoke "make" + "install-ps-local" + "install-html-local" + "install-dvi-local" + ;; Do not overwhelm the console by printing the source + ;; to stdout. + (cons "V=0" make-flags)))))))) + (outputs '("out" "doc")) (home-page "https://enblend.sourceforge.net/") (synopsis "Tools for combining and blending images") (description -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 16 12:49:51 2023 Received: (at 65706) by debbugs.gnu.org; 16 Sep 2023 16:49:51 +0000 Received: from localhost ([127.0.0.1]:48417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhYUQ-0003m8-J8 for submit@debbugs.gnu.org; Sat, 16 Sep 2023 12:49:51 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:55258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhYUK-0003lo-HI for 65706@debbugs.gnu.org; Sat, 16 Sep 2023 12:49:48 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 80AD120964; Sat, 16 Sep 2023 18:49:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id DC3128009D; Sat, 16 Sep 2023 18:49:32 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id IsDRU7tSYfFm; Sat, 16 Sep 2023 18:49:32 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 0AC328009B; Sat, 16 Sep 2023 18:49:31 +0200 (CEST) From: Bruno Victal To: 65706@debbugs.gnu.org Subject: [PATCH v3 1/2] gnu: enblend-enfuse: Backport upstream fixes. Date: Sat, 16 Sep 2023 17:49:27 +0100 Message-ID: <6663204b50992dfb75d0a6226ed7731b085d8901.1694882968.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> References: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65706 Cc: Bruno Victal , maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Backport changes for reproducible builds & missing include. * gnu/packages/patches/enblend-enfuse-reproducible.patch: New file. * gnu/local.mk: Register it. * gnu/packages/photo.scm (enblend-enfuse)[source]: Use newly added patch. Add snippet to fix missing header. [arguments]<#:phases>: Remove 'add-missing-include. --- gnu/local.mk | 1 + .../patches/enblend-enfuse-reproducible.patch | 44 +++++++++++++++++++ gnu/packages/photo.scm | 25 ++++++----- 3 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/enblend-enfuse-reproducible.patch diff --git a/gnu/local.mk b/gnu/local.mk index 672050723f..54217fbd5a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1113,6 +1113,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ %D%/packages/patches/emacs-xelb-ignore-length-element.patch \ + %D%/packages/patches/enblend-enfuse-reproducible.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ diff --git a/gnu/packages/patches/enblend-enfuse-reproducible.patch b/gnu/packages/patches/enblend-enfuse-reproducible.patch new file mode 100644 index 0000000000..8bd6a3aeda --- /dev/null +++ b/gnu/packages/patches/enblend-enfuse-reproducible.patch @@ -0,0 +1,44 @@ +# HG changeset patch +# User Bernhard M. Wiedemann +# Date 1502609999 -7200 +# Sun Aug 13 09:39:59 2017 +0200 +# Node ID a98e00eed893f62dd8349fc2894abca3aff4b33a +# Parent 41ce01b7d413b3654211da0147857e7d6a1495de +Facilitate reproducible builds +by allowing to externally hold constant the build date and time. +See + https://reproducible-builds.org/specs/source-date-epoch/ + +Backport asap. + +diff -r 41ce01b7d413 -r a98e00eed893 NEWS +--- a/NEWS Sun Aug 13 09:39:56 2017 +0200 ++++ b/NEWS Sun Aug 13 09:39:59 2017 +0200 +@@ -48,6 +48,12 @@ + https://github.com/akrzemi1/Optional + where only "optional.hpp" is needed. + ++- The environment variable SOURCE_DATE_EPOCH overrides the build ++ timestamp as recorded by the signatures. See ++ https://reproducible-builds.org/specs/source-date-epoch/ ++ for details. ++ ++ + + * Version 4.2 "Compressor Road" + +diff -r 41ce01b7d413 -r a98e00eed893 src/DefaultSig.pm +--- a/src/DefaultSig.pm Sun Aug 13 09:39:56 2017 +0200 ++++ b/src/DefaultSig.pm Sun Aug 13 09:39:59 2017 +0200 +@@ -109,9 +109,10 @@ + sub update_date_and_time { + my $self = shift; + ++ my $now = $ENV{SOURCE_DATE_EPOCH} || time; + my ($second, $minute, $hour, + $day_of_month, $month, $year, +- $day_of_week) = $self->is_using_gmt() ? gmtime : localtime; ++ $day_of_week) = $self->is_using_gmt() ? gmtime($now) : localtime($now); + + $self->{DATE} = $self->format_date($day_of_month, $month, $year + 1900, $day_of_week, + $self->weekdays->[$day_of_week], diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index b290e2b29a..39f4ce10d6 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -370,7 +370,18 @@ (define-public enblend-enfuse name "-" version ".tar.gz")) (sha256 (base32 - "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7")))) + "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7")) + (patches + ;; TODO: Remove when updating. + ;; Fixed upstream with a98e00eed893f62dd8349fc2894abca3aff4b33a. + (search-patches "enblend-enfuse-reproducible.patch")) + (modules '((guix build utils))) + (snippet + ;; TODO: Remove when updating. + ;; Fixed upstream with 81e25afe71146aaaf5058c604034f35d57e3be9d. + #~(substitute* "src/minimizer.cc" + (("^#include " all) + (string-append all "\n#include ")))))) (build-system gnu-build-system) (native-inputs (list pkg-config @@ -395,16 +406,8 @@ (define-public enblend-enfuse vigra zlib)) (arguments - (list #:configure-flags - #~(list "--enable-openmp") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'add-missing-include - (lambda _ - (substitute* "src/minimizer.h" - ;; Fix error: ‘numeric_limits’ is not a member of ‘std’. - (("#include " line) - (string-append line "\n#include ")))))))) + (list + #:configure-flags #~(list "--enable-openmp"))) (home-page "https://enblend.sourceforge.net/") (synopsis "Tools for combining and blending images") (description base-commit: 0dc83ce53b8bad8473c80689ba212d9f9bb712b3 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 17 16:27:53 2023 Received: (at 65706-done) by debbugs.gnu.org; 17 Sep 2023 20:27:53 +0000 Received: from localhost ([127.0.0.1]:51532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhyMz-0002yE-9f for submit@debbugs.gnu.org; Sun, 17 Sep 2023 16:27:53 -0400 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:51620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhyMv-0002xz-Ii for 65706-done@debbugs.gnu.org; Sun, 17 Sep 2023 16:27:52 -0400 Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-6563022e3d3so16403106d6.3 for <65706-done@debbugs.gnu.org>; Sun, 17 Sep 2023 13:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694982456; x=1695587256; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=mTFMfzqAWogCQcbrabFmEvyQosSxJMU75HdWfEHHLSI=; b=ZAjLZhhDnF7c7Qlw4UnuC4KmCn3YnBWdd/BZsEXEcaWAf4TSyKvQi29SaE7sNRyf0r aMNrkEtHdbQ61090HjCGp9tVgNC9dJOJMyHsnhBTdJDOWqK3Olpljdb+3OyLbCdgqVXw QfkVukrXqWYH7Awfzehqx44W80IC+bgibEmSM2hImJJq32DFZ6Grp35pIvbi0DMB7tBo tGUXvniJH8F+NHOtWMToHr23J/cptoPcMvLlicyq+ysLmc0ldQ6gMtnrVW/uSDqaEwW8 OOaT6nNTjFW1bPf2GM3fTkWVScfZ+Aaj+lNCBftlOergcTjk8gFSvbd0usTswlX5fFXd tvkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694982456; x=1695587256; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mTFMfzqAWogCQcbrabFmEvyQosSxJMU75HdWfEHHLSI=; b=f5Ou30TynRP6FYlYFf4roZD9OTCgdB+BFYDtJe2i/xPjK1m9xcjEDqX+UOrMjhg8xr ZFW0tykcklfvEcGSaStXQimVCoUwDMDcFH5y771FiS9LPdkfW7fo4rSTO/u07fyPBgp/ WYt1bp9lIhgBLuDh35qXDlSeURVeVs/algtG/HVci8xkcPIkxfqvw+mB5zmbTDas6kia uuJj83H9mlO7q4QItLp6/J7dudk0pd1dctAKcvBEUnTuFuaFu4yGQWzvAsDBVtnBdMz1 eV/wUG2Gg8eUjrSIpO9zhAvmI2R00cgR7VIR8t7BoXTBji/CItGfTj02QdW/tN71cc0x T25A== X-Gm-Message-State: AOJu0YwRLSNqe3JC+cgHJS5GXL6etBhRFh6Ls6siIpfigvTsGu+8JyaX ZyGvhYy5z5VZNPbzfuFfmGhp9aB+Feo= X-Google-Smtp-Source: AGHT+IEgzQ5hvp3RO3aiRdFete//FhFqhXv5dnJmUpuQ3rnl5gMMR/u77tcIFcwcTxiXZxn2GOwHug== X-Received: by 2002:a0c:ab48:0:b0:655:d260:42b8 with SMTP id i8-20020a0cab48000000b00655d26042b8mr6420986qvb.19.1694982455945; Sun, 17 Sep 2023 13:27:35 -0700 (PDT) Received: from hurd (dsl-10-149-131.b2b2c.ca. [72.10.149.131]) by smtp.gmail.com with ESMTPSA id y11-20020a0cf14b000000b0064c1b27bf2dsm379997qvl.140.2023.09.17.13.27.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 13:27:35 -0700 (PDT) From: Maxim Cournoyer To: Bruno Victal Subject: Re: [PATCH v3 2/2] gnu: enblend-enfuse: Build documentation. References: <66a797d5df3863da27f73a623ddede95b737f310.1693690639.git.mirai@makinata.eu> <889b910e360872c0a9df5deccf5995a0eb31353b.1694882968.git.mirai@makinata.eu> Date: Sun, 17 Sep 2023 16:27:34 -0400 In-Reply-To: <889b910e360872c0a9df5deccf5995a0eb31353b.1694882968.git.mirai@makinata.eu> (Bruno Victal's message of "Sat, 16 Sep 2023 17:49:28 +0100") Message-ID: <87ttrs7dft.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65706-done Cc: 65706-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Bruno Victal writes: > Notes: > * transfig is not needed according to the NEWS since 4.2. > * help2man is not optional. > > * gnu/packages/photo.scm (enblend-enfuse)[native-inputs]: Remove libxml2, > tidy-html and transfig. Replace imagemagick with imagemagick/stable. Add > graphviz-minimal, font-ghostscript, librsvg, m4, perl-readonly, > texlive-texloganalyser, texlive-bold-extra, texlive-cm-mf-extra-bold, > texlive-comment, texlive-float, texlive-enumitem, texlive-mdwtools, > texlive-hyphenat, texlive-index, texlive-listings, texlive-microtype, > texlive-etoolbox, texlive-nag, texlive-ragged2e, texlive-shorttoc, > texlive-bigfoot, texlive-xstring and hevea. > [arguments]<#:phases>: Add 'fontconfig-cache, 'exclude-doc-from-check > and 'install-doc. Replace 'build and 'install. > [outputs]: Add 'doc. Installed, thanks. -- Thanks, Maxim From unknown Mon Sep 08 10:54:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 16 Oct 2023 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator