Accepting request 1293073 from Education

- upstream patch to fix build with C23
- added patches
  fix build with gcc15
  + units-gcc15.patch (forwarded request 1293072 from pgajdos)

OBS-URL: https://build.opensuse.org/request/show/1293073
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/units?expand=0&rev=39

units-2.23.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d957b451245925c9e614c4513397449630eaf92bd62b8495ba09bbe351a17370
-size 1423494

units-2.24.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e502c4edfacf20b29284716c72e5ddb51a495a2365d7b03e7960494c4a0c902
+size 1493600

units-gcc15.patch

@@ -0,0 +1,38 @@
+Content-Type: text/x-diff; charset=us-ascii
+Content-Disposition: attachment; filename="gcc-15.diff"
+
+Fix non-C23-compatible prototypes.
+
+--- units-2.24/parse.y  2024-11-08 21:47:09.000000000 +0000
++++ units-2.24/parse.y  2025-07-11 17:39:34.767021826 +0100
+@@ -45,7 +45,8 @@
+                               if (var) destroyunit(var); \
+                               YYABORT; }
+  
+-int yylex();
++union UNITSSTYPE;
++int yylex(union UNITSSTYPE *lvalp, struct commtype *comm);
+ void yyerror(struct commtype *comm, char *);
+ 
+ #define MAXMEM 100
+--- units-2.24/units.h  2024-11-15 02:24:47.000000000 +0000
++++ units-2.24/units.h  2025-07-11 17:33:15.111036898 +0100
+@@ -50,13 +50,9 @@
+    char *malloc(),  *realloc(),  *getenv();
+ #endif
+ 
+-#ifndef strchr
+-#  ifdef NO_STRCHR
+-#    define strchr(a,b) index((a),(b))
+-#  else
+-     char *strchr();
+-#  endif
+-#endif /* !strchr */
++#ifdef NO_STRCHR
++#  define strchr(a,b) index((a),(b))
++#endif
+ 
+ #define E_NORMAL 0
+ #define E_PARSE 1
+
+

units.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Jul 14 08:53:22 UTC 2025 - pgajdos@suse.com
+
+- upstream patch to fix build with C23
+- added patches
+  fix build with gcc15
+  + units-gcc15.patch
+
+-------------------------------------------------------------------
+Mon Jun 30 15:18:40 UTC 2025 - pgajdos@suse.com
+
+- build with -std=gnu11 to fix build with gcc15
+
+-------------------------------------------------------------------
+Tue Nov 26 20:56:15 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- units 2.24:
+  * Units definitions updated to reflect 2022 NIST CODATA.
+  * Added ':=' assignment for interactively defined variables
+  * Interactive variable definitions now appear in the log file
+  * Added interactive "set" command to set or change options
+  * Function additions for circles, diameters, wire gauges, pipes
+
 -------------------------------------------------------------------
 Mon Feb 26 09:28:29 UTC 2024 - pgajdos@suse.com
 

units.keyring

@@ -1,49 +1,43 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
 
