George Rawlinson pushed to branch main at Arch Linux / Packaging / Packages / 
uasm


Commits:
596cc77f by George Rawlinson at 2024-10-06T19:36:10+13:00
upgpkg: 2.57-2

Ensure package is reproducible (remove usage of __DATE__ macro).

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + repro-date.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,22 +1,27 @@
 pkgbase = uasm
        pkgdesc = A MASM-compatible assembler
        pkgver = 2.57
-       pkgrel = 1
+       pkgrel = 2
        url = http://www.terraspace.co.uk/uasm.html
        arch = x86_64
        license = Watcom-1.0
        license = CC-BY-SA-3.0
        makedepends = git
+       makedepends = gcc<14
+       makedepends = gcc-libs<14
        optdepends = sed: for uasm-nocolor
        options = !makeflags
        source = uasm::git+https://github.com/Terraspace/UASM#tag=v2.57r
        source = 
uasm_extended_guide_v2.57.pdf::https://www.terraspace.co.uk/uasm257_ext.pdf
        source = uasm-nocolor
+       source = repro-date.patch
        sha512sums = 
8846942df358418217feb0941ef66de3064e5115fa5bbdaf70bac9ba2695606f910b58e9b5e3c933a530bda1e04d7cfd4d3616478b3d7ae12e74b6242d24a713
        sha512sums = 
e3b15a17d5ba753fe859fbff5cfda2c5c1d5209d9651e136d00989d41472e281023840b6dc2b0b96de554a659f5594f067c45d620f67296e60fd474a659b2c5d
        sha512sums = 
6099e122db071419e2158f37611726d6e2d9a73a0a6966320c8b7cd0621730df52078eaec70ab03358a40aece7b3312072370ba864cfd7f00f92c791ef98f0ca
+       sha512sums = 
194f922ed137b679af2a4b86916cd0a9b613ad9c57617212b9dfe0900bd2f9726f59d4cde8e323de4ff573e5ff670ecb1321642fa69d61598e7266ae82579457
        b2sums = 
1be65d4e22a89f9a10e48ab24ac21eb4345ec96e68b9e002059a61572f02792ad80c87bbb4b3952ea7b5649b4e4cfb427b1723a48de82553c4c74b0e9ed78da3
        b2sums = 
bf2e64b1bbddc6ba7f1cd2b88655168643f60e467f97eb28cd8b2083a7e623c9b801fc38bb7856f00b070057c024de8bf496cc2cf952f172ead20e44e66471d2
        b2sums = 
29f03fede4f03363b106afe2a502c45b3ef8dcf5ae681f5e0f495908c83309f34b9f6fc663976814f03d3a73e4ca62762963caaa4c96a6c36b0c4ad806b1e1db
+       b2sums = 
385b460bed0ce2ba99bdbf545995bf30f43d993add687c27c58625d5bd18a2a1ef35f9076d8f0d79565b6702fca24f9247409b0df694e92bf76f84d55818de36
 
 pkgname = uasm


=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
 
 pkgname=uasm
 pkgver=2.57
-pkgrel=1
+pkgrel=2
 pkgdesc='A MASM-compatible assembler'
 arch=('x86_64')
 url='http://www.terraspace.co.uk/uasm.html'
@@ -20,20 +20,38 @@ license=(
   'Watcom-1.0'
   'CC-BY-SA-3.0'
 )
-makedepends=('git')
+makedepends=('git' 'gcc<14' 'gcc-libs<14')
 optdepends=('sed: for uasm-nocolor')
 options=('!makeflags')
 source=(
   "$pkgname::git+https://github.com/Terraspace/UASM#tag=v${pkgver}r";
   'uasm_extended_guide_v2.57.pdf::https://www.terraspace.co.uk/uasm257_ext.pdf'
   'uasm-nocolor'
+  'repro-date.patch'
 )
 
