mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
gimp: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -10,7 +10,7 @@ COPYRIGHT="The GIMP Team"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.gimp.org/mirror/pub/gimp/v2.99/gimp-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="313a205475d1ff03c5c4d9602f09f5c975ba6c1c79d8843e2396f9fe2abdf7a8"
|
||||
CHECKSUM_SHA256="8c1bb7a94ac0d4d0cde4d701d8b356387c2ecd87abbd35bbf7d222d40f6ddb6e"
|
||||
PATCHES="gimp-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="gimp.rdef.in"
|
||||
|
||||
@@ -21,7 +21,6 @@ GLOBAL_WRITABLE_FILES="
|
||||
settings/gimp/2.99/controllerrc keep-old
|
||||
settings/gimp/2.99/gimp.css keep-old
|
||||
settings/gimp/2.99/gimprc keep-old
|
||||
settings/gimp/2.99/menurc keep-old
|
||||
settings/gimp/2.99/sessionrc keep-old
|
||||
settings/gimp/2.99/templaterc keep-old
|
||||
settings/gimp/2.99/toolrc keep-old
|
||||
@@ -49,16 +48,16 @@ PROVIDES="
|
||||
cmd:gimp_test_clipboard_2.99$commandSuffix = $portVersion
|
||||
cmd:gimptool$commandSuffix = $portVersion
|
||||
cmd:gimptool_2.99$commandSuffix = $portVersion
|
||||
lib:libgimp_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimp_scriptfu_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimpbase_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimpcolor_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimpconfig_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimpmath_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimpmodule_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimpthumb_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimpui_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimpwidgets_3.0$secondaryArchSuffix = 0.0.14 compat >= 0
|
||||
lib:libgimp_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimp_scriptfu_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimpbase_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimpcolor_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimpconfig_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimpmath_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimpmodule_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimpthumb_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimpui_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
lib:libgimpwidgets_3.0$secondaryArchSuffix = 0.0.18 compat >= 0
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -77,9 +76,10 @@ REQUIRES="
|
||||
lib:libgexiv2$secondaryArchSuffix
|
||||
lib:libgdk_3$secondaryArchSuffix
|
||||
lib:libgdk_pixbuf_2.0$secondaryArchSuffix
|
||||
lib:libgtk_3$secondaryArchSuffix
|
||||
lib:libgirepository_1.0$secondaryArchSuffix
|
||||
lib:libglib_2.0$secondaryArchSuffix
|
||||
lib:libglib_networking_2.0$secondaryArchSuffix
|
||||
lib:libgtk_3$secondaryArchSuffix
|
||||
lib:libharfbuzz$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libjson_c$secondaryArchSuffix
|
||||
@@ -129,7 +129,7 @@ BUILD_REQUIRES="
|
||||
devel:libmypaint$secondaryArchSuffix
|
||||
devel:libpango_1.0$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libpoppler$secondaryArchSuffix >= 117
|
||||
devel:libpoppler$secondaryArchSuffix >= 131
|
||||
devel:librsvg_2$secondaryArchSuffix
|
||||
devel:libtiff$secondaryArchSuffix
|
||||
devel:libuuid$secondaryArchSuffix >= 1.3
|
||||
@@ -1,21 +1,24 @@
|
||||
From 2574804c7277f39edc0cba39f0f7cfc4a1db77df Mon Sep 17 00:00:00 2001
|
||||
From 7af8985a55616452a0029b8af6e60b787ca03255 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 18 Nov 2022 23:26:23 +1000
|
||||
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 4c40775..a4bc366 100644
|
||||
index 3bb1681..e89a6b4 100644
|
||||
--- a/extensions/meson.build
|
||||
+++ b/extensions/meson.build
|
||||
@@ -1 +1 @@
|
||||
@@ -1,4 +1,4 @@
|
||||
-subdir('goat-exercises')
|
||||
+#subdir('goat-exercises')
|
||||
|
||||
# Fallback fix to the problem of non-configured interpreters
|
||||
if platform_windows and not meson.is_cross_build() and lua.found()
|
||||
diff --git a/libgimpbase/gimputils.c b/libgimpbase/gimputils.c
|
||||
index 227efd5..a891ef6 100644
|
||||
index daadac0..f45dc9d 100644
|
||||
--- a/libgimpbase/gimputils.c
|
||||
+++ b/libgimpbase/gimputils.c
|
||||
@@ -50,7 +50,9 @@
|
||||
@@ -51,7 +51,9 @@
|
||||
|
||||
/* For thread IDs. */
|
||||
#include <sys/types.h>
|
||||
@@ -26,10 +29,10 @@ index 227efd5..a891ef6 100644
|
||||
#ifdef HAVE_SYS_PRCTL_H
|
||||
#include <sys/prctl.h>
|
||||
diff --git a/meson.build b/meson.build
|
||||
index daae225..e951060 100644
|
||||
index 85feb5c..57bd9b9 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -150,6 +150,10 @@ if platform_osx
|
||||
@@ -154,6 +154,10 @@ if platform_osx
|
||||
conf.set('PLATFORM_OSX', 1)
|
||||
endif
|
||||
|
||||
@@ -40,7 +43,7 @@ index daae225..e951060 100644
|
||||
if platform_windows
|
||||
windows = import('windows')
|
||||
# AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
|
||||
@@ -585,7 +589,7 @@ detailed_backtraces = (
|
||||
@@ -602,7 +606,7 @@ detailed_backtraces = (
|
||||
################################################################################
|
||||
# Check for x11 support
|
||||
|
||||
@@ -49,20 +52,20 @@ index daae225..e951060 100644
|
||||
|
||||
x11 = x11_target ? dependency('x11') : no_dep
|
||||
xmu = x11_target ? dependency('xmu') : no_dep
|
||||
@@ -1486,10 +1490,7 @@ endif
|
||||
@@ -1614,10 +1618,7 @@ endif
|
||||
|
||||
|
||||
# git-version.h is already present and not generated if dist tarball
|
||||
-is_git_repository = run_command('python3', '-c',
|
||||
-is_git_repository = run_command(python, '-c',
|
||||
- 'import sys,os; sys.exit(0 if os.path.exists(".git") else 1)',
|
||||
- check: false
|
||||
-).returncode() == 0
|
||||
+is_git_repository = false
|
||||
|
||||
has_version_h = run_command('python3', '-c',
|
||||
has_version_h = run_command(python, '-c',
|
||||
'import sys,os; sys.exit(0 if os.path.exists("git-version.h") else 1)',
|
||||
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
|
||||
index 22556d6..c687610 100644
|
||||
index e1c6ad8..bf208ec 100644
|
||||
--- a/plug-ins/meson.build
|
||||
+++ b/plug-ins/meson.build
|
||||
@@ -28,7 +28,7 @@ subdir('metadata')
|
||||
@@ -75,10 +78,10 @@ index 22556d6..c687610 100644
|
||||
subdir('selection-to-path')
|
||||
subdir('twain')
|
||||
diff --git a/plug-ins/script-fu/server/script-fu-server.c b/plug-ins/script-fu/server/script-fu-server.c
|
||||
index d9544f1..c278be7 100644
|
||||
index 7bf9ed6..c1527e1 100644
|
||||
--- a/plug-ins/script-fu/server/script-fu-server.c
|
||||
+++ b/plug-ins/script-fu/server/script-fu-server.c
|
||||
@@ -115,7 +115,7 @@ typedef short sa_family_t; /* Not defined by winsock */
|
||||
@@ -105,7 +105,7 @@ typedef short sa_family_t; /* Not defined by winsock */
|
||||
#define difftime(a,b) (((gdouble)(a)) - ((gdouble)(b)))
|
||||
#endif
|
||||
|
||||
@@ -88,12 +91,12 @@ index d9544f1..c278be7 100644
|
||||
#else
|
||||
# ifndef _AIX
|
||||
--
|
||||
2.37.3
|
||||
2.43.2
|
||||
|
||||
|
||||
From cbd1cab2d925a02f25f854fc537b9a15cdf761ab Mon Sep 17 00:00:00 2001
|
||||
From 0b0b7a0dbfeacbd295758fc566c835b98eb7c160 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 18 Nov 2022 23:26:58 +1000
|
||||
Date: Sat, 16 Mar 2024 23:24:11 +1000
|
||||
Subject: Use load_image instead g_spawn_async
|
||||
|
||||
|
||||
@@ -159,20 +162,20 @@ index bfa08e8..6aeb5b4 100644
|
||||
|
||||
void
|
||||
--
|
||||
2.37.3
|
||||
2.43.2
|
||||
|
||||
|
||||
From 34cd6ce1744147e8e13db144ea27c6f6d659e0fc Mon Sep 17 00:00:00 2001
|
||||
From 161c69fa7dc953551f96e7831247380c7a236a10 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 18 Nov 2022 23:27:18 +1000
|
||||
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 e1d3402..80b0d18 100644
|
||||
index 0da05a7..fc1bb0c 100644
|
||||
--- a/app/dialogs/preferences-dialog.c
|
||||
+++ b/app/dialogs/preferences-dialog.c
|
||||
@@ -1370,6 +1370,7 @@ prefs_dialog_new (Gimp *gimp,
|
||||
@@ -1225,6 +1225,7 @@ prefs_dialog_new (Gimp *gimp,
|
||||
* which case the feature is always available.
|
||||
*/
|
||||
hbox = NULL;
|
||||
@@ -180,7 +183,7 @@ index e1d3402..80b0d18 100644
|
||||
if (! gimp_stack_trace_available (TRUE))
|
||||
{
|
||||
#ifndef HAVE_EXECINFO_H
|
||||
@@ -1381,6 +1382,7 @@ prefs_dialog_new (Gimp *gimp,
|
||||
@@ -1236,6 +1237,7 @@ prefs_dialog_new (Gimp *gimp,
|
||||
_("This feature is more efficient with \"gdb\" or \"lldb\" installed on your system."));
|
||||
#endif /* ! HAVE_EXECINFO_H */
|
||||
}
|
||||
@@ -189,62 +192,34 @@ index e1d3402..80b0d18 100644
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
|
||||
|
||||
--
|
||||
2.37.3
|
||||
2.43.2
|
||||
|
||||
|
||||
From 2268073ff3476307b22a2b0d20005306e17dc244 Mon Sep 17 00:00:00 2001
|
||||
From 7bd3e0bfe2e6b9517250f10b1d0319bb66a6ce4f Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 18 Nov 2022 23:28:02 +1000
|
||||
Subject: Dirty hack for XDG variables
|
||||
|
||||
|
||||
diff --git a/app/main.c b/app/main.c
|
||||
index e25edd1..aba431b 100644
|
||||
--- a/app/main.c
|
||||
+++ b/app/main.c
|
||||
@@ -555,6 +555,14 @@ main (int argc,
|
||||
gint retval;
|
||||
gint i;
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ g_setenv ("XDG_CONFIG_DIRS", "/boot/system/settings", FALSE);
|
||||
+ g_setenv ("XDG_DATA_HOME", "/boot/home/config/non-packaged/data", FALSE);
|
||||
+ g_setenv ("XDG_CONFIG_HOME", "/boot/home/config/settings", FALSE);
|
||||
+ g_setenv ("XDG_CACHE_HOME", "/boot/home/config/cache", FALSE);
|
||||
+ g_setenv ("XDG_DATA_DIRS", "/boot/system/non-packaged/data:/boot/system/data", FALSE);
|
||||
+#endif
|
||||
+
|
||||
#ifdef ENABLE_WIN32_DEBUG_CONSOLE
|
||||
gimp_open_console_window ();
|
||||
#endif
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From ef6450e32859648bf76c180a74749d5c3ec0a863 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 18 Nov 2022 23:28:33 +1000
|
||||
Date: Sat, 16 Mar 2024 23:26:30 +1000
|
||||
Subject: Disable signal handlers
|
||||
|
||||
|
||||
diff --git a/app/main.c b/app/main.c
|
||||
index aba431b..2c801c5 100644
|
||||
index 1adc133..17dcd0e 100644
|
||||
--- a/app/main.c
|
||||
+++ b/app/main.c
|
||||
@@ -603,7 +603,7 @@ main (int argc,
|
||||
@@ -591,7 +591,9 @@ main (int argc,
|
||||
gimp_backtrace_init ();
|
||||
|
||||
/* Start signal handlers early. */
|
||||
- gimp_init_signal_handlers (&backtrace_file);
|
||||
+ //gimp_init_signal_handlers (&backtrace_file);
|
||||
+#ifndef __HAIKU__
|
||||
gimp_init_signal_handlers (&backtrace_file);
|
||||
+#endif
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
/* Reduce risks */
|
||||
/* Enable Anti-Aliasing*/
|
||||
diff --git a/libgimp/gimp.c b/libgimp/gimp.c
|
||||
index 136740d..b6819f9 100644
|
||||
index e00989b..4de4534 100644
|
||||
--- a/libgimp/gimp.c
|
||||
+++ b/libgimp/gimp.c
|
||||
@@ -270,8 +270,8 @@ gimp_main (GType plug_in_type,
|
||||
@@ -244,8 +244,8 @@ gimp_main (GType plug_in_type,
|
||||
/* Similar to core crash handling in app/signals.c, the order here
|
||||
* is very important!
|
||||
*/
|
||||
@@ -254,8 +229,8 @@ index 136740d..b6819f9 100644
|
||||
+// _prevExceptionFilter = SetUnhandledExceptionFilter (gimp_plugin_sigfatal_handler);
|
||||
|
||||
ExcHndlInit ();
|
||||
ExcHndlSetLogFileNameA (plug_in_backtrace_path);
|
||||
@@ -395,15 +395,15 @@ gimp_main (GType plug_in_type,
|
||||
|
||||
@@ -376,15 +376,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.
|
||||
*/
|
||||
@@ -294,20 +269,20 @@ index 4e334f6..ca190a2 100644
|
||||
struct sigaction sa;
|
||||
struct sigaction osa;
|
||||
--
|
||||
2.37.3
|
||||
2.43.2
|
||||
|
||||
|
||||
From 3737516789be91e1ff470813d8330cf961a5e7c4 Mon Sep 17 00:00:00 2001
|
||||
From 1a79e5fec10f7cada49f5ebfa0d8e165faab1e9e Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 18 Nov 2022 23:29:16 +1000
|
||||
Date: Sat, 16 Mar 2024 23:26:44 +1000
|
||||
Subject: Disable introspection
|
||||
|
||||
|
||||
diff --git a/libgimp/meson.build b/libgimp/meson.build
|
||||
index 82a91e4..fa92bb8 100644
|
||||
index bc9727e..d57fd28 100644
|
||||
--- a/libgimp/meson.build
|
||||
+++ b/libgimp/meson.build
|
||||
@@ -418,7 +418,7 @@ libgimpui_introspectable_files = [
|
||||
@@ -436,7 +436,7 @@ libgimpui_introspectable_files = [
|
||||
libgimpwidgets_introspectable,
|
||||
]
|
||||
|
||||
@@ -317,5 +292,5 @@ index 82a91e4..fa92bb8 100644
|
||||
gobject_introspection_warning = '\n '.join(['',
|
||||
'GObject Introspection is disabled while cross-compiling because',
|
||||
--
|
||||
2.37.3
|
||||
2.43.2
|
||||
|
||||
Reference in New Issue
Block a user