-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
-bzLQvXT/qLCuqBWvr+45Cw==
-=km5V
+mQGiBEr3eX8RBAD+e9L/F52COrYSfvNVFj65PffjOBWLMdTkENdCZkVxrMzVjuCw
+pBTjcO7CSDvG2IgLFl6p5TZebGXF2YZRmi7aIuuAIgymSLFBsKHH+vnu5sZSXSn6
+xbDEV7JiwPKbuBNLrcybrWGNIZHacL3hd1dUmDOrb4MKSC8mE0Io/AcobwCghQg6
+/+bVjMcUGZzRqkMLmkxcp/kEAMOk277oCiOpB5ax55D4RdS7jw0a3BrRka+O98Y7
++vmyBnFzLop9HhhX4LCif9Io2BBywa9lMaerm6F7w1TnZDesL4W/t9PnaUbfSRk1
+mihx1KY4HmVmy3gRVps95XTrFUSdHg/UsdHaR00bXGHi0LlkbpIkj2zPIPLrVfWx
+18iTA/0egBXXcB3/p0/sZlqM6oA0kexD9ZGCR/XgaRbxduXe5lhNvpg44KlBOvqz
+YBhSqU3Lpj9XPDPH2BlBprS+i6hXKblu3x2oWoCuzKP7U73T5CFLwRaAONx5FMdx
+hWreRjyqo8ZuLSYpCoCYjnKYrjXAQECdMBy8pVLR8L7WRxjOkbQnQWRyaWFuIE1h
+cmlhbm8gPGFkcmlhbkBjYW0uY29ybmVsbC5lZHU+iH0EExECAD0CGwMGCwkIBwMC
+BBUCCAMEFgIDAQIeAQIXgBYhBJrY/EFi15N89k+XLhiJ1fDgY29JBQJmr5/mBQkb
+uXfnAAoJEBiJ1fDgY29JBvkAnRT6Og3ETCZHUIaAXwCiVuQukJmQAJ45uIG2Kw2i
+AsM4TycupnT6g0lbJbkCDQRK93l/EAgA8nt/R9DZ9Rnp3C9m0wfUibyT9BEPESZp
+XXBEXRZZTUYnMbWFhTMcO/zFbqqifKrKFFaV3yhz3wm2t0+c5Gntsy6qdjdOeKhD
+cVo1mYsSHJFlX84OZWFlYi8D+SLtfrGOqxrsjmpBUeC+lxfD6NhFYMbEwsPpPtPy
+uReKIedPJQZRAxAIq+JNHQTC2YizOQm7vm+hTG3Qc3bVPVEpDFxg7oHYG8YqK6Au
+HRmOioI0VzZz7YPCKksomuEWc9BF+BduTkv6mbnLf4jiDHP7g3pNIBZaCVWW4Rbc
+usFYsZxAjVlzTkKF2WZfjI99HbCOS5AnMnSgc8heRiwBJ37I+chd6wADBgf9GrQa
+sTIXm32vOnSxFb/E8AR3OaBhobke5rSw6vXlH7l7l0zP0C6ezA1cGDMRkxAutiE0
+XszfxlIjGVnYT3zRDymdD710yT6/VRMgaT4yteYJuCmrsGiHgIMnS1hQM1+eKFI1
+PsOdN3F2W8DVAoHCQ3YlugMYruh63oz2wv72LCQLQQoNMIXdlDo+OzNWRqXgol2v
+mj7ZUbNGzQUCJHDUM7gzmemsFlVAjJ1MSKizOAJa7NeCJSyBhJqPVyzUPQsiDDrk
+st6wJFshgag7MovHRGjCxgE8sh9go+VBsoHEiV882JqEesut7CagQkrL2ohSt6hu
+264BKILlPzw3uQMCfIhmBBgRAgAmAhsMFiEEmtj8QWLXk3z2T5cuGInV8OBjb0kF
+AmavoAQFCRu5eAUACgkQGInV8OBjb0kmhwCfWsYFgukld2gzCEC4xLdT7faiBd4A
+nAhS1jxTH8TCXFFYnXqtDUkZKSjh
+=5XX0
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZq+fKRYJKwYBBAHaRw8BAQdAdGUzqCdKMwiBe/+FJMHor4tF55NAyMfIs4kG
+Qyg+TQq0IUFkcmlhbiBNYXJpYW5vIDxhdm00QGNvcm5lbGwuZWR1PoiQBBMWCAA4
+FiEEkn0C+nM8PZAtIcrALWSfK3tMgXkFAmavnykCGwMFCwkIBwIGFQoJCAsCBBYC
+AwECHgECF4AACgkQLWSfK3tMgXloaQEAjH73/XiWu66NYtLaTx63o3vMCX2BDs9s
+0nR3f5psiDUA/jvVjiBnT0qzK64+PP2vyj6n1ddwtzRH7HqcQmqqrIkDuDgEZq+f
+KRIKKwYBBAGXVQEFAQEHQMxUf++1+R2DDuuL/WgvLuLgYtn6rwwty1SdJemF+d09
+AwEIB4h4BBgWCAAgFiEEkn0C+nM8PZAtIcrALWSfK3tMgXkFAmavnykCGwwACgkQ
+LWSfK3tMgXk+XgEAskun4Yx8QP2KuS8Z6bfG2ZuIJE4N0k0jdact3j8e5tgBAOuk
+VMeL9eBEXw4gm1WWy0cQYXPQAU+d8I5jB8OeYeYK
+=VZj+
 -----END PGP PUBLIC KEY BLOCK-----

units.spec

@@ -19,7 +19,7 @@
 
 %bcond_without	units_cur
 Name:           units
-Version:        2.23
+Version:        2.24
 Release:        0
 Summary:        Conversion Utility
 License:        GPL-3.0-or-later
@@ -28,6 +28,8 @@ URL:            https://www.gnu.org/software/units/
 Source0:        http://ftp.gnu.org/gnu/units/units-%{version}.tar.gz
 Source1:        http://ftp.gnu.org/gnu/units/units-%{version}.tar.gz.sig
 Source2:        https://savannah.gnu.org/people/viewgpg.php?user_id=33238#/%{name}.keyring
+# fix build with gcc15
+Patch0:         units-gcc15.patch
 BuildRequires:  bison
 BuildRequires:  readline-devel
 %if %{with units_cur}
@@ -55,7 +57,7 @@ export LDFLAGS="-pie"
 %install
 %make_install
 ln -fsv ../../..%{_sharedstatedir}/units/currency.units %{buildroot}%{_datadir}/units
-%python3_fix_shebang
+%{python3_fix_shebang}
 
 %check
 %make_build check