diff --git a/.gitignore b/.gitignore index 4a4520b..6f42eea 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2 /gimp-2.10.34.tar.bz2 /gimp-2.10.36.tar.bz2 /gimp-2.10.38.tar.bz2 +/gimp-2.99.19-git256e0ca5a0.tar.xz diff --git a/0001-Don-t-require-unreleased-gegl-version.patch b/0001-Don-t-require-unreleased-gegl-version.patch new file mode 100644 index 0000000..fa3dd4b --- /dev/null +++ b/0001-Don-t-require-unreleased-gegl-version.patch @@ -0,0 +1,79 @@ +From 54231e7d405bfd674f75f2d87ff5ce3ad025b45c Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Wed, 14 Aug 2024 13:44:21 +0200 +Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20require=20unreleased=20gegl=20v?= + =?UTF-8?q?ersion?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit c28fa121480d2ea34139c9cc794add4236e99eb7. + +Signed-off-by: Nils Philippsen +--- + app/tools/gimpoperationtool.c | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c +index 82f6096b55..f427ee9019 100644 +--- a/app/tools/gimpoperationtool.c ++++ b/app/tools/gimpoperationtool.c +@@ -103,8 +103,7 @@ static void gimp_operation_tool_add_gui (GimpOperationTool *tool) + static AuxInput * gimp_operation_tool_aux_input_new (GimpOperationTool *tool, + GeglNode *operation, + const gchar *input_pad, +- const gchar *label, +- const gchar *description); ++ const gchar *label); + static void gimp_operation_tool_aux_input_detach(AuxInput *input); + static void gimp_operation_tool_aux_input_clear (AuxInput *input); + static void gimp_operation_tool_aux_input_free (AuxInput *input); +@@ -550,20 +549,15 @@ gimp_operation_tool_create_gui (GimpOperationTool *op_tool) + + g_return_if_fail (regex != NULL); + +- label = g_strdup (gegl_node_get_pad_label (filter_tool->operation, input_pads[i])); +- +- if (label == NULL) +- label = g_regex_replace (regex, +- input_pads[i], -1, 0, +- /* Translators: don't translate "Aux" */ +- _("Aux\\1 Input"), +- 0, NULL); ++ /* Translators: don't translate "Aux" */ ++ label = g_regex_replace (regex, ++ input_pads[i], -1, 0, ++ _("Aux\\1 Input"), ++ 0, NULL); + + input = gimp_operation_tool_aux_input_new (op_tool, + filter_tool->operation, +- input_pads[i], label, +- gegl_node_get_pad_description (filter_tool->operation, +- input_pads[i])); ++ input_pads[i], label); + + op_tool->aux_inputs = g_list_prepend (op_tool->aux_inputs, input); + +@@ -663,8 +657,7 @@ static AuxInput * + gimp_operation_tool_aux_input_new (GimpOperationTool *op_tool, + GeglNode *operation, + const gchar *input_pad, +- const gchar *label, +- const gchar *description) ++ const gchar *label) + { + AuxInput *input = g_slice_new (AuxInput); + GimpContext *context; +@@ -681,8 +674,6 @@ gimp_operation_tool_aux_input_new (GimpOperationTool *op_tool, + context = GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (op_tool)); + + input->box = gimp_buffer_source_box_new (context, input->node, label); +- if (description) +- gtk_widget_set_tooltip_text (input->box, description); + + /* make AuxInput owner of the box */ + g_object_ref_sink (input->box); +-- +2.46.0 + diff --git a/README.md b/README.md new file mode 100644 index 0000000..93230c2 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# gimp + +The gimp package diff --git a/gimp-2.10.12-default-font.patch b/gimp-2.10.12-default-font.patch deleted file mode 100644 index 301e4a6..0000000 --- a/gimp-2.10.12-default-font.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp a/etc/gimprc.in b/etc/gimprc.in ---- a/etc/gimprc.in 2019-08-20 13:03:43.195089141 +0200 -+++ b/etc/gimprc.in 2019-08-20 13:04:09.109353485 +0200 -@@ -153,7 +153,7 @@ - # Where to look for fonts in addition to the system-wide installed fonts. - # This is a colon-separated list of folders to search. - # --# (font-path "${gimp_dir}/fonts:${gimp_data_dir}/fonts") -+(font-path "${gimp_dir}/fonts") - - # Specify a default brush. The brush is searched for in the specified brush - # path. This is a string value. diff --git a/gimp-2.10.18-no-phone-home-default.patch b/gimp-2.10.18-no-phone-home-default.patch deleted file mode 100644 index 2054b4a..0000000 --- a/gimp-2.10.18-no-phone-home-default.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gimp-2.10.18/etc/gimprc.in.no-phone-home-default gimp-2.10.18/etc/gimprc.in ---- gimp-2.10.18/etc/gimprc.in.no-phone-home-default 2020-02-23 21:15:47.217777581 +0100 -+++ gimp-2.10.18/etc/gimprc.in 2020-02-23 21:22:42.416162110 +0100 -@@ -393,7 +393,7 @@ - # Check for availability of GIMP updates through background internet queries. - # Possible values are yes and no. - # --# (check-updates yes) -+(check-updates no) - - # Timestamp of the last update check. (null) - # diff --git a/gimp-2.10.24-external-help-browser.patch b/gimp-2.10.24-external-help-browser.patch deleted file mode 100644 index 09f4118..0000000 --- a/gimp-2.10.24-external-help-browser.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gimp-2.10.24/etc/gimprc.in.external-help-browser gimp-2.10.24/etc/gimprc.in ---- gimp-2.10.24/etc/gimprc.in.external-help-browser 2021-04-03 00:02:39.312656132 +0200 -+++ gimp-2.10.24/etc/gimprc.in 2021-04-03 00:03:27.360453285 +0200 -@@ -836,7 +836,7 @@ - # Sets the browser used by the help system. Possible values are gimp and - # web-browser. - # --# (help-browser web-browser) -+(help-browser web-browser) - - # When enabled, a search of actions will also return inactive actions. - # Possible values are yes and no. diff --git a/gimp-2.10.0-cm-system-monitor-profile-by-default.patch b/gimp-2.99.19-cm-system-monitor-profile-by-default.patch similarity index 54% rename from gimp-2.10.0-cm-system-monitor-profile-by-default.patch rename to gimp-2.99.19-cm-system-monitor-profile-by-default.patch index 96a875d..0e036f8 100644 --- a/gimp-2.10.0-cm-system-monitor-profile-by-default.patch +++ b/gimp-2.99.19-cm-system-monitor-profile-by-default.patch @@ -1,8 +1,7 @@ -diff --git a/etc/gimprc.in b/etc/gimprc.in -index bdf8f0c..e6757e8 100644 ---- a/etc/gimprc.in -+++ b/etc/gimprc.in -@@ -317,9 +317,9 @@ +diff -up gimp-2.99.18/etc/gimprc.in.cm-system-monitor-profile-by-default gimp-2.99.18/etc/gimprc.in +--- gimp-2.99.18/etc/gimprc.in.cm-system-monitor-profile-by-default 2024-02-17 18:01:20.000000000 +0100 ++++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:39:06.468575598 +0200 +@@ -316,9 +316,9 @@ # Defines the color management behavior. This is a parameter list. # @@ -14,14 +13,12 @@ index bdf8f0c..e6757e8 100644 # (display-rendering-intent relative-colorimetric) # (display-use-black-point-compensation yes) # (display-optimize yes) -@@ -328,9 +328,8 @@ +@@ -326,7 +326,8 @@ + # (simulation-use-black-point-compensation no) # (simulation-optimize yes) # (simulation-gamut-check no) - # (out-of-gamut-color (color-rgb 1 0 1)) --# (show-rgb-u8 no) --# (show-hsv no) --# (display-module "CdisplayLcms")) -+# (display-module "CdisplayLcms") +-# (out-of-gamut-color (color-rgb 1 0 1))) ++# (out-of-gamut-color (color-rgb 1 0 1)) +) # Keep a permanent record of all opened and saved files in the Recent diff --git a/gimp-2.99.19-external-help-browser.patch b/gimp-2.99.19-external-help-browser.patch new file mode 100644 index 0000000..44e3aab --- /dev/null +++ b/gimp-2.99.19-external-help-browser.patch @@ -0,0 +1,12 @@ +diff -up gimp-2.99.18/etc/gimprc.in.external-help-browser gimp-2.99.18/etc/gimprc.in +--- gimp-2.99.18/etc/gimprc.in.external-help-browser 2024-05-07 14:41:40.660506520 +0200 ++++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:46:04.028680986 +0200 +@@ -828,7 +828,7 @@ + # Sets the browser used by the help system. Possible values are gimp and + # web-browser. + # +-# (help-browser gimp) ++(help-browser web-browser) + + # The maximum number of actions saved in history. This is an integer value. + # diff --git a/gimp-2.99.19-no-phone-home-default.patch b/gimp-2.99.19-no-phone-home-default.patch new file mode 100644 index 0000000..a537498 --- /dev/null +++ b/gimp-2.99.19-no-phone-home-default.patch @@ -0,0 +1,12 @@ +diff -up gimp-2.99.18/etc/gimprc.in.no-phone-home-default gimp-2.99.18/etc/gimprc.in +--- gimp-2.99.18/etc/gimprc.in.no-phone-home-default 2024-05-07 14:40:02.746185394 +0200 ++++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:40:49.353862228 +0200 +@@ -399,7 +399,7 @@ + # Check for availability of GIMP updates through background internet queries. + # Possible values are yes and no. + # +-# (check-updates yes) ++(check-updates no) + + # Timestamp of the last update check. This is an integer value. + # diff --git a/gimp-configure-c99.patch b/gimp-configure-c99.patch deleted file mode 100644 index d9ed54b..0000000 --- a/gimp-configure-c99.patch +++ /dev/null @@ -1,56 +0,0 @@ -Do not call the undeclared exit function. Implicit function -declarations are likely not going to be supported by future compilers -by default, changing the outcome of this configure probe. - -Submitted upstream: - -diff --git a/configure b/configure -index 6e62da8e3c164f82..f1c447baf7ff68f7 100755 ---- a/configure -+++ b/configure -@@ -28898,17 +28898,17 @@ else $as_nop - char *shmaddr; - id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600); - if (id == -1) -- exit (2); -+ return 2; - shmaddr = shmat (id, 0, 0); - shmctl (id, IPC_RMID, 0); - if ((char*) shmat (id, 0, 0) == (char*) -1) - { - shmdt (shmaddr); -- exit (1); -+ return 1; - } - shmdt (shmaddr); - shmdt (shmaddr); -- exit (0); -+ return 0; - } - - _ACEOF -diff --git a/configure.ac b/configure.ac -index d73f56228712f59d..32d2a072863ae64f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1284,17 +1284,17 @@ elif test "x$shmtype" = "xsysv"; then - char *shmaddr; - id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600); - if (id == -1) -- exit (2); -+ return 2; - shmaddr = shmat (id, 0, 0); - shmctl (id, IPC_RMID, 0); - if ((char*) shmat (id, 0, 0) == (char*) -1) - { - shmdt (shmaddr); -- exit (1); -+ return 1; - } - shmdt (shmaddr); - shmdt (shmaddr); -- exit (0); -+ return 0; - } - ]])], - [AC_DEFINE([IPC_RMID_DEFERRED_RELEASE],[1], diff --git a/gimp.spec b/gimp.spec index f126c37..57d16ca 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,92 +1,169 @@ #### options: # Use the following --with/--without