[packages/crossmingw32-glib2] - adjusted executables paths in .pc files to point to native tools; release 2

[qboosh]

commit 44e0031265bde1c0cb2a7749ca6e9737372416f6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 9 18:32:35 2024 +0100

    - adjusted executables paths in .pc files to point to native tools; release 2

 crossmingw32-glib2.spec | 5 ++++-
 glib2-win32.patch       | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index 6768e36..455a814 100644
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -13,7 +13,7 @@ Summary(zh_CN.UTF-8):	实用工具函数库
 %define		realname   glib
 Name:		crossmingw32-glib2
 Version:	2.66.8
-Release:	1
+Release:	2
 License:	LGPL v2+
 Group:		Development/Libraries
 Source0:	https://download.gnome.org/sources/glib/2.66/glib-%{version}.tar.xz
@@ -195,6 +195,9 @@ install -d $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
+# adjust for system tools
+%{__sed} -i -e '/^\(gio\|gio_querymodules\|glib_compile_schemas\|glib_compile_resources\|gdbus\|gdbus_codegen\|gresource\|gsettings\|glib_genmarshal\|gobject_query\|glib_mkenums\)=/ s,\${bindir},/usr/bin,' $RPM_BUILD_ROOT%{_pkgconfigdir}/{gio,glib}-2.0.pc
+
 # use system glib2-devel instead
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/{gdbus-codegen,glib-genmarshal,glib-gettextize,glib-mkenums,gtester-report,*.exe}
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,bash-completion,gettext,glib-2.0}
diff --git a/glib2-win32.patch b/glib2-win32.patch
index 5678ac4..928ecad 100644
--- a/glib2-win32.patch
+++ b/glib2-win32.patch
@@ -185,6 +185,15 @@
              {
 --- glib-2.66.8/glib/gwin32.c.orig	2021-03-18 14:47:48.347693400 +0100
 +++ glib-2.66.8/glib/gwin32.c	2021-05-22 12:35:00.835079487 +0200
+@@ -891,7 +891,7 @@ g_console_win32_init (void)
+       int          new_fd;
+       int          preferred_fd = i;
+       HANDLE       std_handle;
+-      errno_t      errsv = 0;
++      int          errsv = 0;
+ 
+       if (!streams[i].redirect)
+         continue;
 @@ -1109,7 +1109,7 @@ g_win32_veh_handler (PEXCEPTION_POINTERS
        return EXCEPTION_CONTINUE_SEARCH;
      }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-glib2.git/commitdiff/44e0031265bde1c0cb2a7749ca6e9737372416f6