Update to 2.3.6

Reviewed by:	mat, tcberner
Differential Revision:	https://reviews.freebsd.org/D17009

graphics/gmic-qt/Makefile

@@ -2,7 +2,8 @@
 
 PORTNAME=	gmic-qt
 DISTVERSIONPREFIX=	v.
-DISTVERSION=	215
+DISTVERSION=	2.3.6
+PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	http://gmic.eu/:stdlib \
 		LOCAL/tcberner/${PORTNAME}/${PORTVERSION}:stdlib
@@ -13,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz ${DISTFILE_gmic} ${DISTFILE_cimg}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Versatile Qt front-end to GMIC
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
@@ -25,24 +26,26 @@ USE_QT=		core gui network widgets \
 		buildtools_build linguisttools_build qmake_build
 USE_XORG=	ice sm x11 xext
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	c-koi
+GH_TUPLE=	dtschump:gmic:${DISTVERSIONFULL}:gmic/gmic \
+		dtschump:CImg:${DISTVERSIONFULL}:cimg
+
 # Use the extracted cimg/gmic & Co, as we do not want to depend on graphics/gimp
 # which would get pulled in by graphics/cimg.
 CMAKE_ARGS=	-DGMIC_QT_HOST:STRING="krita" \
 		-DGMIC_PATH:STRING="${WRKSRC_gmic}/src"
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	c-koi
-GH_TUPLE=	dtschump:gmic:${DISTVERSIONFULL}:gmic \
-		dtschump:cimg:${DISTVERSIONFULL}:cimg
+PORTSCOUT=	limit:[0-9]\..*
 
 pre-configure:
 # Copy the necessary files
