gimp, bump to version 3.2.0 (#13830)

media-gfx/gimp/gimp-3.2.0.recipe

@@ -9,8 +9,8 @@ HOMEPAGE="https://www.gimp.org/"
 COPYRIGHT="The GIMP Team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-SOURCE_URI="https://download.gimp.org/mirror/pub/gimp/v3.0/gimp-$portVersion.tar.xz"
+SOURCE_URI="https://download.gimp.org/mirror/pub/gimp/v${portVersion%.*}/gimp-$portVersion.tar.xz"
-CHECKSUM_SHA256="feb498acc01b26827cff1ff95aa8fb82cdd6a60d7abf773cfcd19abeafca3386"
+CHECKSUM_SHA256="2618391416e51be3c693df9ef90e3860ed72ab3d36363ea1f196e30b75b2e083"
 PATCHES="gimp-$portVersion.patchset"
 ADDITIONAL_FILES="
 	gimp.rdef.in
@@ -37,7 +37,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="0.8.0"
+libVersion="0.200.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -45,20 +45,20 @@ PROVIDES="
 	app:GIMP = $portVersion
 	cmd:gimp$commandSuffix = $portVersion
 	cmd:gimp_3$commandSuffix = $portVersion
-	cmd:gimp_3.0$commandSuffix = $portVersion
+	cmd:gimp_3.2$commandSuffix = $portVersion
 	cmd:gimp_console$commandSuffix = $portVersion
 	cmd:gimp_console_3$commandSuffix = $portVersion
-	cmd:gimp_console_3.0$commandSuffix = $portVersion
+	cmd:gimp_console_3.2$commandSuffix = $portVersion
 	cmd:gimp_debug_tool$commandSuffix = $portVersion
 	cmd:gimp_debug_tool_3$commandSuffix = $portVersion
-	cmd:gimp_debug_tool_3.0$commandSuffix = $portVersion
+	cmd:gimp_debug_tool_3.2$commandSuffix = $portVersion
 	cmd:gimp_script_fu_interpreter_3.0$commandSuffix = $portVersion
 	cmd:gimp_test_clipboard$commandSuffix = $portVersion
 	cmd:gimp_test_clipboard_3$commandSuffix = $portVersion
-	cmd:gimp_test_clipboard_3.0$commandSuffix = $portVersion
+	cmd:gimp_test_clipboard_3.2$commandSuffix = $portVersion
 	cmd:gimptool$commandSuffix = $portVersion
 	cmd:gimptool_3$commandSuffix = $portVersion
-	cmd:gimptool_3.0$commandSuffix = $portVersion
+	cmd:gimptool_3.2$commandSuffix = $portVersion
 	lib:libgimp_3.0$secondaryArchSuffix = $libVersionCompat
 	lib:libgimp_scriptfu_3.0$secondaryArchSuffix = $libVersionCompat
 	lib:libgimpbase_3.0$secondaryArchSuffix = $libVersionCompat
@@ -159,10 +159,11 @@ BUILD_REQUIRES="
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libharfbuzz$secondaryArchSuffix
 	devel:libheif$secondaryArchSuffix
+#	devel:libinih$secondaryArchSuffix
 	devel:libjson_c$secondaryArchSuffix
 	devel:libjson_glib_1.0$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
-	devel:libjxl$secondaryArchSuffix
+	devel:libjxl$secondaryArchSuffix >= 0.11
 	devel:liblcms2$secondaryArchSuffix
 	devel:liblzma$secondaryArchSuffix
 	devel:libmng$secondaryArchSuffix
@@ -188,12 +189,12 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	bash_completion
-	cmd:cmake
 	cmd:bison
+	cmd:cmake
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
-	cmd:gtkdocize
 	cmd:gi_docgen
+	cmd:gtkdocize
 	cmd:intltool_update
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
@@ -212,7 +213,6 @@ BUILD()
 	meson Build \
 		--buildtype=release \
 		--prefix="$prefix" \
-		--datadir="$dataDir" \
 		--libdir="$libDir" \
 		--includedir="$includeDir" \
 		--bindir="$commandBinDir" \
@@ -237,8 +237,8 @@ INSTALL()
 
 	# Symlink for application
 	mkdir -p $appsDir
-	mv $commandBinDir/gimp-3.0 $appsDir/GIMP
+	mv $commandBinDir/gimp-3.2 $appsDir/GIMP
-	ln -s $appsDir/GIMP $commandBinDir/gimp-3.0
+	ln -s $appsDir/GIMP $commandBinDir/gimp-3.2
 
 	# Swap System and Default theme
 	mv $dataDir/gimp/3.0/themes/System $dataDir/gimp/3.0/themes/Temp

media-gfx/gimp/patches/gimp-3.2.0.patchset

@@ -1,4 +1,4 @@
-From a02c16ee16024788da2eba89624daee3743730f6 Mon Sep 17 00:00:00 2001
+From 26afab7cd4902ad3b69d6b175c4c888f6cb7e05c Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 16 Mar 2024 23:23:49 +1000
 Subject: Fix build for Haiku
@@ -15,7 +15,7 @@ index 6b084a8..a2cfc32 100644
  #.interp file read by gimp_interpreter_db_load_interp_file in gimpinterpreterdb.c
  if have_lua and not meson.is_cross_build() and is_variable('lua') and lua.found() and (platform_windows or not relocatable_bundle)
 diff --git a/libgimpbase/gimputils.c b/libgimpbase/gimputils.c
-index bc4bd39..3ee442b 100644
+index 7c7847d..8f153d2 100644
 --- a/libgimpbase/gimputils.c
 +++ b/libgimpbase/gimputils.c
 @@ -51,7 +51,9 @@
@@ -29,7 +29,7 @@ index bc4bd39..3ee442b 100644
  #ifdef HAVE_SYS_PRCTL_H
  #include <sys/prctl.h>
 diff --git a/meson.build b/meson.build
-index 5a4d0c9..63966a0 100644
+index 1fbdd74..942a8fd 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -179,6 +179,10 @@ platform_linux = (
@@ -54,7 +54,7 @@ index 5a4d0c9..63966a0 100644
  if platform_windows
    windows = import('windows')
    # AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
-@@ -784,7 +792,7 @@ conf.set('HAVE_EXCHNDL', drmingw.found())
+@@ -809,7 +817,7 @@ conf.set('HAVE_EXCHNDL', drmingw.found())
  ################################################################################
  # Check for x11 support
  
@@ -63,18 +63,21 @@ index 5a4d0c9..63966a0 100644
  
  x11   = x11_target ? dependency('x11')    : no_dep
  xmu   = x11_target ? dependency('xmu')    : no_dep
-@@ -1119,8 +1127,8 @@ endif
+@@ -1182,8 +1190,13 @@ endif
  isocodes = dependency('iso-codes', required: false)
  if isocodes.found()
    isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix')
--  isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes'
++if platform_haiku
--  isocodes_localedir= isocodes_prefix / 'share' / 'locale'
 +  isocodes_location = isocodes_prefix / 'data' / 'xml' / 'iso-codes'
 +  isocodes_localedir= isocodes_prefix / 'data' / 'locale'
++else
+   isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes'
+   isocodes_localedir= isocodes_prefix / 'share' / 'locale'
++endif
+   conf.set_quoted('ISO_CODES_LOCATION',  isocodes_location)
+   conf.set_quoted('ISO_CODES_LOCALEDIR', isocodes_localedir)
  endif
- conf.set('HAVE_ISO_CODES', isocodes.found())
+@@ -1371,6 +1384,8 @@ conf.set_quoted('GIMP_BUILD_ID', get_option('build-id'))
- 
-@@ -1306,6 +1314,8 @@ conf.set_quoted('GIMP_BUILD_ID', get_option('build-id'))
  conf.set_quoted('GIMP_BUILD_PLATFORM', host_os)
  if platform_linux
    conf.set_quoted('GIMP_BUILD_PLATFORM_FAMILY', 'linux')
@@ -83,7 +86,7 @@ index 5a4d0c9..63966a0 100644
  elif platform_windows
    conf.set_quoted('GIMP_BUILD_PLATFORM_FAMILY', 'windows')
  elif platform_osx
-@@ -1669,10 +1679,7 @@ endif
+@@ -1728,10 +1743,7 @@ endif
  
  
  # git-version.h is already present and not generated if dist tarball
@@ -95,7 +98,7 @@ index 5a4d0c9..63966a0 100644
  
  has_version_h = run_command(python, '-c',
    'import sys,os; sys.exit(0 if os.path.exists("git-version.h") else 1)',
-@@ -2018,7 +2025,7 @@ else
+@@ -2077,7 +2089,7 @@ else
    gimp_exe_depends = []
  endif
  
@@ -105,15 +108,14 @@ index 5a4d0c9..63966a0 100644
  ################################################################################
  # Subdirs: part 2
 diff --git a/plug-ins/meson.build b/plug-ins/meson.build
-index 8a0bc54..ff914b5 100644
+index 9c2595e..208fbf1 100644
 --- a/plug-ins/meson.build
 +++ b/plug-ins/meson.build
-@@ -33,7 +33,7 @@ complex_plugins_list = [
+@@ -34,7 +34,6 @@ complex_plugins_list = [
    { 'name': 'metadata', },
    { 'name': 'pagecurl', },
    { 'name': 'print', },
 -  { 'name': 'screenshot', },
-+#  { 'name': 'screenshot', },
    { 'name': 'script-fu', },
    { 'name': 'selection-to-path', }
  ]
@@ -134,7 +136,7 @@ index 55cebf1..9e37373 100644
 2.52.0
 
 
-From feb4c66ade4787fb85958158195ca5be8be1d541 Mon Sep 17 00:00:00 2001
+From c6f671f988a046829c2148cf19531e31d9213d29 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 16 Mar 2024 23:24:11 +1000
 Subject: Use load_image instead g_spawn_async
@@ -205,14 +207,14 @@ index bfa08e8..6aeb5b4 100644
 2.52.0
 
 
-From b24044245b5579c773881373579de7a8aa5e530b Mon Sep 17 00:00:00 2001
+From 32f0da7eb07c29a54d2021ccf5429d53b944d389 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 16 Mar 2024 23:24:33 +1000
 Subject: Fix preferences dialog freeze
 
 
 diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
-index ab5e176..a6a9549 100644
+index 5b58fb5..cb0610e 100644
 --- a/app/dialogs/preferences-dialog.c
 +++ b/app/dialogs/preferences-dialog.c
 @@ -1330,6 +1330,7 @@ prefs_dialog_new (Gimp       *gimp,
@@ -235,17 +237,17 @@ index ab5e176..a6a9549 100644
 2.52.0
 
 
-From 3c2128357e0a03e3d2327d8de556adf6afee7874 Mon Sep 17 00:00:00 2001
+From 594a6ca81a6fc759f0bab9c549603d691adf6d85 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 16 Mar 2024 23:26:30 +1000
 Subject: Disable signal handlers
 
 
 diff --git a/app/main.c b/app/main.c
-index a77f91f..749a7fe 100644
+index 5ae353a..2e28961 100644
 --- a/app/main.c
 +++ b/app/main.c
-@@ -633,7 +633,9 @@ main (int    argc,
+@@ -628,7 +628,9 @@ main (int    argc,
    gimp_backtrace_init ();
  
    /* Start signal handlers early. */
@@ -256,10 +258,10 @@ index a77f91f..749a7fe 100644
  #ifdef G_OS_WIN32
    /* Make Inno aware of gimp process avoiding broken install/unninstall */
 diff --git a/libgimp/gimp.c b/libgimp/gimp.c
-index f296afe..03f8fa3 100644
+index b117ae4..9fe390b 100644
 --- a/libgimp/gimp.c
 +++ b/libgimp/gimp.c
-@@ -287,8 +287,8 @@ gimp_main (GType  plug_in_type,
+@@ -298,8 +298,8 @@ gimp_main (GType  plug_in_type,
      /* Similar to core crash handling in app/signals.c, the order here
       * is very important!
       */
@@ -270,7 +272,7 @@ index f296afe..03f8fa3 100644
  
      ExcHndlInit ();
  
-@@ -427,15 +427,15 @@ gimp_main (GType  plug_in_type,
+@@ -438,15 +438,15 @@ gimp_main (GType  plug_in_type,
     * about the program error, and offer debugging if the plug-in
     * has been built with MSVC, and the user has MSVC installed.
     */
@@ -312,7 +314,7 @@ index 0c00c2f..4deaf32 100644
 2.52.0
 
 
-From 63f44dcb9fe490f703697363e8ae2b6fe3ff3914 Mon Sep 17 00:00:00 2001
+From 201b0542599e83008399d61b1c4323843fc08d16 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 18 Mar 2025 18:14:59 +1000
 Subject: Implement open url
@@ -350,14 +352,14 @@ index d242ff2..96bc331 100644
 2.52.0
 
 
-From d859598da22c011da09fbf76c1d03d78d2472e7c Mon Sep 17 00:00:00 2001
+From e1194a76d27119f99303f49f2ce15b9f2361d2e4 Mon Sep 17 00:00:00 2001
 From: Luc Schrijvers <begasus@gmail.com>
 Date: Sun, 1 Feb 2026 19:21:41 +0100
 Subject: fix building the documentation
 
 
 diff --git a/devel-docs/reference/gimp-ui/meson.build b/devel-docs/reference/gimp-ui/meson.build
-index 8a40d82..0746ee1 100644
+index 8a40d82..7fcc3c1 100644
 --- a/devel-docs/reference/gimp-ui/meson.build
 +++ b/devel-docs/reference/gimp-ui/meson.build
 @@ -25,7 +25,7 @@ gimp_ui_docs = custom_target('gimp-ui-docs',
@@ -370,7 +372,7 @@ index 8a40d82..0746ee1 100644
    ],
    depends: libgimp_gir[0],
 diff --git a/devel-docs/reference/gimp/meson.build b/devel-docs/reference/gimp/meson.build
-index 357a8a8..8918f8e 100644
+index 357a8a8..8f81568 100644
 --- a/devel-docs/reference/gimp/meson.build
 +++ b/devel-docs/reference/gimp/meson.build
 @@ -23,7 +23,7 @@ gimp_docs = custom_target('gimp-docs',
@@ -385,3 +387,26 @@ index 357a8a8..8918f8e 100644
 -- 
 2.52.0
 
+
+From aa64a0b247315b1756535d11fa64b4b6c2d86af6 Mon Sep 17 00:00:00 2001
+From: Luc Schrijvers <begasus@gmail.com>
+Date: Thu, 4 Sep 2025 11:36:53 +0200
+Subject: Build fix
+
+
+diff --git a/meson.build b/meson.build
+index 942a8fd..a249bdd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2012,7 +2012,7 @@ if meson.can_run_host_binaries() and have_gobject_introspection
+   else
+     gimp_real_exe = gimpmain_exe
+   endif
+-  gimp_exe_depends = [gimp_real_exe, libgimp_gir, libgimpui_gir] + plugin_custom_targets
++  gimp_exe_depends = [gimp_real_exe] + plugin_custom_targets
+   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'
+-- 
+2.52.0
+