From cdd25fe37f8c1b98cdd90735aaa210ca22ceb91f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Mon, 25 Jun 2018 15:50:53 +0000 Subject: [PATCH] community/gmic to 2.3.1-1 --- community/gmic/PKGBUILD | 12 ++++-------- community/gmic/zart-qt5.11.patch | 22 ---------------------- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 community/gmic/zart-qt5.11.patch diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index e119fbd22..c9f48c82a 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -11,15 +11,14 @@ highmem=1 pkgbase=gmic pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic) -pkgver=2.3.0 -pkgrel=2 +pkgver=2.3.1 +pkgrel=1 arch=(x86_64) url="http://gmic.eu/" license=(custom:CeCILL) makedepends=(gimp qt5-base fftw openexr opencv git) -source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-qt5.11.patch) -sha256sums=('57fc98ccc4f2720fb54d1aef6c2e5a2125894f8ae46827b0c644ca9ba066653f' - '92c7c98ccfd92d824e13d52db6136877a7ff483a411fed0d28f7e96474ab9c1b') +source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz) +sha256sums=('295c39bccdadc3d308d3f6a6e9fa55bbc648e180af5a0286da16320811e45328') prepare() { sed -e 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' -i gmic-$pkgver/src/Makefile @@ -28,9 +27,6 @@ prepare() { sed -e 's/pkg-config opencv --libs ||//' -e 's/-lopencv_highgui/-lopencv_videoio/' -i gmic-$pkgver/src/Makefile sed -i "s|-mtune=generic|${CFLAGS}|" gmic-$pkgver/src/Makefile - - cd gmic-$pkgver/zart - patch -p1 -i ../../zart-qt5.11.patch # Fix build with Qt 5.11 } build() { diff --git a/community/gmic/zart-qt5.11.patch b/community/gmic/zart-qt5.11.patch deleted file mode 100644 index 9c20c0c30..000000000 --- a/community/gmic/zart-qt5.11.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 148a3d755905eaaa00b580677376e30ca159c033 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Thu, 21 Jun 2018 16:15:06 +0200 -Subject: [PATCH] Fix build with Qt 5.11 - -Add missing QButtonGroup include ---- - src/MainWindow.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index c4e6590..638b887 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -47,6 +47,7 @@ - - #include <QAction> - #include <QActionGroup> -+#include <QButtonGroup> - #include <QComboBox> - #include <QDesktopServices> - #include <QDir>