diff --git a/fix-incompatible-type-for-exported-function.patch b/fix-incompatible-type-for-exported-function.patch new file mode 100644 index 0000000000000000000000000000000000000000..4c6375e33b237a5822ffc37a404b7393590b0d7a --- /dev/null +++ b/fix-incompatible-type-for-exported-function.patch @@ -0,0 +1,32 @@ +From 27f6d25677e10c95fcb777bed153e6a6bdf274d3 Mon Sep 17 00:00:00 2001 +From: Jehan +Date: Thu, 15 May 2025 21:49:43 +0200 +Subject: [PATCH] libgimp: fix incompatible type for exported function address + in gimp-win-x86 job. + +This fixes: + +> ../libgimp/gimp.c:280:27: error: assignment to 't_SetProcessDEPPolicy' {aka 'int (__attribute__((stdcall)) *)(long unsigned int)'} from incompatible pointer type 'FARPROC' {aka 'int (__attribute__((stdcall)) *)(void)'} [-Wincompatible-pointer-types] +> 280 | p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandleW (L"kernel32.dll"), +--- + libgimp/gimp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgimp/gimp.c b/libgimp/gimp.c +index 3eb7d74cf4..48a2d1f0ca 100644 +--- a/libgimp/gimp.c ++++ b/libgimp/gimp.c +@@ -277,8 +277,8 @@ gimp_main (GType plug_in_type, + typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags); + t_SetProcessDEPPolicy p_SetProcessDEPPolicy; + +- p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandleW (L"kernel32.dll"), +- "SetProcessDEPPolicy"); ++ p_SetProcessDEPPolicy = (t_SetProcessDEPPolicy) GetProcAddress (GetModuleHandleW (L"kernel32.dll"), ++ "SetProcessDEPPolicy"); + if (p_SetProcessDEPPolicy) + (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE|PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION); + } +-- +2.25.1 + diff --git a/gimp.spec b/gimp.spec index 9fdef7f25a877da3f15e7c5c8540001c6ab4c51f..7b9450ed5f889a2c25a54534b2431cc163638d71 100644 --- a/gimp.spec +++ b/gimp.spec @@ -35,7 +35,7 @@ Name: gimp Version: 3.0.2 -Release: 5 +Release: 6 Epoch: 2 Summary: The GNU Image Manipulation Program License: GPL-3.0-or-later @@ -50,6 +50,7 @@ Patch4: CVE-2025-10923.patch Patch5: CVE-2025-10924.patch Patch6: CVE-2025-10925.patch Patch7: CVE-2025-10934.patch +Patch8: fix-incompatible-type-for-exported-function.patch BuildRequires: meson >= 0.61.0 BuildRequires: aalib-devel BuildRequires: babl-vala >= %{babl_version} @@ -529,6 +530,9 @@ install -D -m0644 macros.gimp %{buildroot}%{_rpmconfigdir}/macros.d/macros.gimp %dir %{_libdir}/gimp/%{api_version}/extensions/org.gimp.extension.goat-exercises/locale %changelog +* Mon Nov 10 2025 huangwenhua - 2:3.0.2-6 +- libgimp: fix incompatible type for exported function address in gimp-win-x86 job. + * Mon Nov 03 2025 yujingbo - 2:3.0.2-5 - Fix CVE-2025-10934