gmic: update to 2.1.8

Change build style to gnu-makefile and simplify template.

common/shlibs

@@ -500,6 +500,8 @@ libgimpconfig-2.0.so.0 libgimp-2.8.10_3
 libgimpmath-2.0.so.0 libgimp-2.8.10_3
 libgimpcolor-2.0.so.0 libgimp-2.8.10_3
 libgimpmodule-2.0.so.0 libgimp-2.8.10_3
+libgmic.so.2 gmic-2.1.8_1
+libcgmic.so.2 gmic-2.1.8_1
 libexiv2.so.26 exiv2-0.26_1
 libKF5Holidays.so.5 kholidays-16.12.0_1
 libsearchclient.so.0 strigi-0.7.2_1

srcpkgs/gmic/patches/makefile.patch

@@ -1,25 +0,0 @@
---- src/Makefile	2017-06-22 08:41:18.000000000 -0400
-+++ src/Makefile	2017-07-02 05:37:27.341025728 -0400
-@@ -477,14 +477,14 @@
- 
- gmic_qt_path:
- 	@if [ ! -d ../gmic-qt ]; then \
--	  if [ ! -d ../../gmic-qt ]; then \
-+	  if [ ! -d ../gmic-qt ]; then \
- 	    echo "**"; \
- 	    echo "** Warning: folder 'gmic-qt' was not found !"; \
- 	    echo "** It is mandatory to compile the G'MIC plug-in for GIMP 'gmic_gimp_qt',"; \
- 	    echo "** as well as the standalone Qt-based interface 'gmic_qt'."; \
-             echo "** Trying to retrieve it, with: $$ cd ../../ && git clone https://github.com/c-koi/gmic-qt.git"; \
- 	    echo "**"; \
--	    if cd ../../ && git clone https://github.com/c-koi/gmic-qt.git; then \
-+	    if cd ../ && git clone https://github.com/c-koi/gmic-qt.git; then \
- 	      echo "**"; \
-               echo "** Success !"; \
- 	      echo "**"; \
-@@ -494,7 +494,6 @@
- 	      echo "**"; \
- 	    fi; \
- 	  fi; \
--	  if [ -d ../../gmic-qt ]; then ln -fs ../gmic-qt ..; fi \
- 	fi

srcpkgs/gmic/template

@@ -1,9 +1,10 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.0.2
+version=2.1.8
-revision=2
+revision=1
 _communityhash=c43f88d9537c58be4eeac515282eec8096c4a797
 _qthash=c37a653270e69df1956b2614f0e9ce94934c4b06
+build_style=gnu-makefile
 hostmakedepends="pkg-config gimp"
 makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
@@ -12,30 +13,41 @@ short_desc="GREYC's Magic for Image Computing (image processing framework)"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="CeCILL"
 homepage="http://gmic.eu/"
-distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz https://github.com/dtschump/gmic-community/archive/${_communityhash}.tar.gz
+distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
+ https://github.com/dtschump/gmic-community/archive/${_communityhash}.tar.gz
  https://github.com/c-koi/gmic-qt/archive/${_qthash}.tar.gz"
-checksum="7da9f08d62a9d23fc8badbc7c819cf76f4a9ce3db763710268fdcb80d83ecfc6 41f5cbd42a09c18c0e974a11113e4fc7181a9c607c40e677357e3df77be2bd9c
+checksum="f22783f14cb202dec4a840733f2028f6e2c464fdd2f0166fc38943702cea6bde
+ ce71a7d6acf9acde79de42a660f715e8779933e1689f14d39fb0ceaca7582efd
  0bb1683f7ad8f55476ec57e53d73454e05cb79fc55b297eb519b2a24df728b44"
-nopie=yes
+
+CXXFLAGS="-Wno-strict-overflow -Wno-deprecated -fkeep-inline-functions"
 
 pre_build() {
 	mv ${XBPS_BUILDDIR}/gmic-qt-${_qthash} ${wrksrc}/gmic-qt
-	mv ${XBPS_BUILDDIR}/gmic-community-${_communityhash} ${wrksrc}/zart
+	mv ${XBPS_BUILDDIR}/gmic-community{-${_communityhash},}
+	mv ${XBPS_BUILDDIR}/gmic-community/zart ${wrksrc}
+
+	sed -i ${wrksrc}/src/Makefile -e 's;\( *\)ar\( *\);\1$(AR)\2;'
+
+	# Create a toplevel Makefile
+	cat > Makefile <<EOF
+CC	= $CC
+CXX	= $CXX
+LD	= $CXX
+AR	= $AR
+CFLAGS	= $CFLAGS
+CXXFLAGS= $CXXFLAGS
+LDFLAGS = $LDFLAGS
+
+all:
+	make -C src
+
+install:
+	make -C src DESTDIR="$DESTDIR" install
+EOF
 }
 
-do_build() {
+post_install() {
-	sed -i 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' src/Makefile
-	sed -i 's#GMIC_PATH = ../../gmic/src/#GMIC_PATH = ../../src/#' zart/zart/zart.pro
-	cd zart/zart && qmake-qt5 -o Makefile zart.pro
-	cd ${wrksrc}/src && make all ${makejobs}
-	cd ${wrksrc}/zart/zart && make ${makejobs}
-}
-
-do_install() {
-	cd ${wrksrc}/src && make install DESTDIR="${DESTDIR}" USR="/usr"
-	cd ${wrksrc}/zart/zart && make install
-	cd ${wrksrc}
-	vbin zart/zart/zart
 	vlicense COPYING
 }