From patchwork Tue Aug 2 16:04:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 41100 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 1B89B27BBEA; Tue, 2 Aug 2022 17:07:36 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 615CB27BBE9 for ; Tue, 2 Aug 2022 17:07:35 +0100 (BST) Received: from localhost ([::1]:52252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIuQg-0008FF-Hy for patchwork@mira.cbaines.net; Tue, 02 Aug 2022 12:07:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIuOH-0005pX-Vh for guix-patches@gnu.org; Tue, 02 Aug 2022 12:05:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIuOF-0008Vh-5X for guix-patches@gnu.org; Tue, 02 Aug 2022 12:05:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIuOE-0002Ke-0r for guix-patches@gnu.org; Tue, 02 Aug 2022 12:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56892] Fix the target detection fix. References: <45c22c0a9d36937360172ba25edd97280436edf6.camel@planete-kraus.eu> In-Reply-To: <45c22c0a9d36937360172ba25edd97280436edf6.camel@planete-kraus.eu> Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Aug 2022 16:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56892 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56892@debbugs.gnu.org Received: via spool by 56892-submit@debbugs.gnu.org id=B56892.16594562888940 (code B ref 56892); Tue, 02 Aug 2022 16:05:01 +0000 Received: (at 56892) by debbugs.gnu.org; 2 Aug 2022 16:04:48 +0000 Received: from localhost ([127.0.0.1]:44880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIuNz-0002K7-TH for submit@debbugs.gnu.org; Tue, 02 Aug 2022 12:04:48 -0400 Received: from planete-kraus.eu ([89.234.140.182]:32980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIuNw-0002Jx-48 for 56892@debbugs.gnu.org; Tue, 02 Aug 2022 12:04:46 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d13ee0fb for <56892@debbugs.gnu.org>; Tue, 2 Aug 2022 16:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:content-type:mime-version; s= dkim; bh=+H0Qf2p6YSZUNlZsH/9syo0HWp8=; b=yLh3CvZRrWBKWJIER/3O25+ SPVTCjs5PrA/CBsxXhnBmh6qyUp6HoRIjurrnG9y1VArSn9vKPDCQa0d/gAhcWR8 l36TJp3jlSZZwBqx0h9W1L4pzNf27WPXHyv/QrIDITkJx4AHisQFmK7u6LGOiX9y znzvN9E1NpoR1wISqjxk= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 438a84de (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO) for <56892@debbugs.gnu.org>; Tue, 2 Aug 2022 16:04:39 +0000 (UTC) Message-ID: Date: Tue, 02 Aug 2022 18:04:37 +0200 User-Agent: Evolution 3.42.1 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" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus X-getmail-retrieved-from-mailbox: Patches Dear guix, The NSIS target detection is still screwed up, but now with unicode! This V2 fixes the fix. Best regards, Vivien From 789aa3050cefe2dc508a3ecf672f9d00fb4fe0fb Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 2 Aug 2022 17:23:05 +0200 Subject: [PATCH v2] gnu: nsis: Update to 3.08. * gnu/packages/patches/nsis-source-date-epoch.patch: Drop this patch. * gnu/packages/patches/nsis-env-passthru.patch: Adjust the patch. * gnu/packages/installers.scm (make-nsis): Update to 3.08. --- gnu/local.mk | 1 - gnu/packages/installers.scm | 9 ++++---- gnu/packages/patches/nsis-env-passthru.patch | 17 +++++++------- .../patches/nsis-source-date-epoch.patch | 23 ------------------- 4 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/nsis-source-date-epoch.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10c3192ade..2e02af8b71 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1550,7 +1550,6 @@ dist_patch_DATA = \ %D%/packages/patches/nginx-socket-cloexec.patch \ %D%/packages/patches/nnpack-system-libraries.patch \ %D%/packages/patches/nsis-env-passthru.patch \ - %D%/packages/patches/nsis-source-date-epoch.patch \ %D%/packages/patches/nss-getcwd-nonnull.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-3.56-pkgconfig.patch \ diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 01ad03e6af..30cd0e4e6c 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -34,16 +34,15 @@ (define (make-nsis machine target-arch nsis-target-type) (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) - (version "3.05") + (version "3.08") (source (origin (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-" version "-src.tar.bz2")) (sha256 (base32 - "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn")) - (patches (search-patches "nsis-env-passthru.patch" - "nsis-source-date-epoch.patch")))) + "11qy1n1qdcqwal9hn8cmzm7gxjdyx7by6w14rfz2l646afnp0lm8")) + (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) ("xbinutils" ,xbinutils) @@ -125,7 +124,7 @@ (define (mingw-path? path) (lambda _ ;; NSIS target detection is screwed up, manually change ;; it ourselves - (substitute* "Source/build.cpp" (("m_target_type=TARGET_X86ANSI") + (substitute* "Source/build.cpp" (("m_target_type=TARGET_X86UNICODE") (string-append "m_target_type=" ,nsis-target-type)))))))) (home-page "https://nsis.sourceforge.io/Main_Page") (synopsis "System to create Windows installers") diff --git a/gnu/packages/patches/nsis-env-passthru.patch b/gnu/packages/patches/nsis-env-passthru.patch index 36b4092230..22b186f55a 100644 --- a/gnu/packages/patches/nsis-env-passthru.patch +++ b/gnu/packages/patches/nsis-env-passthru.patch @@ -1,12 +1,11 @@ ---- nsis-3.04-src/SConstruct 2019-05-30 14:53:30.276775332 -0400 -+++ nsis-3.04-src/SConstruct 2019-05-30 14:54:17.901232914 -0400 -@@ -77,6 +77,9 @@ - if not toolset and not path: - defenv = Environment(TARGET_ARCH = arch) +--- nsis-3.08-src/SConstruct 2021-01-15 17:31:10.000000000 +0100 ++++ nsis-3.08-src/SConstruct-passthru 2022-08-02 17:11:12.414702282 +0200 +@@ -71,7 +71,7 @@ -+import os; -+defenv['ENV'] = os.environ -+ - Export('defenv') + defenv = { + 'TARGET_ARCH': ARGUMENTS.get('TARGET_ARCH', 'x86'), +- 'ENV': {} ++ 'ENV': os.environ.copy() + } ###################################################################### diff --git a/gnu/packages/patches/nsis-source-date-epoch.patch b/gnu/packages/patches/nsis-source-date-epoch.patch deleted file mode 100644 index 744c2a8011..0000000000 --- a/gnu/packages/patches/nsis-source-date-epoch.patch +++ /dev/null @@ -1,23 +0,0 @@ -Honour SOURCE_DATE_EPOCH for VERSION default - -Merged upstream as cd3f1024a37a332f1d4fa96a817ca80dfa2a478c, but not yet in a -release. GitHub PR: https://github.com/kichik/nsis/pull/13 - -Python snippet from: https://reproducible-builds.org/docs/source-date-epoch/#python - - -diff --git a/SConstruct b/SConstruct -index e8252c9..41786f2 100755 ---- a/SConstruct -+++ b/SConstruct -@@ -95,8 +95,8 @@ default_doctype = 'html' - if defenv.WhereIs('hhc', os.environ['PATH']): - default_doctype = 'chm' - --from time import strftime, gmtime --cvs_version = strftime('%d-%b-%Y.cvs', gmtime()) -+import time -+cvs_version = time.strftime('%d-%b-%Y.cvs', time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))) - - opts = Variables() - base-commit: d5ba31c19accdf14bca23ebc0c3baf1c5b08fb5f -- 2.37.1