From e449878d1122081e72633cf849b84626a5574b04 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 7 Feb 2026 18:48:20 +0100 Subject: [PATCH] gimp, bump to version 3.0.8 (#13724) --- .../{gimp-3.0.6.recipe => gimp-3.0.8.recipe} | 37 ++++++-- ...imp-3.0.6.patchset => gimp-3.0.8.patchset} | 88 +++++++++++++------ 2 files changed, 91 insertions(+), 34 deletions(-) rename media-gfx/gimp/{gimp-3.0.6.recipe => gimp-3.0.8.recipe} (91%) rename media-gfx/gimp/patches/{gimp-3.0.6.patchset => gimp-3.0.8.patchset} (79%) diff --git a/media-gfx/gimp/gimp-3.0.6.recipe b/media-gfx/gimp/gimp-3.0.8.recipe similarity index 91% rename from media-gfx/gimp/gimp-3.0.6.recipe rename to media-gfx/gimp/gimp-3.0.8.recipe index 1e33b3fe7..82b947135 100644 --- a/media-gfx/gimp/gimp-3.0.6.recipe +++ b/media-gfx/gimp/gimp-3.0.8.recipe @@ -10,14 +10,14 @@ 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" -CHECKSUM_SHA256="246c225383c72ef9f0dc7703b7d707084bbf177bd2900e94ce466a62862e296b" +CHECKSUM_SHA256="feb498acc01b26827cff1ff95aa8fb82cdd6a60d7abf773cfcd19abeafca3386" PATCHES="gimp-$portVersion.patchset" ADDITIONAL_FILES=" gimp.rdef.in gimp-splash.png " -ARCHITECTURES="all !x86_gcc2" +ARCHITECTURES="ALL !x86_gcc2" SECONDARY_ARCHITECTURES="x86" GLOBAL_WRITABLE_FILES=" @@ -37,7 +37,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libVersion="0.0.4" +libVersion="0.8.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -81,6 +81,7 @@ REQUIRES=" lib:libavif$secondaryArchSuffix lib:libbabl_0.1$secondaryArchSuffix lib:libcairo$secondaryArchSuffix +# lib:libexecinfo$secondaryArchSuffix lib:libexiv2$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix @@ -100,6 +101,7 @@ REQUIRES=" lib:libjson_c$secondaryArchSuffix lib:libjson_glib_1.0$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix + lib:libjxl$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix lib:liblzma$secondaryArchSuffix lib:libmng$secondaryArchSuffix @@ -122,6 +124,11 @@ REQUIRES=" lib:libz$secondaryArchSuffix " +ARCHITECTURES_doc="any" +PROVIDES_doc=" + gimp_doc + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel packaging_python310 @@ -135,7 +142,8 @@ BUILD_REQUIRES=" devel:libatk_1.0$secondaryArchSuffix devel:libavif$secondaryArchSuffix devel:libbabl_0.1$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix >= 3 +# devel:libexecinfo$secondaryArchSuffix devel:libexiv2$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libcairo$secondaryArchSuffix @@ -154,6 +162,7 @@ BUILD_REQUIRES=" devel:libjson_c$secondaryArchSuffix devel:libjson_glib_1.0$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix + devel:libjxl$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix devel:liblzma$secondaryArchSuffix devel:libmng$secondaryArchSuffix @@ -162,10 +171,10 @@ BUILD_REQUIRES=" devel:libopenjp2$secondaryArchSuffix devel:libpango_1.0$secondaryArchSuffix devel:libpng16$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix >= 148 - devel:libpoppler_glib$secondaryArchSuffix >= 8.29 + devel:libpoppler$secondaryArchSuffix >= 155 + devel:libpoppler_glib$secondaryArchSuffix >= 8.31 devel:librsvg_2$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libtiff$secondaryArchSuffix devel:libuuid$secondaryArchSuffix >= 1.3 devel:libwayland_client$secondaryArchSuffix @@ -178,9 +187,13 @@ BUILD_REQUIRES=" lib:libglib_networking_2.0$secondaryArchSuffix " BUILD_PREREQUIRES=" + bash_completion cmd:cmake + cmd:bison + cmd:flex cmd:gcc$secondaryArchSuffix cmd:gtkdocize + cmd:gi_docgen cmd:intltool_update cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix @@ -199,6 +212,7 @@ BUILD() meson Build \ --buildtype=release \ --prefix="$prefix" \ + --datadir="$dataDir" \ --libdir="$libDir" \ --includedir="$includeDir" \ --bindir="$commandBinDir" \ @@ -212,7 +226,7 @@ BUILD() -Dxcursor=disabled \ -Denable-console-bin=true - ninja -C Build + ninja -v -C Build cp -f $portDir/additional-files/gimp-splash.png $sourceDir/Build/gimp-data/images/ } @@ -255,4 +269,11 @@ INSTALL() addResourcesToBinaries gimp.rdef $appsDir/GIMP addAppDeskbarSymlink $appsDir/GIMP + + # doc package + mkdir -p $documentationDir/packages/ + mv $dataDir/doc/gimp-3.0 $documentationDir/packages + rm -rf $dataDir/doc + packageEntries doc \ + $documentationDir/packages } diff --git a/media-gfx/gimp/patches/gimp-3.0.6.patchset b/media-gfx/gimp/patches/gimp-3.0.8.patchset similarity index 79% rename from media-gfx/gimp/patches/gimp-3.0.6.patchset rename to media-gfx/gimp/patches/gimp-3.0.8.patchset index 849fc7f63..4449636d4 100644 --- a/media-gfx/gimp/patches/gimp-3.0.6.patchset +++ b/media-gfx/gimp/patches/gimp-3.0.8.patchset @@ -1,19 +1,19 @@ -From 4aa91a40d6ad3fc747aeb5554e31cf411ff777a4 Mon Sep 17 00:00:00 2001 +From a02c16ee16024788da2eba89624daee3743730f6 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 diff --git a/extensions/meson.build b/extensions/meson.build -index 23132c2..305fdba 100644 +index 6b084a8..a2cfc32 100644 --- a/extensions/meson.build +++ b/extensions/meson.build @@ -1,4 +1,4 @@ -subdir('goat-exercises') +#subdir('goat-exercises') + #.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) - lua_config = configuration_data() diff --git a/libgimpbase/gimputils.c b/libgimpbase/gimputils.c index bc4bd39..3ee442b 100644 --- a/libgimpbase/gimputils.c @@ -29,10 +29,10 @@ index bc4bd39..3ee442b 100644 #ifdef HAVE_SYS_PRCTL_H #include diff --git a/meson.build b/meson.build -index 6a914e1..a0502fe 100644 +index 5a4d0c9..63966a0 100644 --- a/meson.build +++ b/meson.build -@@ -171,6 +171,10 @@ platform_linux = ( +@@ -179,6 +179,10 @@ platform_linux = ( host_os.contains('linux') ) @@ -43,7 +43,7 @@ index 6a914e1..a0502fe 100644 platform_windows = ( host_os.contains('mingw') or host_os.contains('cygwin') or -@@ -187,6 +191,10 @@ if platform_osx +@@ -195,6 +199,10 @@ if platform_osx conf.set('PLATFORM_OSX', 1) endif @@ -54,7 +54,7 @@ index 6a914e1..a0502fe 100644 if platform_windows windows = import('windows') # AC_CHECK_PROG(ms_librarian, lib.exe, yes, no) -@@ -732,7 +740,7 @@ conf.set('HAVE_EXCHNDL', drmingw.found()) +@@ -784,7 +792,7 @@ conf.set('HAVE_EXCHNDL', drmingw.found()) ################################################################################ # Check for x11 support @@ -63,7 +63,7 @@ index 6a914e1..a0502fe 100644 x11 = x11_target ? dependency('x11') : no_dep xmu = x11_target ? dependency('xmu') : no_dep -@@ -1069,8 +1077,8 @@ endif +@@ -1119,8 +1127,8 @@ endif isocodes = dependency('iso-codes', required: false) if isocodes.found() isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix') @@ -74,7 +74,7 @@ index 6a914e1..a0502fe 100644 endif conf.set('HAVE_ISO_CODES', isocodes.found()) -@@ -1253,6 +1261,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 +83,7 @@ index 6a914e1..a0502fe 100644 elif platform_windows conf.set_quoted('GIMP_BUILD_PLATFORM_FAMILY', 'windows') elif platform_osx -@@ -1614,10 +1624,7 @@ endif +@@ -1669,10 +1679,7 @@ endif # git-version.h is already present and not generated if dist tarball @@ -95,7 +95,7 @@ index 6a914e1..a0502fe 100644 has_version_h = run_command(python, '-c', 'import sys,os; sys.exit(0 if os.path.exists("git-version.h") else 1)', -@@ -1972,7 +1979,7 @@ else +@@ -2018,7 +2025,7 @@ else gimp_exe_depends = [] endif @@ -105,7 +105,7 @@ index 6a914e1..a0502fe 100644 ################################################################################ # Subdirs: part 2 diff --git a/plug-ins/meson.build b/plug-ins/meson.build -index 98f402f..c2fe93d 100644 +index 8a0bc54..ff914b5 100644 --- a/plug-ins/meson.build +++ b/plug-ins/meson.build @@ -33,7 +33,7 @@ complex_plugins_list = [ @@ -131,10 +131,10 @@ index 55cebf1..9e37373 100644 #else # ifndef _AIX -- -2.51.0 +2.52.0 -From 32782c72c91de6e0fad2a38fd15ef87aaa11b7f7 Mon Sep 17 00:00:00 2001 +From feb4c66ade4787fb85958158195ca5be8be1d541 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 @@ -202,10 +202,10 @@ index bfa08e8..6aeb5b4 100644 void -- -2.51.0 +2.52.0 -From a62897eb6fdf6e2abaab778b82d9b4b1c42b3960 Mon Sep 17 00:00:00 2001 +From b24044245b5579c773881373579de7a8aa5e530b 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 @@ -232,20 +232,20 @@ index ab5e176..a6a9549 100644 gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); -- -2.51.0 +2.52.0 -From d004ad663c264143853c1b52fa5c93c3fe170b46 Mon Sep 17 00:00:00 2001 +From 3c2128357e0a03e3d2327d8de556adf6afee7874 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 7ce100e..daa5e51 100644 +index a77f91f..749a7fe 100644 --- a/app/main.c +++ b/app/main.c -@@ -603,7 +603,9 @@ main (int argc, +@@ -633,7 +633,9 @@ main (int argc, gimp_backtrace_init (); /* Start signal handlers early. */ @@ -256,10 +256,10 @@ index 7ce100e..daa5e51 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 9afb52e..b9ba736 100644 +index f296afe..03f8fa3 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c -@@ -278,8 +278,8 @@ gimp_main (GType plug_in_type, +@@ -287,8 +287,8 @@ gimp_main (GType plug_in_type, /* Similar to core crash handling in app/signals.c, the order here * is very important! */ @@ -270,7 +270,7 @@ index 9afb52e..b9ba736 100644 ExcHndlInit (); -@@ -418,15 +418,15 @@ gimp_main (GType plug_in_type, +@@ -427,15 +427,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. */ @@ -309,10 +309,10 @@ index 0c00c2f..4deaf32 100644 struct sigaction sa; struct sigaction osa; -- -2.51.0 +2.52.0 -From 1e43fc972dfbd0a40acbc613e2c0ca343d93e6d0 Mon Sep 17 00:00:00 2001 +From 63f44dcb9fe490f703697363e8ae2b6fe3ff3914 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 @@ -347,5 +347,41 @@ index d242ff2..96bc331 100644 NSURL *ns_url; -- -2.51.0 +2.52.0 + + +From d859598da22c011da09fbf76c1d03d78d2472e7c Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +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 +--- 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', + '--no-namespace-dir', + '--content-dir=@0@'.format(meson.current_source_dir()), + '--add-include-path=@0@'.format(meson.project_build_root() / 'libgimp'), +- '--add-include-path=@0@'.format(get_option('prefix') / 'share' / 'gir-1.0'), ++ '--add-include-path=@0@'.format(('/boot/system') / 'data' / 'gir-1.0'), + '@INPUT@', + ], + depends: libgimp_gir[0], +diff --git a/devel-docs/reference/gimp/meson.build b/devel-docs/reference/gimp/meson.build +index 357a8a8..8918f8e 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', + '--output-dir=@OUTPUT@', + '--no-namespace-dir', + '--content-dir=@0@'.format(meson.current_source_dir()), +- '--add-include-path=@0@'.format(get_option('prefix') / 'share' / 'gir-1.0'), ++ '--add-include-path=@0@'.format(('/boot/system') / 'data' / 'gir-1.0'), + '@INPUT@', + ], + depend_files: [ +-- +2.52.0