From d22041f921be39ec7fb775dba1bea45b922b824f Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 2 Apr 2021 23:59:08 +0200
Subject: [PATCH] Update to 2.10.24

... and rebase gimp-2.10.24-external-help-browser.patch
---
 .gitignore                               |  1 +
 gimp-2.10.0-external-help-browser.patch  | 11 -----------
 gimp-2.10.24-external-help-browser.patch | 12 ++++++++++++
 gimp.spec                                | 19 +++++++++++--------
 sources                                  |  2 +-
 5 files changed, 25 insertions(+), 20 deletions(-)
 delete mode 100644 gimp-2.10.0-external-help-browser.patch
 create mode 100644 gimp-2.10.24-external-help-browser.patch

diff --git a/.gitignore b/.gitignore
index 349b6ff..20d2f8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2
 /gimp-2.10.18.tar.bz2
 /gimp-2.10.20.tar.bz2
 /gimp-2.10.22.tar.bz2
+/gimp-2.10.24.tar.bz2
diff --git a/gimp-2.10.0-external-help-browser.patch b/gimp-2.10.0-external-help-browser.patch
deleted file mode 100644
index 4efbbc7..0000000
--- a/gimp-2.10.0-external-help-browser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up gimp-2.10.0/etc/gimprc.in.external-help-browser gimp-2.10.0/etc/gimprc.in
---- gimp-2.10.0/etc/gimprc.in.external-help-browser	2018-04-28 17:25:02.483242200 +0200
-+++ gimp-2.10.0/etc/gimprc.in	2018-04-28 17:25:28.048193595 +0200
-@@ -753,6 +753,7 @@
- # web-browser.
- # 
- # (help-browser gimp)
-+(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.24-external-help-browser.patch b/gimp-2.10.24-external-help-browser.patch
new file mode 100644
index 0000000..09f4118
--- /dev/null
+++ b/gimp-2.10.24-external-help-browser.patch
@@ -0,0 +1,12 @@
+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.spec b/gimp.spec
index bc5c147..9ae2a2a 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -87,9 +87,9 @@ find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $pyth
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.10.22
-%global rel 2
-Release:        %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist}.3
+Version:        2.10.24
+%global rel 1
+Release:        %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist}
 
 # Compute some version related macros.
 # Ugly, need to get quoting percent signs straight.
@@ -134,9 +134,9 @@ BuildRequires:  freetype-devel >= 2.1.7
 BuildRequires:  gcc
 BuildRequires:  gdk-pixbuf2-devel >= 2.30.8
 BuildRequires:  gegl04-tools
-BuildRequires:  gegl04-devel >= 0.4.22
+BuildRequires:  gegl04-devel >= 0.4.30
 BuildRequires:  libgs-devel
-BuildRequires:  glib2-devel >= 2.54.2
+BuildRequires:  glib2-devel >= 2.56.2
 BuildRequires:  gtk2-devel >= 2.24.32
 BuildRequires:  gtk-doc >= 1.0
 BuildRequires:  harfbuzz-devel >= 0.9.19
@@ -191,10 +191,10 @@ BuildRequires:  ImageMagick
 %endif
 
 Requires:       babl%{?_isa} >= 0.1.78
-Requires:       gegl04%{?_isa} >= 0.4.24
+Requires:       gegl04%{?_isa} >= 0.4.30
 Requires:       fontconfig >= 2.12.4
 Requires:       freetype >= 2.1.7
-Requires:       glib2 >= 2.54.2
+Requires:       glib2 >= 2.56.2
 Requires:       gtk2 >= 2.24.32
 Requires:       hicolor-icon-theme
 %if %{with libunwind}
@@ -238,7 +238,7 @@ Patch2:         gimp-2.10.12-default-font.patch
 Patch3:         gimp-2.10.18-no-phone-home-default.patch
 
 # use external help browser directly if help browser plug-in is not built
-Patch100:       gimp-2.10.0-external-help-browser.patch
+Patch100:       gimp-2.10.24-external-help-browser.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -720,6 +720,9 @@ make check %{?_smp_mflags}
 %endif
 
 %changelog
+* Fri Apr 02 2021 Kalev Lember <klember@redhat.com> - 2:2.10.24-1
+- Update to 2.10.24
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.10.22-2.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index ea9cec9..890b517 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gimp-2.10.22.tar.bz2) = 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
+SHA512 (gimp-2.10.24.tar.bz2) = 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936