-	${CP} ${WRKDIR}/CImg-${DISTVERSIONFULL}/CImg.h ${WRKSRC_gmic}/src
+	${CP} ${WRKSRC_cimg}/CImg.h ${WRKSRC_gmic}/src
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/gmic_stdlib.h ${WRKSRC_gmic}/src
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gmic_krita_qt ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}/translations
-	${INSTALL_DATA} ${BUILD_WRKSRC}/*.qm ${STAGEDIR}${DATADIR}/translations/
+	${INSTALL_DATA} ${BUILD_WRKSRC}/*.qm ${STAGEDIR}${DATADIR}/translations
 
 .include <bsd.port.mk>

graphics/gmic-qt/distinfo

@@ -1,9 +1,9 @@
-TIMESTAMP = 1510424358
-SHA256 (KDE/gmic-qt/215/gmic_stdlib.h) = dd6c69894bdeee83be63f970a674a0b923ef77ef70a19b41be1992e464708ef5
-SIZE (KDE/gmic-qt/215/gmic_stdlib.h) = 3047992
-SHA256 (KDE/gmic-qt/215/c-koi-gmic-qt-v.215_GH0.tar.gz) = f2c6f7301e47e691f0ca578959bbbb1a5a29c4bdaa493f2720987cec6f32d3d4
-SIZE (KDE/gmic-qt/215/c-koi-gmic-qt-v.215_GH0.tar.gz) = 313529
-SHA256 (KDE/gmic-qt/215/dtschump-gmic-v.215_GH0.tar.gz) = 8fcce5f3950878ab05cb0a2cb71e3d3110e6b2bce6915d92a9c7e0588a165d23
-SIZE (KDE/gmic-qt/215/dtschump-gmic-v.215_GH0.tar.gz) = 39052162
-SHA256 (KDE/gmic-qt/215/dtschump-cimg-v.215_GH0.tar.gz) = c97e7d268d9832d71cfee0f45ed5d965441b7c8cb7566570531db41e9556391d
-SIZE (KDE/gmic-qt/215/dtschump-cimg-v.215_GH0.tar.gz) = 11036116
+TIMESTAMP = 1536000081
+SHA256 (KDE/gmic-qt/2.3.6/gmic_stdlib.h) = ea56a438d6a2110526f05a0af1e6ee1dc2206bf1cc6da5c73192f1719b5d5269
+SIZE (KDE/gmic-qt/2.3.6/gmic_stdlib.h) = 1883290
+SHA256 (KDE/gmic-qt/2.3.6/c-koi-gmic-qt-v.2.3.6_GH0.tar.gz) = 51bc054ea9029bd79a3ba1919b535ec9135fe2013b77a73bf92ccd7a07ae9179
+SIZE (KDE/gmic-qt/2.3.6/c-koi-gmic-qt-v.2.3.6_GH0.tar.gz) = 538479
+SHA256 (KDE/gmic-qt/2.3.6/dtschump-gmic-v.2.3.6_GH0.tar.gz) = 2a9e0859f4d6900b22b00a82a396dd0b344cae4cda2d18ee9cd1566e952216f3
+SIZE (KDE/gmic-qt/2.3.6/dtschump-gmic-v.2.3.6_GH0.tar.gz) = 39078483
+SHA256 (KDE/gmic-qt/2.3.6/dtschump-CImg-v.2.3.6_GH0.tar.gz) = a3844afda0c701dbf77505f3f8ec6eea4599d3c6485794a5dbf3545444ec8234
+SIZE (KDE/gmic-qt/2.3.6/dtschump-CImg-v.2.3.6_GH0.tar.gz) = 11036209

graphics/gmic-qt/files/patch-CMakeLists.txt

@@ -1,27 +1,39 @@
---- CMakeLists.txt.orig	2017-09-18 13:15:50 UTC
+--- CMakeLists.txt.orig	2018-08-27 14:56:34 UTC
 +++ CMakeLists.txt
-@@ -139,9 +139,10 @@ if (UNIX AND NOT APPLE)
-     add_definitions(-D_IS_LINUX_)
-     add_definitions(-Dcimg_use_vt100)
-     add_definitions(-D_IS_UNIX_)
-+    find_package(X11)
-     set(gmic_qt_LIBRARIES
-         ${gmic_qt_LIBRARIES}
--        X11 # XXX: Search for X11: Wayland is coming!
-+        ${X11_LIBRARIES} # XXX: Search for X11: Wayland is coming!
+@@ -232,6 +232,12 @@ if (WIN32)
      )
+ endif()
  
- endif()
-@@ -162,6 +163,12 @@ if (WIN32)
-         pthread psapi gdi32
-     )
- endif()
-+
 +find_package(Threads) 
 +set(gmic_qt_LIBRARIES
 +    ${gmic_qt_LIBRARIES}
 +    Threads::Threads
 +)
- 
++
  if (NOT CMAKE_BUILD_TYPE)
      set(CMAKE_BUILD_TYPE "Release")
+ endif()
+@@ -427,10 +433,10 @@ qt5_wrap_ui(gmic_qt_SRCS
+   ui/zoomlevelselector.ui
+ )
+ 
+-# qt5_create_translation(
+-#     qmic_qt_QM
+-#     ${CMAKE_SOURCE_DIR}/translations
+-#     ${gmic_qt_SRCS}
++qt5_create_translation(
++    qmic_qt_QM
++    ${CMAKE_SOURCE_DIR}/translations
++    ${gmic_qt_SRCS}
+ #     translations/cs.ts
+ #     translations/de.ts
+ #     translations/es.ts
+@@ -446,7 +452,7 @@ qt5_wrap_ui(gmic_qt_SRCS
+ #     translations/zh.ts
+ # )
+ 
+-qt5_add_translation(gmic_qt_QM
++# qt5_add_translation(gmic_qt_QM
+     translations/cs.ts
+     translations/de.ts
+     translations/es.ts

graphics/gmic-qt/files/patch-gmic_src_gmic.cpp

@@ -0,0 +1,20 @@
+--- gmic/src/gmic.cpp.orig	2018-08-27 18:23:05 UTC
++++ gmic/src/gmic.cpp
+@@ -1993,7 +1993,7 @@ double gmic::mp_ext(char *const str, void *const p_lis
+ // Manage correspondence between abort pointers and thread ids.
+ CImgList<void*> gmic::list_p_is_abort = CImgList<void*>();
+ bool *gmic::abort_ptr(bool *const p_is_abort) {
+-#if defined(__MACOSX__) || defined(__APPLE__)
++#if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__)
+   void* tid = (void*)(cimg_ulong)getpid();
+ #elif cimg_OS==1
+   void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
+@@ -2326,7 +2326,7 @@ gmic::~gmic() {
+ #endif // #if cimg_display!=0
+ 
+   cimg::mutex(21);
+-#if defined(__MACOSX__) || defined(__APPLE__)
++#if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__)
+   void* tid = (void*)(cimg_ulong)getpid();
+ #elif cimg_OS==1
+   void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);