diff --git a/build/windows/patches/0001-Disable-some-things-due-to-lack-of-packages.patch b/build/windows/patches/0001-Disable-some-things-due-to-lack-of-packages.patch index f207bb83ac..cc36c242e1 100644 --- a/build/windows/patches/0001-Disable-some-things-due-to-lack-of-packages.patch +++ b/build/windows/patches/0001-Disable-some-things-due-to-lack-of-packages.patch @@ -1,6 +1,6 @@ -From d72c56543c5b29ceb5e7a23fbbca51e14037b1ae Mon Sep 17 00:00:00 2001 +From 1d1f3fe3ace998031d23d33c2192ee24d7e9766c Mon Sep 17 00:00:00 2001 From: Bruno Lopes -Date: Mon, 30 Mar 2026 17:49:32 -0300 +Date: Fri, 3 Apr 2026 11:46:58 -0300 Subject: [PATCH] Disable some things due to lack of packages --- @@ -21,11 +21,9 @@ Subject: [PATCH] Disable some things due to lack of packages app/tools/meson.build | 2 - app/widgets/meson.build | 2 - devel-docs/meson.build | 2 +- - docs/meson.build | 2 +- - etc/meson.build | 2 +- libgimp/meson.build | 4 +- - meson.build | 49 ++++------------- - 21 files changed, 18 insertions(+), 273 deletions(-) + meson.build | 36 +++---------- + 19 files changed, 13 insertions(+), 261 deletions(-) diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c index 9efa957edb..64e7981cfc 100644 @@ -510,31 +508,6 @@ index 7dd25ed1ba..234a951148 100644 +if not platform_windows subdir('reference') endif -diff --git a/docs/meson.build b/docs/meson.build -index 70b57b52ef..fe17c88cc7 100644 ---- a/docs/meson.build -+++ b/docs/meson.build -@@ -8,7 +8,7 @@ manconf.set('gimplocaledir', prefix / localedir) - manconf.set('gimpplugindir', prefix / gimpplugindir) - manconf.set('manpage_gimpdir', '$XDG_CONFIG_HOME/' + gimpdir / gimp_app_version) - manconf.set('gimpsysconfdir', prefix / gimpsysconfdir) --manconf.set('mypaint_brushes_dir', mypaint_brushes_dir) -+manconf.set('mypaint_brushes_dir', 'none') - - gimprc_man = 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 -+++ b/etc/meson.build -@@ -1,6 +1,6 @@ - etcconf = configuration_data() - etcconf.set('GIMP_APP_VERSION', gimp_app_version) --etcconf.set('mypaint_brushes_dir', mypaint_brushes_dir) -+etcconf.set('mypaint_brushes_dir', 'none') - - - install_data( diff --git a/libgimp/meson.build b/libgimp/meson.build index eb1166c728..6e1635cf77 100644 --- a/libgimp/meson.build @@ -551,7 +524,7 @@ index eb1166c728..6e1635cf77 100644 gobject_introspection_warning = '\n '.join(['', 'GObject Introspection is disabled while cross-compiling because', diff --git a/meson.build b/meson.build -index 0450ba4600..3ca6e5300a 100644 +index 4d378520c5..c2188c3353 100644 --- a/meson.build +++ b/meson.build @@ -288,7 +288,7 @@ warning_cflags_common = [ @@ -563,28 +536,16 @@ index 0450ba4600..3ca6e5300a 100644 '-Winit-self', '-Wlogical-op', '-Wmissing-declarations', -@@ -533,17 +533,11 @@ json_glib = dependency('json-glib-1.0', version: '>='+json_glib_min +@@ -533,7 +533,7 @@ json_glib = dependency('json-glib-1.0', version: '>='+json_glib_min lcms_minver = '2.8' lcms = dependency('lcms2', version: '>='+lcms_minver) libmypaint_minver = '1.5.0' -libmypaint = dependency('libmypaint', version: '>='+libmypaint_minver) --mypaint_brushes = dependency('mypaint-brushes-2.0') +libmypaint = dependency('libmypaint', required: false) -+mypaint_brushes = dependency('mypaint-brushes-2.0', required: false) + mypaint_brushes = dependency('mypaint-brushes-2.0') --if relocatable_bundle -- mypaint_brushes_dir = '${gimp_installation_dir}'\ -- /'share'/'mypaint-data'/'2.0'/'brushes' --else -- mypaint_brushes_dir = mypaint_brushes.get_variable(pkgconfig: 'brushesdir') --endif - --conf.set_quoted('MYPAINT_BRUSHES_DIR', mypaint_brushes_dir) -+conf.set_quoted('MYPAINT_BRUSHES_DIR', 'none') - - pango_minver = '1.50.0' - if platform_osx -@@ -698,7 +692,7 @@ endif + if relocatable_bundle +@@ -698,7 +698,7 @@ endif # Check for extension support appstream_minver = '0.16.1' @@ -593,16 +554,7 @@ index 0450ba4600..3ca6e5300a 100644 libarchive = dependency('libarchive') -@@ -1068,7 +1062,7 @@ poppler_minver = '0.69.0' - poppler_data_minver = '0.4.9' - poppler = [ - dependency('poppler-glib', version: '>='+poppler_minver), -- dependency('poppler-data', version: '>='+poppler_data_minver), -+ dependency('poppler-data', required: false), - ] - - cairopdf_minver = '1.12.2' -@@ -1202,7 +1196,7 @@ pygobject_found = '' +@@ -1202,7 +1202,7 @@ pygobject_found = '' pygobject_gexiv2_found = false foreach py : py_candidates #Check if PyGobject installation have pycairo (#13105) @@ -611,7 +563,7 @@ index 0450ba4600..3ca6e5300a 100644 if python_tmp.found() and python_tmp.language_version().version_compare(python3_minver) python = python_tmp #Check if PyGObject installation have minimum version -@@ -1221,9 +1215,7 @@ foreach py : py_candidates +@@ -1221,9 +1221,7 @@ foreach py : py_candidates '''except (ImportError):''', ''' sys.exit(1)''']), check: false).returncode() == 0 @@ -622,7 +574,7 @@ index 0450ba4600..3ca6e5300a 100644 endif endforeach -@@ -1232,11 +1224,6 @@ if not python.found() or not python.language_version().version_compare(python3_m +@@ -1232,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())) @@ -634,15 +586,7 @@ index 0450ba4600..3ca6e5300a 100644 ## Javascript gjs = find_program('gjs', required: false) -@@ -1335,7 +1322,6 @@ appstreamcli = find_program('appstreamcli', version: '>=0.15.3', required: get_o - - # Check for .typelib generation tools - --g_ir_compiler = find_program('g-ir-compiler') - - # Check for doc generation tools - -@@ -1822,7 +1808,6 @@ install_conf.set('LIBHEIF_REQUIRED_VERSION', libheif_minver) +@@ -1822,7 +1815,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) @@ -650,7 +594,7 @@ index 0450ba4600..3ca6e5300a 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) -@@ -2014,13 +1999,13 @@ if get_option('debug-self-in-build') +@@ -2014,13 +2006,13 @@ if get_option('debug-self-in-build') endif gimp_run_env.set('GIMP_PYTHON_WITH_GI', python.full_path()) @@ -666,7 +610,7 @@ index 0450ba4600..3ca6e5300a 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' -@@ -2083,18 +2068,6 @@ if meson.can_run_host_binaries() and have_gobject_introspection +@@ -2083,18 +2075,6 @@ if meson.can_run_host_binaries() and have_gobject_introspection gimp_run_env.prepend('GIMP_TEMP_UPDATE_RPATH', plugin_exe) endforeach endif @@ -685,7 +629,7 @@ index 0450ba4600..3ca6e5300a 100644 endif gimp_exe = find_program('tools'/'in-build-gimp.py') -@@ -2290,7 +2263,7 @@ final_message = [ +@@ -2290,7 +2270,7 @@ final_message = [ ''' Test appdata @0@'''.format(appstreamcli.found()), '', '''Documentation:''',