[packages/crossmingw32-w32api] - added objc patch to match also gcc 10; release 3

qboosh qboosh at pld-linux.org
Wed Jun 28 21:11:07 CEST 2023


commit 684ff2f6caeddaf5c9af82876999761be4b05d92
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jun 28 20:56:26 2023 +0200

    - added objc patch to match also gcc 10; release 3

 crossmingw32-w32api-objc.patch | 11 +++++++++++
 crossmingw32-w32api.spec       |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/crossmingw32-w32api.spec b/crossmingw32-w32api.spec
index 33ea4da..e12ff8d 100644
--- a/crossmingw32-w32api.spec
+++ b/crossmingw32-w32api.spec
@@ -6,7 +6,7 @@ Version:	5.4.2
 %define	apisrc	w32api-%{apiver}-mingw32
 %define runver	5.4.2
 %define	runsrc	mingwrt-%{runver}-mingw32
-Release:	2
+Release:	3
 Epoch:		1
 License:	Free (Public Domain, SGI Free Software License B, BSD)
 Group:		Development/Libraries
@@ -28,6 +28,7 @@ Source5:	https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h
 # Source5-md5:	d03191518ac2cfc3c10d22df034b154a
 Patch0:		%{name}-mmsystem.patch
 Patch1:		%{name}-winapi-update.patch
+Patch2:		%{name}-objc.patch
 URL:		https://osdn.net/projects/mingw/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake
@@ -95,6 +96,7 @@ ln -snf mingwrt-%{runver} mingwrt
 cd w32api
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cd mingwrt
diff --git a/crossmingw32-w32api-objc.patch b/crossmingw32-w32api-objc.patch
new file mode 100644
index 0000000..2400de6
--- /dev/null
+++ b/crossmingw32-w32api-objc.patch
@@ -0,0 +1,11 @@
+--- w32api-5.4.2/include/windef.h.orig	2020-03-11 21:42:26.000000000 +0100
++++ w32api-5.4.2/include/windef.h	2023-06-28 20:27:18.368282772 +0200
+@@ -246,7 +246,7 @@ typedef unsigned long DWORD;
+ typedef int WINBOOL,*PWINBOOL,*LPWINBOOL;
+ /* FIXME: Is there a good solution to this? */
+ #ifndef XFree86Server
+-#ifndef __OBJC__
++#if !defined(__OBJC__) && !defined(__GNU_LIBOBJC__)
+ typedef WINBOOL BOOL;
+ #else
+ #define BOOL WINBOOL
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-w32api.git/commitdiff/684ff2f6caeddaf5c9af82876999761be4b05d92



More information about the pld-cvs-commit mailing list