graphics/gimp: version 2.10.12

5 files changed, 47 insertions, 124 deletions

diff --git a/graphics/gimp/0001-make-gegl-0.4-acceptable.patch b/graphics/gimp/0001-make-gegl-0.4-acceptable.patch
deleted file mode 100644
index 0ad7a83c39..0000000000
--- a/graphics/gimp/0001-make-gegl-0.4-acceptable.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 700ef65ffe33d5f078c5f9a8e4a92908b3615d33 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf@bandrate.org>
-Date: Wed, 18 Jul 2018 21:36:49 +0200
-Subject: [PATCH] make gegl 0.4 acceptable
-
----
- configure | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/configure b/configure
-index ee0a503..d3d5abd 100755
---- a/configure
-+++ b/configure
-@@ -16589,12 +16589,12 @@ if test -n "$GEGL_CFLAGS"; then
-     pkg_cv_GEGL_CFLAGS="$GEGL_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.2 >= 0.2.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "gegl-0.2 >= 0.2.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.2.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.2.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.2 >= 0.2.0" 2>/dev/null`
-+  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.4 >= 0.2.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -16606,12 +16606,12 @@ if test -n "$GEGL_LIBS"; then
-     pkg_cv_GEGL_LIBS="$GEGL_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.2 >= 0.2.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "gegl-0.2 >= 0.2.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.2.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.2.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.2 >= 0.2.0" 2>/dev/null`
-+  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.4 >= 0.2.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -16632,14 +16632,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.2 >= 0.2.0" 2>&1`
-+	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.4 >= 0.2.0" 2>&1`
-         else
--	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.2 >= 0.2.0" 2>&1`
-+	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.4 >= 0.2.0" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GEGL_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (gegl-0.2 >= 0.2.0) were not met:
-+	as_fn_error $? "Package requirements (gegl-0.4 >= 0.2.0) were not met:
- 
- $GEGL_PKG_ERRORS
- 
--- 
-2.18.0
-
diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 51a9315ca7..7f57a8aaa2 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -1,25 +1,42 @@
 . "$GRIMOIRE/FUNCTIONS" &&
 
+depends -sub TLS glib-networking &&
+
+depends atk &&
+depends babl &&
+depends cairo &&
+depends curl &&
+depends fontconfig &&
+depends freetype2 &&
+depends gegl &&
+depends gexiv2 &&
+depends glib2 &&
 depends gtk+2 &&
+depends harfbuzz &&
+depends intltool &&
+depends JPEG &&
+depends lcms2 &&
 depends libart_lgpl &&
-depends xml-parser-expat &&
 depends libglade2 &&
-depends gegl &&
-depends intltool &&
+depends libmypaint &&
+depends libpng &&
+depends librsvg2 &&
+depends LZMA &&
+depends mypaint &&
+depends pango &&
+depends poppler &&
+depends tiff &&
+depends xml-parser-expat &&
+
 
 if spell_ok gegl && is_version_less $(installed_version gegl) 0.3.0; then
   force_depends gegl
 fi &&
 
-optional_depends poppler \
-                 "--with-poppler" \
-                 "--without-poppler" \
-                 "for pdf support" &&
-
-optional_depends lcms \
-                 "--with-lcms" \
-                 "--without-lcms" \
-                 "for color proof module" &&
+optional_depends openexr \
+                 "--with-openexr" \
+                 "--without-openexr" \
+                 "for OpenEXR support" &&
 
 optional_depends libwmf \
                  "--with-wmf" \
@@ -31,35 +48,20 @@ optional_depends pygtk2 \
                  "--disable-python" \
                  "for python support" &&
 
-optional_depends dbus-glib \
-                 "--with-dbus" \
-                 "--without-dbus" \
-                 "for D-Bus support" &&
-
 optional_depends hal \
                  "--with-hal" \
                  "--without-hal" \
                  "for HAL support" &&
 
