diff --git a/srcpkgs/gmic/files/gmic-qt.patch b/srcpkgs/gmic/files/gmic-qt.patch deleted file mode 100644 index d1417d6810..0000000000 --- a/srcpkgs/gmic/files/gmic-qt.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- gmic-qt/src/SearchFieldWidget.cpp 2017-06-28 11:32:57.000000000 +0200 -+++ gmic-qt/src/SearchFieldWidget.cpp 2019-06-07 23:46:28.301753374 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include "DialogSettings.h" - - SearchFieldWidget::SearchFieldWidget(QWidget *parent) : ---- gmic-qt/include/MainWindow.h 2017-06-28 11:32:57.000000000 +0200 -+++ gmic-qt/include/MainWindow.h 2019-06-08 00:03:57.884695538 +0200 -@@ -26,6 +26,7 @@ - #define _GMIC_QT_MAINWINDOW_H_ - - #include -+#include - #include - #include - #include ---- gmic-qt/src/MainWindow.cpp 2017-06-28 11:32:57.000000000 +0200 -+++ gmic-qt/src/MainWindow.cpp 2019-06-08 00:09:57.513675721 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/gmic/files/zart.patch b/srcpkgs/gmic/files/zart.patch deleted file mode 100644 index 305bf4b228..0000000000 --- a/srcpkgs/gmic/files/zart.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- zart/include/DialogAbout.h 2017-07-01 22:43:56.000000000 +0200 -+++ zart/include/DialogAbout.h 2019-06-08 00:28:04.292615835 +0200 -@@ -46,6 +46,7 @@ - #ifndef _DIALOGABOUT_H_ - #define _DIALOGABOUT_H_ - -+#include - #include - #include "ui_DialogAbout.h" - diff --git a/srcpkgs/gmic/patches/fix-includes.patch b/srcpkgs/gmic/patches/fix-includes.patch deleted file mode 100644 index 1613bdb14f..0000000000 --- a/srcpkgs/gmic/patches/fix-includes.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- src/CImg.h 2018-04-23 04:49:04.329501123 +0200 -+++ src/CImg.h 2018-04-23 04:48:23.850499833 +0200 -@@ -416,8 +416,8 @@ - #define _cimg_redefine_False - #endif - #include --#include "cv.h" --#include "highgui.h" -+#include -+#include - #endif - - // Configure LibPNG support. -@@ -429,7 +429,7 @@ - // (see methods 'CImg::{load,save}_png()'. - #ifdef cimg_use_png - extern "C" { --#include "png.h" -+#include - } - #endif - -@@ -442,8 +442,8 @@ - // (see methods 'CImg::{load,save}_jpeg()'). - #ifdef cimg_use_jpeg - extern "C" { --#include "jpeglib.h" --#include "setjmp.h" -+#include -+#include - } - #endif - -@@ -458,7 +458,7 @@ - extern "C" { - #define uint64 uint64_hack_ - #define int64 int64_hack_ --#include "tiffio.h" -+#include - #undef uint64 - #undef int64 - } -@@ -472,9 +472,9 @@ - // MINC2 library may be used to get a native support of '.mnc' files. - // (see methods 'CImg::{load,save}_minc2()'). - #ifdef cimg_use_minc2 --#include "minc_io_simple_volume.h" --#include "minc_1_simple.h" --#include "minc_1_simple_rw.h" -+#include -+#include -+#include - #endif - - // Configure Zlib support. -@@ -486,7 +486,7 @@ - // (see methods 'CImg[List]::{load,save}_cimg()'). - #ifdef cimg_use_zlib - extern "C" { --#include "zlib.h" -+#include - } - #endif - -@@ -498,7 +498,7 @@ - // Libcurl may be used to get a native support of file downloading from the network. - // (see method 'cimg::load_network()'.) - #ifdef cimg_use_curl --#include "curl/curl.h" -+#include - #endif - - // Configure Magick++ support. -@@ -509,7 +509,7 @@ - // Magick++ library may be used to get a native support of various image file formats. - // (see methods 'CImg::{load,save}()'). - #ifdef cimg_use_magick --#include "Magick++.h" -+#include - #endif - - // Configure FFTW3 support. -@@ -522,7 +522,7 @@ - // (see method 'CImg[List]::FFT()'). - #ifdef cimg_use_fftw3 - extern "C" { --#include "fftw3.h" -+#include - } - #endif - -@@ -535,7 +535,7 @@ - // that can be saved as '.ps' or '.svg' files afterwards. - // (see method 'CImg::draw_object3d()'). - #ifdef cimg_use_board --#include "Board.h" -+#include - #endif - - // Configure OpenEXR support. -@@ -546,11 +546,11 @@ - // OpenEXR library may be used to get a native support of '.exr' files. - // (see methods 'CImg::{load,save}_exr()'). - #ifdef cimg_use_openexr --#include "ImfRgbaFile.h" --#include "ImfInputFile.h" --#include "ImfChannelList.h" --#include "ImfMatrixAttribute.h" --#include "ImfArray.h" -+#include -+#include -+#include -+#include -+#include - #endif - - // Configure TinyEXR support. -@@ -563,7 +563,7 @@ - #ifndef TINYEXR_IMPLEMENTATION - #define TINYEXR_IMPLEMENTATION - #endif --#include "tinyexr.h" -+#include - #endif - - // Lapack configuration. diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 1902573ec8..1e8de63660 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,9 +1,8 @@ # Template file for 'gmic' pkgname=gmic -version=2.1.8 -revision=5 -_communityhash=c43f88d9537c58be4eeac515282eec8096c4a797 -_qthash=c37a653270e69df1956b2614f0e9ce94934c4b06 +version=2.6.7 +revision=1 +build_wrksrc="src" build_style=gnu-makefile hostmakedepends="pkg-config gimp" makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel @@ -11,47 +10,15 @@ makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel gtk+-devel gimp-devel qt5-devel" short_desc="GREYC's Magic for Image Computing (image processing framework)" maintainer="Jakub Skrzypnik " -license="CeCILL" +license="CECILL-2.1" homepage="http://gmic.eu/" -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="f22783f14cb202dec4a840733f2028f6e2c464fdd2f0166fc38943702cea6bde - ce71a7d6acf9acde79de42a660f715e8779933e1689f14d39fb0ceaca7582efd - 0bb1683f7ad8f55476ec57e53d73454e05cb79fc55b297eb519b2a24df728b44" +distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz" +checksum="2e5535d1bae66254136e928428750aac8efcef6f4413fc352b6de9ce8ac8b0ff" +disable_parallel_build="yes" nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/8869/steps/shell_3/logs/stdio" -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},} - mv ${XBPS_BUILDDIR}/gmic-community/zart ${wrksrc} - patch -p0 -i ${FILESDIR}/gmic-qt.patch - patch -p0 -i ${FILESDIR}/zart.patch - - sed -i ${wrksrc}/src/Makefile -e 's;\( *\)ar\( *\);\1$(AR)\2;' - - # Create a toplevel Makefile - cat > Makefile <