[arch-commits] Commit in swift/trunk (PKGBUILD repro-builds.patch)

[Kpcyrd]

    Date: Wednesday, August 25, 2021 @ 22:24:55
  Author: kpcyrd
Revision: 1004945

upgpkg: swift 4.0.2-6 - reproducible builds

Added:
  swift/trunk/repro-builds.patch
Modified:
  swift/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   10 +++++++---
 repro-builds.patch |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-25 22:21:10 UTC (rev 1004944)
+++ PKGBUILD	2021-08-25 22:24:55 UTC (rev 1004945)
@@ -4,7 +4,7 @@
 pkgbase='swift'
 pkgname=('swift-im' 'swiften')
 pkgver=4.0.2
-pkgrel=5
+pkgrel=6
 arch=('x86_64')
 pkgdesc='XMPP client written in C++ with Qt and Swiften'
 url="http://swift.im/"
@@ -14,11 +14,13 @@
 source=("http://swift.im/downloads/releases/$pkgbase-$pkgver/$pkgbase-$pkgver.tar.gz"
         'swift-4.0.2-boost-1.69-compatibility.patch'
         'swift-4.0.2-qt-5.11-compatibility.patch'
-        'swift-4.0.2-qt-5.15-compatibility.patch')
+        'swift-4.0.2-qt-5.15-compatibility.patch'
+        repro-builds.patch)
 sha256sums=('1c7c9fb981ecb9b589890c36523dbbabde2f0a708f71a66eb71e9526bf8e0a70'
             'd166362c146f859ec89c535f8676ac12c6e51e281e6c88c5e36b25e4ea5655d1'
             '7970844d39c38ff6d36c2d1e26c145495ff8f5a5a31a399467eca66854dc3e67'
-            '18feef21870b0f441a6fb0faf7b35a826cfec4fe4a1d717bbb1c373a8c1ccb95')
+            '18feef21870b0f441a6fb0faf7b35a826cfec4fe4a1d717bbb1c373a8c1ccb95'
+            '90c586cc67dc9831a0e8ce75c12478f674b5d429dd46dae4c47f241d7902beb1')
 
 # Those options need to be consistent between each scons invocation.
 _scons_options=(max_jobs=1 optimize=1 debug=0 swiften_dll=1 cflags="${CPPFLAGS} ${CFLAGS}" cxxflags="${CPPFLAGS} ${CFLAGS}" linkflags="${LDFLAGS}")
@@ -28,6 +30,8 @@
   patch -p1 -i ../swift-4.0.2-boost-1.69-compatibility.patch
   patch -p1 -i ../swift-4.0.2-qt-5.11-compatibility.patch
   patch -p1 -i ../swift-4.0.2-qt-5.15-compatibility.patch
+  # https://github.com/swift/swift/pull/129
+  patch -p1 -i ../repro-builds.patch
 }
 
 build() {

Added: repro-builds.patch
===================================================================
--- repro-builds.patch	                        (rev 0)
+++ repro-builds.patch	2021-08-25 22:24:55 UTC (rev 1004945)
@@ -0,0 +1,21 @@
+commit 39a684108ae5938105498e7744e70962308cde7b
+Author: kpcyrd <git at rxv.cc>
+Date:   Wed Aug 25 23:30:17 2021 +0200
+
+    Reproducible Builds: Sort directory contents at build
+
+diff --git a/Swiften/SConscript b/Swiften/SConscript
+index f52637bdb..334f4489e 100644
+--- a/Swiften/SConscript
++++ b/Swiften/SConscript
+@@ -567,7 +567,9 @@ if env["SCONS_STAGE"] == "build" :
+     swiften_includes = []
+     swiften_public_includes = []
+     top_path = env.Dir("..").abspath
+-    for root, dirs, files in os.walk(env.Dir(".").abspath) :
++    for root, dirs, files in sorted(os.walk(env.Dir(".").abspath)) :
++        dirs.sort()
++        files.sort()
+         if root.endswith("UnitTest") :
+             continue
+         for file in files :