[packages/crossmingw32-runtime] - added ptw32 patch (drop ptw32-errno hack which appeared to be withdrawn idea); release 2

[qboosh]

commit cfc40c0658999e205eb2cfd124fa1ca2d3ac4f07
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Apr 27 20:48:04 2023 +0200

    - added ptw32 patch (drop ptw32-errno hack which appeared to be withdrawn idea); release 2

 crossmingw32-runtime-ptw32.patch | 23 +++++++++++++++++++++++
 crossmingw32-runtime.spec        |  6 ++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/crossmingw32-runtime.spec b/crossmingw32-runtime.spec
index 5b97011..566c48b 100644
--- a/crossmingw32-runtime.spec
+++ b/crossmingw32-runtime.spec
@@ -2,7 +2,7 @@ Summary:	MinGW32 Binary Utility Development Utilities - runtime libraries
 Summary(pl.UTF-8):	Zestaw narzędzi MinGW32 - biblioteki uruchomieniowe
 Name:		crossmingw32-runtime
 Version:	5.4.2
-Release:	1
+Release:	2
 Epoch:		1
 License:	BSD-like
 Group:		Development/Libraries
@@ -13,6 +13,7 @@ Patch0:		%{name}-gawk.patch
 Patch1:		%{name}-stdinc.patch
 Patch2:		%{name}-oldlib.patch
 Patch3:		%{name}-memalign-includes.patch
+Patch4:		%{name}-ptw32.patch
 URL:		https://osdn.net/projects/mingw/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake
@@ -24,7 +25,7 @@ BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	crossmingw32-binutils >= 2.15.91.0.2-2
 Requires:	crossmingw32-w32api >= 1:%{version}
-Obsoletes:	crossmingw32-platform
+Obsoletes:	crossmingw32-platform < 2.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		target			i386-mingw32
@@ -83,6 +84,7 @@ dos2unix Makefile.in configure.ac */Makefile.in
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 cp -p %{_includedir}/w32api.h w32api.h.in
diff --git a/crossmingw32-runtime-ptw32.patch b/crossmingw32-runtime-ptw32.patch
new file mode 100644
index 0000000..0fbb6c8
--- /dev/null
+++ b/crossmingw32-runtime-ptw32.patch
@@ -0,0 +1,23 @@
+--- mingwrt-5.4.2/include/errno.h.orig	2020-03-11 21:42:26.000000000 +0100
++++ mingwrt-5.4.2/include/errno.h	2023-04-27 20:17:20.898391793 +0200
+@@ -152,20 +152,4 @@ _END_C_DECLS
+ 
+ #endif	/* ! RC_INVOKED && !__ASSEMBLY__ */
+ #endif	/* ! (_ERRNO_H && _STDLIB_H) */
+-
+-#if defined _ERRNO_H && defined __PTW32_H && ! defined _PTW32_ERRNO_H
+-/* As a courtesy to users of pthreads-win32, ensure that the appropriate
+- * additional error codes, as defined by that package, are automatically
+- * defined when <errno.h> is included AFTER any pthreads-win32 header; a
+- * complementary hook, in <_ptw32.h>, ensures that such additional error
+- * codes are defined, if <errno.h> is included BEFORE any pthreads-win32
+- * header is subsequently included.
+- *
+- * NOTE: this assumes pthreads-win32-2.10 or later, with corresponding
+- * MinGW.org patches applied; it will favour "ptw32_errno.h" installed
+- * in the mingwrt system include directory.
+- */
+-#include "ptw32_errno.h"
+-
+-#endif	/* __PTW32_H */
+ #endif	/* !_ERRNO_H: $RCSfile: errno.h,v $: end of file */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-runtime.git/commitdiff/cfc40c0658999e205eb2cfd124fa1ca2d3ac4f07