[packages/crossmingw32-cairo] - updated to 1.18.4

[qboosh]

commit 57a6dd738dc546f2c4c566f3294ac61fc9271db8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Mar 13 21:42:26 2025 +0100

    - updated to 1.18.4

 cairo-mingw32.patch     | 22 ++++++++++++++++++++++
 crossmingw32-cairo.spec | 27 ++++++++++++++++-----------
 2 files changed, 38 insertions(+), 11 deletions(-)
---
diff --git a/crossmingw32-cairo.spec b/crossmingw32-cairo.spec
index e96afc5..74ce44d 100644
--- a/crossmingw32-cairo.spec
+++ b/crossmingw32-cairo.spec
@@ -1,14 +1,14 @@
-# TODO: dwrite=enabled (BR: libd2d1, libdwrite, d2d1.h, dwrite.h
+# TODO: dwrite=enabled (BR: libd2d1, libdwrite, d2d1.h, dwrite.h)
 Summary:	Cairo - multi-platform 2D graphics library - cross MinGW32 version
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D - skrośna wersja MinGW32
 %define		realname   cairo
 Name:		crossmingw32-%{realname}
-Version:	1.18.2
+Version:	1.18.4
 Release:	1
 License:	LGPL v2.1 or MPL v1.1
 Group:		Development/Libraries
 Source0:	https://www.cairographics.org/releases/%{realname}-%{version}.tar.xz
-# Source0-md5:	5ad67c707edd0003f1b91c8bbc0005c1
+# Source0-md5:	db575fb41bbda127e0147e401f36f8ac
 Patch0:		cairo-mingw32.patch
 URL:		https://www.cairographics.org/
 BuildRequires:	crossmingw32-fontconfig >= 2.13.0
@@ -16,15 +16,16 @@ BuildRequires:	crossmingw32-freetype >= 2.13.0
 BuildRequires:	crossmingw32-gcc >= 1:4.7
 BuildRequires:	crossmingw32-glib2 >= 2.14
 BuildRequires:	crossmingw32-libpng >= 1.4.0
-BuildRequires:	crossmingw32-pixman >= 0.40.0
+BuildRequires:	crossmingw32-pixman >= 0.42.3
 BuildRequires:	crossmingw32-zlib
-BuildRequires:	meson >= 0.59.0
+BuildRequires:	meson >= 1.3.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig >= 1:0.18
+BuildRequires:	rpmbuild(macros) >= 2.042
 Requires:	crossmingw32-fontconfig >= 2.13.0
 Requires:	crossmingw32-freetype >= 2.13.0
 Requires:	crossmingw32-libpng >= 1.4.0
-Requires:	crossmingw32-pixman >= 0.40.0
+Requires:	crossmingw32-pixman >= 0.42.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -152,7 +153,7 @@ Biblioteka DLL Cairo GObject dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch0 -p1
+%patch -P0 -p1
 
 cat > meson-cross.txt <<'EOF'
 [host_machine]
@@ -165,7 +166,7 @@ c = '%{target}-gcc'
 cpp = '%{target}-g++'
 ar = '%{target}-ar'
 windres = '%{target}-windres'
-pkgconfig = 'pkg-config'
+pkg-config = 'pkg-config'
 [built-in options]
 %ifarch %{ix86}
 c_args = ['%(echo %{rpmcflags} | sed -e "s/ \+/ /g;s/ /', '/g")']
@@ -177,25 +178,29 @@ EOF
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
-%meson build \
+%meson \
 	--cross-file meson-cross.txt \
 	-Ddwrite=disabled \
 	-Dfontconfig=enabled \
 	-Dfreetype=enabled \
+	-Dglib=enabled \
+	-Dlzo=disabled \
 	-Dpng=enabled \
+	-Dquartz=disabled \
 	-Dspectre=disabled \
+	-Dsymbol-lookup=disabled \
 	-Dtee=enabled \
 	-Dtests=disabled \
 	-Dxcb=disabled \
 	-Dxlib=disabled \
 	-Dzlib=enabled
 
-%ninja_build -C build
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%ninja_install -C build
+%meson_install
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
 %{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
diff --git a/cairo-mingw32.patch b/cairo-mingw32.patch
index 7a2a34e..920de4b 100644
--- a/cairo-mingw32.patch
+++ b/cairo-mingw32.patch
@@ -9,3 +9,25 @@
  #define access _access
  #ifndef R_OK
  #define R_OK 4
+--- cairo-1.18.4/src/win32/cairo-win32-system.c.orig	2025-03-08 13:35:35.000000000 +0100
++++ cairo-1.18.4/src/win32/cairo-win32-system.c	2025-03-13 06:20:17.072351110 +0100
+@@ -93,7 +93,7 @@ _cairo_win32_load_library_from_system32
+ {
+     HMODULE module_handle;
+ 
+-    module_handle = LoadLibraryExW (name, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
++    module_handle = LoadLibraryExW (name, NULL, 0x800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */);
+     if (module_handle == NULL) {
+         DWORD code = GetLastError();
+         if (code == ERROR_INVALID_PARAMETER) {
+--- cairo-1.18.4/meson.build.orig	2025-03-08 13:35:35.000000000 +0100
++++ cairo-1.18.4/meson.build	2025-03-13 06:23:47.276467981 +0100
+@@ -536,7 +536,7 @@ if host_machine.system() == 'windows'
+ 
+     add_project_arguments('-DWINVER=_WIN32_WINNT_WIN10', '-D_WIN32_WINNT=_WIN32_WINNT_WIN10', '-DNTDDI_VERSION=NTDDI_WIN10_RS3', language: ['c', 'cpp'])
+   else
+-    add_project_arguments('-DWINVER=_WIN32_WINNT_WIN2K', '-D_WIN32_WINNT=_WIN32_WINNT_WIN2K', language: ['c', 'cpp'])
++    add_project_arguments('-DWINVER=_WIN32_WINNT_WINXP', '-D_WIN32_WINNT=_WIN32_WINNT_WINXP', language: ['c', 'cpp'])
+   endif
+ endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-cairo.git/commitdiff/57a6dd738dc546f2c4c566f3294ac61fc9271db8