[packages/pspp] Rel 2

arekm arekm at pld-linux.org
Sat Aug 22 16:49:37 CEST 2026


commit 1974be4027b3bcf57af1bdf18cde11bee86f1856
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Aug 22 16:49:29 2026 +0200

    Rel 2

 glibc2.44.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 pspp.spec       | 11 ++++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)
---
diff --git a/pspp.spec b/pspp.spec
index f0f0426..b1b3b32 100644
--- a/pspp.spec
+++ b/pspp.spec
@@ -7,13 +7,14 @@ Summary:	GNU PSPP - program for statistical analysis of sampled data
 Summary(pl.UTF-8):	GNU PSPP - program do analizy statystycznej danych próbkowanych
 Name:		pspp
 Version:	2.1.1
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Applications/Science
 Source0:	https://ftp.gnu.org/gnu/pspp/%{name}-%{version}.tar.gz
 # Source0-md5:	9de448a9e5b4f05b35557ebe93a4b131
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-perl.patch
+Patch2:		glibc2.44.patch
 URL:		http://www.gnu.org/software/pspp/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.14
@@ -109,6 +110,7 @@ Rozszerzenia Glade do rozwijania PSPP.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
 
 %build
 %{__autopoint}
@@ -138,6 +140,9 @@ install utilities/pspp-dump-sav $RPM_BUILD_ROOT%{_bindir}
 %if %{with perl}
 %{__make} -C perl-module install \
 	DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/PSPP/.packlist
 %endif
 
 # API not exported
@@ -147,6 +152,10 @@ install utilities/pspp-dump-sav $RPM_BUILD_ROOT%{_bindir}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.la
 %endif
 
+# DocBook copy of the info manual; nothing in PLD renders it
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/pspp.xml
+rmdir $RPM_BUILD_ROOT%{_docdir}/%{name}
+
 %find_lang %{name}
 
 %clean
diff --git a/glibc2.44.patch b/glibc2.44.patch
new file mode 100644
index 0000000..fb0e185
--- /dev/null
+++ b/glibc2.44.patch
@@ -0,0 +1,45 @@
+--- pspp-2.1.1.orig/gl/c++defs.h	2026-03-04 18:39:40.000000000 +0100
++++ pspp-2.1.1/gl/c++defs.h	2026-08-22 16:31:13.760135933 +0200
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthesized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+--- pspp-2.1.1.orig/gl/stdlib.in.h	2026-03-04 18:39:40.000000000 +0100
++++ pspp-2.1.1/gl/stdlib.in.h	2026-08-22 16:31:13.760565381 +0200
+@@ -224,9 +224,9 @@
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+--- pspp-2.1.1.orig/gl/wchar.in.h	2026-03-04 18:39:41.000000000 +0100
++++ pspp-2.1.1/gl/wchar.in.h	2026-08-22 16:31:13.760958966 +0200
+@@ -301,7 +301,7 @@
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pspp.git/commitdiff/1974be4027b3bcf57af1bdf18cde11bee86f1856



More information about the pld-cvs-commit mailing list