[arch-commits] Commit in krita-plugin-gmic/repos/community-x86_64 (4 files)

[Antonio Rojas]

    Date: Thursday, June 23, 2022 @ 16:23:27
  Author: arojas
Revision: 1239274

archrelease: copy trunk to community-x86_64

Added:
  krita-plugin-gmic/repos/community-x86_64/PKGBUILD
    (from rev 1239273, krita-plugin-gmic/trunk/PKGBUILD)
  krita-plugin-gmic/repos/community-x86_64/fix-build.patch
    (from rev 1239273, krita-plugin-gmic/trunk/fix-build.patch)
  krita-plugin-gmic/repos/community-x86_64/keys/
Deleted:
  krita-plugin-gmic/repos/community-x86_64/PKGBUILD

-----------------+
 PKGBUILD        |   70 +++++++++++++++++++++++++++---------------------------
 fix-build.patch |   14 ++++++++++
 2 files changed, 49 insertions(+), 35 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-23 16:23:16 UTC (rev 1239273)
+++ PKGBUILD	2022-06-23 16:23:27 UTC (rev 1239274)
@@ -1,35 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=krita-plugin-gmic
-pkgver=3.1.2.3
-pkgrel=1
-pkgdesc='GMic plugin for Krita'
-arch=(x86_64)
-url='https://github.com/amyspark/gmic'
-license=(custom:CeCILL)
-depends=(krita gmic)
-makedepends=(extra-cmake-modules qt5-tools)
-source=(https://github.com/amyspark/gmic/releases/download/v$pkgver/gmic-$pkgver-patched.tar.xz{,.asc}
-        https://github.com/amyspark/gmic/commit/acc77d4d.patch)
-sha256sums=('2c961eb5a77692536e917cd684681813a3bfee333bbade5bd03e0496882e82d2'
-            'SKIP'
-            '0af6d68b7d883fac20d08d300fe1f17d2c74a31d1a431abb1eccef84c261b3f5')
-validpgpkeys=(4894424D2412FEE5176732A3FC00108CFD9DBF1E) # https://github.com/amyspark.gpg
-options=(debug)
-
-prepare() {
-  patch -d gmic-$pkgver-patched -p1 < acc77d4d.patch # Fix build
-}
-
-build() {
-  cmake -B build -S gmic-$pkgver-patched/gmic-qt \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DGMIC_QT_HOST=krita-plugin
-  VERBOSE=1 cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-  rm "$pkgdir"/usr/share/gmic/gmic_cluts.gmz # Provided by gmic
-  install -Dm644 gmic-$pkgver-patched/COPYING -t "$pkgdir"/usr/share/licenses/$pkgname
-}

Copied: krita-plugin-gmic/repos/community-x86_64/PKGBUILD (from rev 1239273, krita-plugin-gmic/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-06-23 16:23:27 UTC (rev 1239274)
@@ -0,0 +1,35 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=krita-plugin-gmic
+pkgver=3.1.4.1
+pkgrel=1
+pkgdesc='GMic plugin for Krita'
+arch=(x86_64)
+url='https://github.com/amyspark/gmic'
+license=(custom:CeCILL)
+depends=(krita gmic)
+makedepends=(extra-cmake-modules qt5-tools)
+source=(https://github.com/amyspark/gmic/releases/download/v$pkgver/gmic-$pkgver-patched.tar.xz{,.asc}
+        fix-build.patch)
+sha256sums=('e655b8affd3f9e0db7e9d4e25ba7c4d63cb958c84bca2da37fa58e310bbf7e9d'
+            'SKIP'
+            '3df2ae458f94f2d9aa96df933c7598f986e0f6ff1d088d7fcb5523cbb41cc77f')
+validpgpkeys=(4894424D2412FEE5176732A3FC00108CFD9DBF1E) # https://github.com/amyspark.gpg
+options=(debug)
+
+prepare() {
+  patch -d gmic-$pkgver-patched -p1 < fix-build.patch
+}
+
+build() {
+  cmake -B build -S gmic-$pkgver-patched/gmic-qt \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DGMIC_QT_HOST=krita-plugin
+  VERBOSE=1 cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+  rm "$pkgdir"/usr/share/gmic/gmic_cluts.gmz # Provided by gmic
+  install -Dm644 gmic-$pkgver-patched/COPYING -t "$pkgdir"/usr/share/licenses/$pkgname
+}

Copied: krita-plugin-gmic/repos/community-x86_64/fix-build.patch (from rev 1239273, krita-plugin-gmic/trunk/fix-build.patch)
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2022-06-23 16:23:27 UTC (rev 1239274)
@@ -0,0 +1,14 @@
+diff --git a/gmic-qt/src/PersistentMemory.cpp b/gmic-qt/src/PersistentMemory.cpp
+index 09c48d4..8b30c10 100644
+--- a/gmic-qt/src/PersistentMemory.cpp
++++ b/gmic-qt/src/PersistentMemory.cpp
+@@ -23,6 +23,9 @@
+  *
+  */
+ #include "PersistentMemory.h"
++#ifndef gmic_core
++#include "CImg.h"
++#endif
+ #include "gmic.h"
+ 
+ namespace GmicQt