Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

gimp: Update to 3.0.4 (#24300)

Browse Source 
* 0001-clang-rc-files-fix.patch: refresh
* 0002-dont-ignore-destdir.patch: all install scripts fail to take DESTDIR into account
* 0002-skip-test-env.patch: fixed upstream
* 0003-disable-codeview.patch: disable debug files
This commit is contained in:
Christoph Reiter
2025-05-18 22:22:16 +02:00
committed by GitHub
parent 9fa882f7eb
commit 26b20a9b6b
5 changed files with 103 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mingw-w64-gimp/0001-clang-rc-files-fix.patch
View File

@@ -1,15 +1,16 @@
diff -bur gimp-3.0.0-RC1-orig/build/windows/gimp.rc.in gimp-3.0.0-RC1/build/windows/gimp.rc.in
--- gimp-3.0.0-RC1-orig/build/windows/gimp.rc.in 2024-11-06 16:30:26.461218600 -0700
+++ gimp-3.0.0-RC1/build/windows/gimp.rc.in 2024-11-06 16:31:44.425835300 -0700
@@ -64,6 +64,6 @@
--- gimp-3.0.4/build/windows/gimp.rc.in.orig 2025-05-18 10:59:51.260478600 +0200
+++ gimp-3.0.4/build/windows/gimp.rc.in 2025-05-18 11:01:53.311546900 +0200
@@ -64,7 +64,7 @@
END
#include "winuser.h"
-1 ICON QUOTE(TOP_SRCDIR) "/gimp-data/images/logo/gimp.ico"
-2 ICON QUOTE(TOP_SRCDIR) "/gimp-data/images/logo/fileicon.ico"
-2 ICON QUOTE(TOP_SRCDIR) "/gimp-data/images/logo/fileicon-xcf.ico"
-3 ICON QUOTE(TOP_SRCDIR) "/gimp-data/images/logo/fileicon.ico"
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST QUOTE(TOP_SRCDIR) "/build/windows/gimp.manifest"
+1 ICON "./gimp-data/images/logo/gimp.ico"
+2 ICON "./gimp-data/images/logo/fileicon.ico"
+2 ICON "./gimp-data/images/logo/fileicon-xcf.ico"
+3 ICON "./gimp-data/images/logo/fileicon.ico"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "./build/windows/gimp.manifest"
diff -bur gimp-3.0.0-RC1-orig/build/windows/gimp-plug-ins.rc.in gimp-3.0.0-RC1/build/windows/gimp-plug-ins.rc.in
--- gimp-3.0.0-RC1-orig/build/windows/gimp-plug-ins.rc.in 2024-11-06 16:30:26.461218600 -0700

74
mingw-w64-gimp/0002-dont-ignore-destdir.patch Normal file
View File

@@ -0,0 +1,74 @@
--- gimp-3.0.4/tools/meson.build.orig 2025-05-18 00:51:03.000000000 +0200
+++ gimp-3.0.4/tools/meson.build 2025-05-18 11:15:13.561349700 +0200
@@ -61,15 +61,15 @@
pointing_to: fs.name(gimp_test_clipboard.full_path()),
install_dir: get_option('bindir'))
else
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
- gimptool.full_path(), get_option('prefix'), fs.name(gimptool.name()).replace(exec_ver, '.exe'))
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
- gimptool.full_path(), get_option('prefix'), fs.name(gimptool.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2]))',
+ gimptool.full_path(), fs.name(gimptool.name()).replace(exec_ver, '.exe'))
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2].replace("@0@", argv[3])))',
+ gimptool.full_path(), fs.name(gimptool.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
- gimp_test_clipboard.full_path(), get_option('prefix'), fs.name(gimp_test_clipboard.name()).replace(exec_ver, '.exe'))
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
- gimp_test_clipboard.full_path(), get_option('prefix'), fs.name(gimp_test_clipboard.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2]))',
+ gimp_test_clipboard.full_path(), fs.name(gimp_test_clipboard.name()).replace(exec_ver, '.exe'))
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2].replace("@0@", argv[3])))',
+ gimp_test_clipboard.full_path(), fs.name(gimp_test_clipboard.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
endif
endif
--- gimp-3.0.4/app/meson.build.orig 2025-05-18 11:27:42.378530700 +0200
+++ gimp-3.0.4/app/meson.build 2025-05-18 11:28:59.442335800 +0200
@@ -240,10 +240,10 @@
pointing_to: fs.name(gimpmain_exe.full_path()),
install_dir: get_option('bindir'))
else
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
- gimpmain_exe.full_path(), get_option('prefix'), fs.name(gimpmain_exe.name()).replace(exec_ver, '.exe'))
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
- gimpmain_exe.full_path(), get_option('prefix'), fs.name(gimpmain_exe.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2]))',
+ gimpmain_exe.full_path(), fs.name(gimpmain_exe.name()).replace(exec_ver, '.exe'))
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2].replace("@0@", argv[3])))',
+ gimpmain_exe.full_path(), fs.name(gimpmain_exe.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
endif
if enable_console_bin
if not platform_windows
@@ -254,10 +254,10 @@
pointing_to: fs.name(gimpconsole_exe.full_path()),
install_dir: get_option('bindir'))
else
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
- gimpconsole_exe.full_path(), get_option('prefix'), fs.name(gimpconsole_exe.name()).replace(exec_ver, '.exe'))
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
- gimpconsole_exe.full_path(), get_option('prefix'), fs.name(gimpconsole_exe.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2]))',
+ gimpconsole_exe.full_path(), fs.name(gimpconsole_exe.name()).replace(exec_ver, '.exe'))
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2].replace("@0@", argv[3])))',
+ gimpconsole_exe.full_path(), fs.name(gimpconsole_exe.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
endif
endif
endif
--- gimp-3.0.4/app-tools/meson.build.orig 2025-05-18 00:51:03.000000000 +0200
+++ gimp-3.0.4/app-tools/meson.build 2025-05-18 11:31:11.521380300 +0200
@@ -32,9 +32,9 @@
pointing_to: fs.name(gimp_debug_tool.full_path()),
install_dir: gimp_debug_tool_dir)
else
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
- gimp_debug_tool.full_path(), get_option('prefix'), fs.name(gimp_debug_tool.name()).replace(exec_ver, '.exe'))
- meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
- gimp_debug_tool.full_path(), get_option('prefix'), fs.name(gimp_debug_tool.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2]))',
+ gimp_debug_tool.full_path(), fs.name(gimp_debug_tool.name()).replace(exec_ver, '.exe'))
+ meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; import os; copy2(argv[1], str(Path(os.environ.get("MESON_INSTALL_DESTDIR_PREFIX")) / "bin" / argv[2].replace("@0@", argv[3])))',
+ gimp_debug_tool.full_path(), fs.name(gimp_debug_tool.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
endif
endif

18
mingw-w64-gimp/0002-skip-test-env.patch
View File

@@ -1,18 +0,0 @@
--- a/app/tests/meson.build
+++ b/app/tests/meson.build
@@ -44,10 +44,10 @@
'xcf',
]
-cmd = run_command('create_test_env.sh', check: false)
-if cmd.returncode() != 0
- error(cmd.stderr().strip())
-endif
+# cmd = run_command('create_test_env.sh', check: false)
+# if cmd.returncode() != 0
+# error(cmd.stderr().strip())
+# endif
# Prevent parallel builds for the tests
# The tests must not be run in parallel or in a different order as specified