-optional_depends gvfs \
-                 "--with-gvfs" \
-                 "--without-gvfs" \
-                 "for GIO/GVfs support" &&
-
 optional_depends gnome-vfs2 \
                  "--with-gnomevfs" \
                  "--without-gnomevfs" \
                  "for gnomevfs support" &&
 
-optional_depends tiff \
-                 "--with-libtiff" \
-                 "--without-libtiff" \
-                 "for TIFF support" &&
-
-optional_depends JPEG \
-                 "--with-libjpeg" \
-                 "--without-libjpeg" \
-                 "for JPEG support" &&
+optional_depends openjpeg \
+                 "--with-jpeg2000" \
+                 "--without-jpeg2000" \
+                 "for JPEG 2000 support" &&
 
 optional_depends libexif \
                  "--with-libexif" \
@@ -71,25 +73,20 @@ optional_depends webkitgtk \
                  "--without-webkit" \
                  "for WebKit-based help browser plugin" &&
 
-optional_depends librsvg2 \
-                 "--with-librsvg" \
-                 "--without-librsvg" \
-                 "for SVG import/export support" &&
-
-optional_depends libpng \
-                 "--with-libpng" \
-                 "--without-libpng" \
-                 "for PNG support" &&
+#optional_depends libheif \
+#                 "--with-libheif" \
+#                 "--without-libheif" \
+#                 "for libheif support" &&
 
 optional_depends libmng \
                  "--with-libmng" \
                  "--without-libmng" \
                  "for MNG animations support" &&
 
-optional_depends curl \
-                 "--with-libcurl" \
-                 "--without-libcurl" \
-                 "for curl support" &&
+optional_depends libwebp \
+                 "--with-webp" \
+                 "--without-webp" \
+                 "for webp support" &&
 
 optional_depends aalib \
                  "--with-aa" \
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index 52a8476834..2d68bbdc26 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -1,9 +1,9 @@
            SPELL=gimp
 #if [[ $GIMP_DEVEL == y ]]; then
 #else
-         VERSION=2.8.22
+         VERSION=2.10.12
   SECURITY_PATCH=2
-     SOURCE_HASH=sha512:84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
+     SOURCE_HASH=sha512:dd4af3f0fa6fca815d254b7f42aeff15412c38294f1f5bd491563e2b597fcb868e6adff9001b196a68e01cf49bde61cbb153b662b8da1aa1b4b1f7285879659f
 #fi
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://download.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 09cb1575e2..b5a827ccdb 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,7 @@
+2019-06-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS: version 2.10.12
+	* 0001-make-gegl-0.4-acceptable.patch, PRE_BUILD: remove obsolete patch
+
 2019-05-18 Ismael Luceno <ismael@sourcemage.org>
 	* DEPENDS: Update dependency; s/gettext/GETTEXT/
 
diff --git a/graphics/gimp/PRE_BUILD b/graphics/gimp/PRE_BUILD
index 5e00df1827..efb4a31045 100755
--- a/graphics/gimp/PRE_BUILD
+++ b/graphics/gimp/PRE_BUILD
@@ -1,18 +1,6 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
 
-patch -p1 < "$SPELL_DIRECTORY/0001-make-gegl-0.4-acceptable.patch" &&
-
-sedit 's:gegl-0[.]2:gegl-0.3:' configure &&
 sedit "s:#include <freetype/tttables.h>:#include <freetype2/tttables.h>:" \
   app/text/gimpfont.c
 
-# Needed to build (gimp < 2.9.4) against gegl 0.3.8
-sedit '/^#include <gegl-paramspecs.h>/a\
-#ifndef GEGL_IS_PARAM_SPEC_MULTILINE \
-#define GEGL_IS_PARAM_SPEC_MULTILINE(p) \\\
-	gegl_param_spec_get_property_key(p, "multiline")\
-#endif
-' app/core/gimpparamspecs-duplicate.c
-
-