sha512sums=('8846942df358418217feb0941ef66de3064e5115fa5bbdaf70bac9ba2695606f910b58e9b5e3c933a530bda1e04d7cfd4d3616478b3d7ae12e74b6242d24a713'
             
'e3b15a17d5ba753fe859fbff5cfda2c5c1d5209d9651e136d00989d41472e281023840b6dc2b0b96de554a659f5594f067c45d620f67296e60fd474a659b2c5d'
-            
'6099e122db071419e2158f37611726d6e2d9a73a0a6966320c8b7cd0621730df52078eaec70ab03358a40aece7b3312072370ba864cfd7f00f92c791ef98f0ca')
+            
'6099e122db071419e2158f37611726d6e2d9a73a0a6966320c8b7cd0621730df52078eaec70ab03358a40aece7b3312072370ba864cfd7f00f92c791ef98f0ca'
+            
'194f922ed137b679af2a4b86916cd0a9b613ad9c57617212b9dfe0900bd2f9726f59d4cde8e323de4ff573e5ff670ecb1321642fa69d61598e7266ae82579457')
 
b2sums=('1be65d4e22a89f9a10e48ab24ac21eb4345ec96e68b9e002059a61572f02792ad80c87bbb4b3952ea7b5649b4e4cfb427b1723a48de82553c4c74b0e9ed78da3'
         
'bf2e64b1bbddc6ba7f1cd2b88655168643f60e467f97eb28cd8b2083a7e623c9b801fc38bb7856f00b070057c024de8bf496cc2cf952f172ead20e44e66471d2'
-        
'29f03fede4f03363b106afe2a502c45b3ef8dcf5ae681f5e0f495908c83309f34b9f6fc663976814f03d3a73e4ca62762963caaa4c96a6c36b0c4ad806b1e1db')
+        
'29f03fede4f03363b106afe2a502c45b3ef8dcf5ae681f5e0f495908c83309f34b9f6fc663976814f03d3a73e4ca62762963caaa4c96a6c36b0c4ad806b1e1db'
+        
'385b460bed0ce2ba99bdbf545995bf30f43d993add687c27c58625d5bd18a2a1ef35f9076d8f0d79565b6702fca24f9247409b0df694e92bf76f84d55818de36')
+
+prepare() {
+  cd "$pkgname"
+
+  # use git commit for date instead of __DATE__
+  # note: if sed doesn't match, it fails silently,
+  # hence the usage of patch
+  patch -p1 -i "$srcdir/repro-date.patch"
+
+  local COMMIT_DATE=$(git show --no-patch --format=%cd --date=format:"%b %d 
%Y")
+
+  sed \
+    -e "s/@COMMIT_DATE@/${COMMIT_DATE}/" \
+    -i H/msgdef.h
+}
 
 build() {
   cd "$pkgname"


=====================================
repro-date.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/H/msgdef.h
++++ b/H/msgdef.h
+@@ -8,7 +8,7 @@
+  */
+ pick( MSG_USAGE,              "usage: UASM [ options ] filelist [@env_var]\n" 
"Run \"Uasm -?\" or \"Uasm -h\" for more info\n" )
+ pick( MSG_ASSEMBLY_RESULTS,   "%s: %lu lines, %u passes, %u ms, %u warnings, 
%u errors" )
+-pick( MSG_UASM,               "UASM v" _UASM_VERSION_ ", " __DATE__ ", 
Masm-compatible assembler.\n" )
++pick( MSG_UASM,               "UASM v" _UASM_VERSION_ ", @COMMIT_DATE@, 
Masm-compatible assembler.\n" )
+ pick( MSG_UASM2,              "Portions Copyright (c) 1992-2002 Sybase, Inc. 
All Rights Reserved.\n" "Source code is available under the Sybase Open Watcom 
Public License.\n" )
+ pick( MSG_ERROR_PREFIX,       "Error" )
+ pick( MSG_WARNING_PREFIX,     "Warning" )



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/uasm/-/commit/596cc77f2ed2ec7e18309a141537281fe8efbe73

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/uasm/-/commit/596cc77f2ed2ec7e18309a141537281fe8efbe73
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to