[tbb-commits] [tor-browser-build/master] Bug 40052: Bump NSIS to 3.06.1

[sysrqb at torproject.org]

commit 1e1d42ffe955803ac13dc1e95e7bae1a29a7dd7b
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Sep 6 17:43:01 2020 +0000

    Bug 40052: Bump NSIS to 3.06.1
    
    It seems our timestamp related patch is not needed anymore as building
    the .exe files twice without it gives the exact same result.
---
 projects/nsis/build                     |  5 -----
 projects/nsis/config                    |  5 ++---
 projects/nsis/no-insert-timestamp.patch | 27 ---------------------------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/projects/nsis/build b/projects/nsis/build
index c6a6d3e..54287db 100755
--- a/projects/nsis/build
+++ b/projects/nsis/build
@@ -8,11 +8,6 @@ tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2
 tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %]
 
 cd /var/tmp/build/nsis-[% c('version') %]-src
-# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it
-# is used for both the host and cross-compiled parts, but this option is
-# only valid for the Windows linker. Therefore we add it using a patch
-# to the cross-compilation part only.
-patch -p1 < $rootdir/no-insert-timestamp.patch
 
 [% IF c("var/windows-x86_64") %]
   # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp
diff --git a/projects/nsis/config b/projects/nsis/config
index ed9823d..36f29e2 100644
--- a/projects/nsis/config
+++ b/projects/nsis/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 3.05
+version: 3.06.1
 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 var:
   container:
@@ -16,8 +16,7 @@ input_files:
   - project: container-image
   - filename: 'nsis-[% c("version") %].tar.bz2'
     URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2'
-    sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9
-  - filename: no-insert-timestamp.patch
+    sha256sum: 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
   - name: zlib
diff --git a/projects/nsis/no-insert-timestamp.patch b/projects/nsis/no-insert-timestamp.patch
deleted file mode 100644
index 8053b82..0000000
--- a/projects/nsis/no-insert-timestamp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur nsis-3.03-src/SCons/Config/gnu nsis-3.03-src.n/SCons/Config/gnu
---- nsis-3.03-src/SCons/Config/gnu	2017-10-06 15:30:20.000000000 -0400
-+++ nsis-3.03-src.n/SCons/Config/gnu	2018-06-17 13:26:05.945495151 -0400
-@@ -102,6 +102,7 @@
- stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG'])    # no standard libraries
- stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])        # 512 bytes align
- stub_env.Append(LINKFLAGS = ['$MAP_FLAG'])          # generate map file
-+stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds
- 
- stub_uenv = stub_env.Clone()
- stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
-@@ -142,6 +143,7 @@
- plugin_env.Append(LINKFLAGS = ['$MAP_FLAG'])        # generate map file
- plugin_env.Append(LINKFLAGS = ['-static-libgcc'])   # remove libgcc*.dll dependency
- plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency
-+plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds
- 
- plugin_uenv = plugin_env.Clone()
- plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
-@@ -181,6 +183,7 @@
- 
- util_env.Append(LINKFLAGS = ['-mwindows'])          # build windows executables
- util_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])        # 512 bytes align
-+util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds
- 
- 
- conf = FlagsConfigure(util_env)