From afdc8ee3e43abdd07a6399c31ca14fd197a50672 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 18 Apr 2020 19:45:35 +1000
Subject: [PATCH] G'MIC: bump version

---
 .../{gmic-2.7.4.recipe => gmic-2.9.0.recipe}  |  4 +-
 media-gfx/gmic/patches/gmic-2.7.4.patchset    | 48 -------------------
 media-gfx/gmic/patches/gmic-2.9.0.patchset    | 38 +++++++++++++++
 3 files changed, 40 insertions(+), 50 deletions(-)
 rename media-gfx/gmic/{gmic-2.7.4.recipe => gmic-2.9.0.recipe} (96%)
 delete mode 100644 media-gfx/gmic/patches/gmic-2.7.4.patchset
 create mode 100644 media-gfx/gmic/patches/gmic-2.9.0.patchset

diff --git a/media-gfx/gmic/gmic-2.7.4.recipe b/media-gfx/gmic/gmic-2.9.0.recipe
similarity index 96%
rename from media-gfx/gmic/gmic-2.7.4.recipe
rename to media-gfx/gmic/gmic-2.9.0.recipe
index f49b3c5a7..f84dcf0f9 100644
--- a/media-gfx/gmic/gmic-2.7.4.recipe
+++ b/media-gfx/gmic/gmic-2.9.0.recipe
@@ -8,9 +8,9 @@ volumetric images, hence including 2D color images."
 HOMEPAGE="https://gmic.eu"
 COPYRIGHT="Sébastien Fourey"
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://gmic.eu/files/source/gmic_$portVersion.tar.gz"
-CHECKSUM_SHA256="cd9b40fa8df8a0bb47388071096c768a9d4908af574f0e98cc8515410d0b2c40"
+CHECKSUM_SHA256="6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5"
 SOURCE_DIR="gmic-$portVersion"
 ADDITIONAL_FILES="gmic.rdef.in"
 PATCHES="gmic-$portVersion.patchset"
diff --git a/media-gfx/gmic/patches/gmic-2.7.4.patchset b/media-gfx/gmic/patches/gmic-2.7.4.patchset
deleted file mode 100644
index cdf209a71..000000000
--- a/media-gfx/gmic/patches/gmic-2.7.4.patchset
+++ /dev/null
@@ -1,48 +0,0 @@
-From 69cb819208cc812917ff46ebd5a0c907f3de4e03 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 19 Oct 2019 19:39:57 +1000
-Subject: Disable cimg_display
-
-
-diff --git a/gmic-qt/gmic_qt.pro b/gmic-qt/gmic_qt.pro
-index cc3a9fd..8a592ad 100644
---- a/gmic-qt/gmic_qt.pro
-+++ b/gmic-qt/gmic_qt.pro
-@@ -133,7 +133,7 @@ message("CImg version is" $$CIMG_VERSION)
- 
- !win32 {
-  LIBS += -lfftw3_threads
-- DEFINES += cimg_display=1
-+ DEFINES += cimg_display=0
- }
- 
- win32 {
--- 
-2.23.0
-
-
-From 907eb68a52cbeac91f5173577cd96e131f3ff816 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 19 Oct 2019 20:24:06 +1000
-Subject: Add missing includes
-
-
-diff --git a/src/gmic.h b/src/gmic.h
-index bcf32c0..4d773cc 100644
---- a/src/gmic.h
-+++ b/src/gmic.h
-@@ -51,6 +51,11 @@
-  #
- */
- 
-+#ifdef __HAIKU__
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#endif
-+
- #ifndef gmic_version
- #define gmic_version 274
- 
--- 
-2.23.0
-
diff --git a/media-gfx/gmic/patches/gmic-2.9.0.patchset b/media-gfx/gmic/patches/gmic-2.9.0.patchset
new file mode 100644
index 000000000..3603e79ed
--- /dev/null
+++ b/media-gfx/gmic/patches/gmic-2.9.0.patchset
@@ -0,0 +1,38 @@
+From 388ba393df8331ba385fe0d86c7a963722bf1af6 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sat, 18 Apr 2020 19:05:21 +1000
+Subject: Fix for Haiku
+
+
+diff --git a/gmic-qt/gmic_qt.pro b/gmic-qt/gmic_qt.pro
+index cd6b341..1fb5149 100644
+--- a/gmic-qt/gmic_qt.pro
++++ b/gmic-qt/gmic_qt.pro
+@@ -138,7 +138,7 @@ message("CImg version is" $$CIMG_VERSION)
+ 
+ !win32 {
+  LIBS += -lfftw3_threads
+- DEFINES += cimg_display=1
++ DEFINES += cimg_display=0
+ }
+ 
+ win32 {
+diff --git a/src/gmic.h b/src/gmic.h
+index ec56da6..5ca9bd4 100644
+--- a/src/gmic.h
++++ b/src/gmic.h
+@@ -51,6 +51,11 @@
+  #
+ */
+ 
++#ifdef __HAIKU__
++#include <sys/types.h>
++#include <sys/stat.h>
++#endif
++
+ #ifndef gmic_version
+ #define gmic_version 290
+ 
+-- 
+2.26.0
+