11
mingw-w64-gimp/0003-disable-codeview.patch Normal file
View File

@@ -0,0 +1,11 @@
--- gimp-3.0.4/meson.build.orig 2025-05-18 00:51:03.000000000 +0200
+++ gimp-3.0.4/meson.build 2025-05-18 11:35:03.183040900 +0200
@@ -338,7 +338,7 @@
# Generate native .pdb (CodeView) debug symbols (for DIA or DbgHelp debuggers and LLDB)
pdb_support = cc.has_argument('-gcodeview') and cc.has_link_argument('-Wl,--pdb=')
-if platform_windows and pdb_support and cc.get_id() == 'clang'
+if platform_windows and pdb_support and cc.get_id() == 'clang' and false
compiler_args += '-gcodeview'
linker_args += '-Wl,--pdb='
endif

18
mingw-w64-gimp/PKGBUILD
View File

@@ -1,11 +1,11 @@
# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
_realname=gimp
_pkgver=3.0.2
_pkgver=3.0.4
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=${_pkgver}
pkgrel=3
pkgrel=1
pkgdesc="GNU Image Manipulation Program (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -83,10 +83,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-vala")
source=("https://download.gimp.org/pub/gimp/v3.0/gimp-${_pkgver}.tar.xz"
0001-clang-rc-files-fix.patch
0002-skip-test-env.patch)
sha256sums=('546ddc30cb2d0e79123c7fcb4d78211e1ee7a6aace91a6a0ad8cbcbf6ea571a2'
'f9e0c2fe6d602a5254e4e023a5cb1f66f0ba64c60df925676c2190283ae11747'
'3b7dc1dd42f858d0ef93874164686bdee47cc5e456e60c6d3a63c307244ad6d9')
0002-dont-ignore-destdir.patch
0003-disable-codeview.patch)
sha256sums=('8caa2ec275bf09326575654ac276afc083f8491e7cca45d19cf29e696aecab25'
'a6349cd8f4dd810bd3eab9d4ea2543f159fd62ca3a6a40e7d30c6a9e3aaab845'
'5535197b3f8526d89e4b06dcfb9b31aad59531f9a2c9cfbafbafbdb47460b279'
'0bd52e8379f76202742b687f3f3e4eb498637a0a260e1e790757a668a5da48eb')
apply_patch_with_msg() {
for _patch in "$@"
@@ -98,9 +100,11 @@ apply_patch_with_msg() {
prepare() {
cd "gimp-${_pkgver}"
# https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2275
apply_patch_with_msg \
0001-clang-rc-files-fix.patch \
0002-skip-test-env.patch
0002-dont-ignore-destdir.patch \
0003-disable-codeview.patch
}
build() {