From patchwork Sat Sep 16 16:49:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53963 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 17CB527BBE9; Sat, 16 Sep 2023 17:50:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 2CAB027BBE2 for ; Sat, 16 Sep 2023 17:50:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhYUb-0003b0-Sf; Sat, 16 Sep 2023 12:50:02 -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 1qhYUY-0003aS-2H for guix-patches@gnu.org; Sat, 16 Sep 2023 12:49:58 -0400 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 1qhYUX-0003Ir-GL for guix-patches@gnu.org; Sat, 16 Sep 2023 12:49:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhYUe-0003mt-4U for guix-patches@gnu.org; Sat, 16 Sep 2023 12:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65706] [PATCH v3 1/2] gnu: enblend-enfuse: Backport upstream fixes. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 16:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65706 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65706@debbugs.gnu.org Cc: Bruno Victal , maxim.cournoyer@gmail.com Received: via spool by 65706-submit@debbugs.gnu.org id=B65706.169488299114526 (code B ref 65706); Sat, 16 Sep 2023 16:50:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 base-commit: 0dc83ce53b8bad8473c80689ba212d9f9bb712b3 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