[arch-commits] Commit in gmic/trunk (PKGBUILD zart-qt5.11.patch)

Antonio Rojas arojas at archlinux.org
Mon Jun 25 13:29:49 UTC 2018


    Date: Monday, June 25, 2018 @ 13:29:49
  Author: arojas
Revision: 345853

Update to 2.3.1

Modified:
  gmic/trunk/PKGBUILD
Deleted:
  gmic/trunk/zart-qt5.11.patch

-------------------+
 PKGBUILD          |   11 ++++-------
 zart-qt5.11.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-25 13:18:01 UTC (rev 345852)
+++ PKGBUILD	2018-06-25 13:29:49 UTC (rev 345853)
@@ -6,14 +6,14 @@
 
 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'
+source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz)
+sha256sums=('295c39bccdadc3d308d3f6a6e9fa55bbc648e180af5a0286da16320811e45328'
             '92c7c98ccfd92d824e13d52db6136877a7ff483a411fed0d28f7e96474ab9c1b')
 
 prepare() {
@@ -21,9 +21,6 @@
   sed -e 's|-Ofast|-O2 -fno-fast-math|g' -i gmic-$pkgver/gmic-qt/gmic_qt.pro
 # fix overlinking
   sed -e 's/pkg-config opencv --libs ||//' -e 's/-lopencv_highgui/-lopencv_videoio/' -i gmic-$pkgver/src/Makefile 
-
-  cd gmic-$pkgver/zart
-  patch -p1 -i ../../zart-qt5.11.patch # Fix build with Qt 5.11
 }
 
 build() {

Deleted: zart-qt5.11.patch
===================================================================
--- zart-qt5.11.patch	2018-06-25 13:18:01 UTC (rev 345852)
+++ zart-qt5.11.patch	2018-06-25 13:29:49 UTC (rev 345853)
@@ -1,22 +0,0 @@
-From 148a3d755905eaaa00b580677376e30ca159c033 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas at 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>



More information about the arch-commits mailing list