dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build/windows: Update MSVC patch after gimprc and python updates

Browse source
This commit is contained in:
Bruno Lopes 2026-03-27 20:39:15 -03:00
parent 807e21c6ab
commit a0c065b02b
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
build/windows/patches/0001-Disable-some-things-due-to-lack-of-packages.patch
View file

@ -1,6 +1,6 @@
From 0749db4803d9d30e14a5e71f5b07422d540325ec Mon Sep 17 00:00:00 2001
From 9193a5e805d17cf990928ed77cfbebcd1a172d1c Mon Sep 17 00:00:00 2001
From: Bruno Lopes <brunvonlope@outlook.com>
Date: Sat, 21 Mar 2026 13:38:25 -0300
Date: Fri, 27 Mar 2026 20:36:27 -0300
Subject: [PATCH] Disable some things due to lack of packages
---
@ -24,8 +24,8 @@ Subject: [PATCH] Disable some things due to lack of packages
docs/meson.build | 2 +-
etc/meson.build | 2 +-
libgimp/meson.build | 4 +-
meson.build | 45 ++++------------
21 files changed, 17 insertions(+), 270 deletions(-)
meson.build | 49 ++++-------------
21 files changed, 18 insertions(+), 273 deletions(-)
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index 9efa957edb..64e7981cfc 100644
@ -511,7 +511,7 @@ index 7dd25ed1ba..234a951148 100644
subdir('reference')
endif
diff --git a/docs/meson.build b/docs/meson.build
index 1f8a37f706..bcba9436fe 100644
index 454c2a9d75..c0332c9b49 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -8,7 +8,7 @@ manconf.set('gimplocaledir', prefix / localedir)
@ -521,8 +521,8 @@ index 1f8a37f706..bcba9436fe 100644
-manconf.set('mypaint_brushes_dir', mypaint_brushes_dir)
+manconf.set('mypaint_brushes_dir', 'none')
man_files = [
custom_target('gimprc-' + gimp_app_version + '.5',
output: 'gimprc-' + gimp_app_version + '.5',
diff --git a/etc/meson.build b/etc/meson.build
index 93ec8ce9e2..7b271c746c 100644
--- a/etc/meson.build
@ -551,7 +551,7 @@ index 8f5d2c4a96..5f763a454a 100644
gobject_introspection_warning = '\n '.join(['',
'GObject Introspection is disabled while cross-compiling because',
diff --git a/meson.build b/meson.build
index 7cbd230bf5..1da7e0b7a1 100644
index 6b4e8b69a6..82b1424c4f 100644
--- a/meson.build
+++ b/meson.build
@@ -288,7 +288,7 @@ warning_cflags_common = [
@ -611,19 +611,30 @@ index 7cbd230bf5..1da7e0b7a1 100644
if python_tmp.found() and python_tmp.language_version().version_compare(python3_minver)
python = python_tmp
#Check if PyGObject installation have minimum version
@@ -1238,11 +1232,6 @@ if not python.found() or not python.language_version().version_compare(python3_m
@@ -1227,9 +1221,7 @@ foreach py : py_candidates
'''except (ImportError):''',
''' sys.exit(1)''']),
check: false).returncode() == 0
- if pygobject_found.returncode() == 0 and pygobject_found.stdout().strip().version_compare(pygobject_minver) and pygobject_gexiv2_found
- break
- endif
+ break
endif
endforeach
@@ -1238,11 +1230,6 @@ if not python.found() or not python.language_version().version_compare(python3_m
endif
message('Found Python @0@'.format(python.language_version()))
-if pygobject_found.returncode() != 0 or not pygobject_found.stdout().strip().version_compare(pygobject_minver) or not pygobject_gexiv2_found
- error('No suitable PyGObject (with Pycairo and Gexiv2 modules) found. Minimum supported version: @0@'.format(pygobject_minver))
- error('No suitable PyGObject (with GExiv2 submodule) found. Minimum supported version: @0@'.format(pygobject_minver))
-endif
-message('Found PyGObject: @0@'.format(pygobject_found.stdout().strip()))
-
## Javascript
gjs = find_program('gjs', required: false)
@@ -1341,7 +1330,6 @@ appstreamcli = find_program('appstreamcli', version: '>=0.15.3', required: get_o
@@ -1341,7 +1328,6 @@ appstreamcli = find_program('appstreamcli', version: '>=0.15.3', required: get_o
# Check for .typelib generation tools
@ -631,7 +642,7 @@ index 7cbd230bf5..1da7e0b7a1 100644
# Check for doc generation tools
@@ -1834,7 +1822,6 @@ install_conf.set('LIBHEIF_REQUIRED_VERSION', libheif_minver)
@@ -1834,7 +1820,6 @@ install_conf.set('LIBHEIF_REQUIRED_VERSION', libheif_minver)
install_conf.set('LIBJXL_REQUIRED_VERSION', jpegxl_minver)
install_conf.set('LIBLZMA_REQUIRED_VERSION', liblzma_minver)
install_conf.set('LIBTIFF_REQUIRED_VERSION', libtiff_minver)
@ -639,7 +650,7 @@ index 7cbd230bf5..1da7e0b7a1 100644
install_conf.set('LIBPNG_REQUIRED_VERSION', libpng_minver)
install_conf.set('OPENEXR_REQUIRED_VERSION', openexr_minver)
install_conf.set('OPENJPEG_REQUIRED_VERSION', openjpeg_minver)
@@ -2020,13 +2007,13 @@ if get_option('debug-self-in-build')
@@ -2026,13 +2011,13 @@ if get_option('debug-self-in-build')
endif
gimp_run_env.set('GIMP_PYTHON_WITH_GI', python.full_path())
@ -655,7 +666,7 @@ index 7cbd230bf5..1da7e0b7a1 100644
gimp_run_env.set('GIMP_SELF_IN_BUILD', gimp_real_exe.full_path())
menu_paths=meson.global_build_root() / 'menus:' + meson.global_source_root() / 'menus'
@@ -2089,18 +2076,6 @@ if meson.can_run_host_binaries() and have_gobject_introspection
@@ -2095,18 +2080,6 @@ if meson.can_run_host_binaries() and have_gobject_introspection
gimp_run_env.prepend('GIMP_TEMP_UPDATE_RPATH', plugin_exe)
endforeach
endif
@ -674,7 +685,7 @@ index 7cbd230bf5..1da7e0b7a1 100644
endif
gimp_exe = find_program('tools'/'in-build-gimp.py')
@@ -2296,7 +2271,7 @@ final_message = [
@@ -2302,7 +2275,7 @@ final_message = [
''' Test appdata @0@'''.format(appstreamcli.found()),
'',
'''Documentation:''',