haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gimp, bump to 3.0.6 (#13079)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-10-20 09:51:27 +02:00
committed by GitHub
parent a7759a8f2e
commit 126d4f0f5e
2 changed files with 42 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media-gfx/gimp/gimp-3.0.4.recipe → media-gfx/gimp/gimp-3.0.6.recipe
View File

@@ -8,10 +8,9 @@ and 3rd party plugins."
HOMEPAGE="https://www.gimp.org/"
COPYRIGHT="The GIMP Team"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="1"
SOURCE_URI="https://download.gimp.org/mirror/pub/gimp/v3.0/gimp-$portVersion.tar.xz"
CHECKSUM_SHA256="8caa2ec275bf09326575654ac276afc083f8491e7cca45d19cf29e696aecab25"
SOURCE_DIR="gimp-$portVersion"
CHECKSUM_SHA256="246c225383c72ef9f0dc7703b7d707084bbf177bd2900e94ce466a62862e296b"
PATCHES="gimp-$portVersion.patchset"
ADDITIONAL_FILES="
gimp.rdef.in
@@ -75,6 +74,7 @@ REQUIRES="
haiku$secondaryArchSuffix
mypaint_brushes
shared_mime_info$secondaryArchSuffix
lib:libappstream$secondaryArchSuffix
lib:libappstream_glib$secondaryArchSuffix
lib:libarchive$secondaryArchSuffix
lib:libatk_1.0$secondaryArchSuffix
@@ -124,11 +124,12 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
gobject_introspection${secondaryArchSuffix}_devel
packaging_python310
pygobject_python310
pygments_python310
mypaint_brushes
wayland_protocols
devel:libappstream$secondaryArchSuffix
devel:libappstream_glib$secondaryArchSuffix
devel:libarchive$secondaryArchSuffix
devel:libatk_1.0$secondaryArchSuffix

133
media-gfx/gimp/patches/gimp-3.0.4.patchset → media-gfx/gimp/patches/gimp-3.0.6.patchset
View File

@@ -1,4 +1,4 @@
From c94a4ad74eb35eb7b1c158a2c602bf5b4a6dacaa Mon Sep 17 00:00:00 2001
From 4aa91a40d6ad3fc747aeb5554e31cf411ff777a4 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 23132c2..305fdba 100644
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 18bfe5a..e24e3da 100644
index bc4bd39..3ee442b 100644
--- a/libgimpbase/gimputils.c
+++ b/libgimpbase/gimputils.c
@@ -51,7 +51,9 @@
@@ -29,10 +29,10 @@ index 18bfe5a..e24e3da 100644
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
diff --git a/meson.build b/meson.build
index c069c68..a66500c 100644
index 6a914e1..a0502fe 100644
--- a/meson.build
+++ b/meson.build
@@ -177,6 +177,10 @@ platform_linux = (
@@ -171,6 +171,10 @@ platform_linux = (
host_os.contains('linux')
)
@@ -43,7 +43,7 @@ index c069c68..a66500c 100644
platform_windows = (
host_os.contains('mingw') or
host_os.contains('cygwin') or
@@ -193,6 +197,10 @@ if platform_osx
@@ -187,6 +191,10 @@ if platform_osx
conf.set('PLATFORM_OSX', 1)
endif
@@ -54,7 +54,7 @@ index c069c68..a66500c 100644
if platform_windows
windows = import('windows')
# AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
@@ -711,7 +719,7 @@ conf.set('HAVE_EXCHNDL', drmingw.found())
@@ -732,7 +740,7 @@ conf.set('HAVE_EXCHNDL', drmingw.found())
################################################################################
# Check for x11 support
@@ -63,7 +63,7 @@ index c069c68..a66500c 100644
x11 = x11_target ? dependency('x11') : no_dep
xmu = x11_target ? dependency('xmu') : no_dep
@@ -1148,8 +1156,8 @@ endif
@@ -1069,8 +1077,8 @@ endif
isocodes = dependency('iso-codes', required: false)
if isocodes.found()
isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix')
@@ -74,7 +74,7 @@ index c069c68..a66500c 100644
endif
conf.set('HAVE_ISO_CODES', isocodes.found())
@@ -1353,6 +1361,8 @@ conf.set_quoted('GIMP_BUILD_ID', get_option('build-id'))
@@ -1253,6 +1261,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 c069c68..a66500c 100644
elif platform_windows
conf.set_quoted('GIMP_BUILD_PLATFORM_FAMILY', 'windows')
elif platform_osx
@@ -1714,10 +1724,7 @@ endif
@@ -1614,10 +1624,7 @@ endif
# git-version.h is already present and not generated if dist tarball
@@ -95,7 +95,7 @@ index c069c68..a66500c 100644
has_version_h = run_command(python, '-c',
'import sys,os; sys.exit(0 if os.path.exists("git-version.h") else 1)',
@@ -2057,7 +2064,7 @@ else
@@ -1972,7 +1979,7 @@ else
gimp_exe_depends = []
endif
@@ -105,18 +105,18 @@ index c069c68..a66500c 100644
################################################################################
# Subdirs: part 2
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index e1c6ad8..bf208ec 100644
index 98f402f..c2fe93d 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -28,7 +28,7 @@ subdir('metadata')
subdir('pagecurl')
subdir('print')
subdir('python')
-subdir('screenshot')
+#subdir('screenshot')
subdir('script-fu')
subdir('selection-to-path')
subdir('twain')
@@ -33,7 +33,7 @@ complex_plugins_list = [
{ 'name': 'metadata', },
{ 'name': 'pagecurl', },
{ 'name': 'print', },
- { 'name': 'screenshot', },
+# { 'name': 'screenshot', },
{ 'name': 'script-fu', },
{ 'name': 'selection-to-path', }
]
diff --git a/plug-ins/script-fu/server/script-fu-server.c b/plug-ins/script-fu/server/script-fu-server.c
index 55cebf1..9e37373 100644
--- a/plug-ins/script-fu/server/script-fu-server.c
@@ -131,10 +131,10 @@ index 55cebf1..9e37373 100644
#else
# ifndef _AIX
--
2.48.1
2.51.0
From 10057d31a0d6ea293938c384120810c2fb98b41f Mon Sep 17 00:00:00 2001
From 32782c72c91de6e0fad2a38fd15ef87aaa11b7f7 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,20 +202,20 @@ index bfa08e8..6aeb5b4 100644
void
--
2.48.1
2.51.0
From 69952673825682ea339103270ba1d06622c6c8e3 Mon Sep 17 00:00:00 2001
From a62897eb6fdf6e2abaab778b82d9b4b1c42b3960 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 170d42e..07f66ea 100644
index ab5e176..a6a9549 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1333,6 +1333,7 @@ prefs_dialog_new (Gimp *gimp,
@@ -1330,6 +1330,7 @@ prefs_dialog_new (Gimp *gimp,
* which case the feature is always available.
*/
hbox = NULL;
@@ -223,7 +223,7 @@ index 170d42e..07f66ea 100644
if (! gimp_stack_trace_available (TRUE))
{
#ifndef HAVE_EXECINFO_H
@@ -1344,6 +1345,7 @@ prefs_dialog_new (Gimp *gimp,
@@ -1341,6 +1342,7 @@ prefs_dialog_new (Gimp *gimp,
_("This feature is more efficient with \"gdb\" or \"lldb\" installed on your system."));
#endif /* ! HAVE_EXECINFO_H */
}
@@ -232,20 +232,20 @@ index 170d42e..07f66ea 100644
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
--
2.48.1
2.51.0
From c39e566d75dbce43595f2b5e024d0defaa75836a Mon Sep 17 00:00:00 2001
From d004ad663c264143853c1b52fa5c93c3fe170b46 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 9db78ed..377bf7c 100644
index 7ce100e..daa5e51 100644
--- a/app/main.c
+++ b/app/main.c
@@ -591,7 +591,9 @@ main (int argc,
@@ -603,7 +603,9 @@ main (int argc,
gimp_backtrace_init ();
/* Start signal handlers early. */
@@ -256,10 +256,10 @@ index 9db78ed..377bf7c 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 48a2d1f..a8d75e7 100644
index 9afb52e..b9ba736 100644
--- a/libgimp/gimp.c
+++ b/libgimp/gimp.c
@@ -257,8 +257,8 @@ gimp_main (GType plug_in_type,
@@ -278,8 +278,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 48a2d1f..a8d75e7 100644
ExcHndlInit ();
@@ -389,15 +389,15 @@ gimp_main (GType plug_in_type,
@@ -418,15 +418,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.48.1
2.51.0
From 325e65df84ff4a2a600a4540e9f7ec2cf71e1195 Mon Sep 17 00:00:00 2001
From 1e43fc972dfbd0a40acbc613e2c0ca343d93e6d0 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,64 +347,5 @@ index d242ff2..96bc331 100644
NSURL *ns_url;
--
2.48.1
From 932325d5b8093fec7a8296ca584e4ccf915bee97 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 18 Mar 2025 12:08:38 +0000
Subject: Remove generate introspection
diff --git a/libgimp/meson.build b/libgimp/meson.build
index e191576..914601f 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -504,44 +504,6 @@ else
'--quiet',
]
- libgimp_gir = gnome.generate_gir(
- libgimp,
- libgimpbase,
- libgimpcolor,
- libgimpconfig,
- libgimpmath,
- libgimpmodule,
-
- sources: libgimp_introspectable_files,
- nsversion: gimp_api_version,
- namespace: 'Gimp',
- identifier_prefix: 'Gimp',
- symbol_prefix: 'gimp',
- export_packages: 'gimp-' + gimp_api_version,
- header: 'libgimp/gimp.h',
- includes: libgimp_gir_includes,
- extra_args: gir_args,
- include_directories: rootInclude,
- install: true,
- )
-
- libgimpui_gir = gnome.generate_gir(
- libgimpui,
- libgimpwidgets,
-
- sources: libgimpui_introspectable_files,
- nsversion: gimp_api_version,
- namespace: 'GimpUi',
- identifier_prefix: 'Gimp',
- symbol_prefix: [ 'gimp_ui', 'gimp' ],
- export_packages: 'gimp-ui-' + gimp_api_version,
- header: 'libgimp/gimpui.h',
- includes: [ libgimp_gir_includes, 'Gtk-3.0', libgimp_gir[0] ],
- extra_args: gir_args,
- include_directories: rootInclude,
- install: true,
- )
-
if platform_osx
g_ir_compiler = find_program('g-ir-compiler')
gimp_exe_typelib = custom_target('macos-typelib.stamp',
--
2.48.1
2.51.0