GMIC: enable krita plugin

* fix save image with default quality
* new apply icon
This commit is contained in:
Gerasim Troeglazov
2021-10-09 23:16:05 +10:00
parent 0903d1cd3e
commit f6a4b510e5
3 changed files with 57 additions and 3 deletions

View File

@@ -8,7 +8,7 @@ volumetric images, hence including 2D color images."
HOMEPAGE="https://gmic.eu"
COPYRIGHT="Sébastien Fourey"
LICENSE="GNU GPL v3"
REVISION="7"
REVISION="8"
SOURCE_URI="https://gmic.eu/files/source/gmic_$portVersion.tar.gz"
CHECKSUM_SHA256="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0"
SOURCE_DIR="gmic-$portVersion"
@@ -148,6 +148,22 @@ BUILD()
cd build-qt
make VERBOSE=1
cd ..
cmake -B build-krita -S ./gmic-qt \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS=$CUSTOM_CXX_FLAGS \
-DCUSTOM_CFLAGS=ON \
-DGMIC_PATH=$sourceDir/src \
-DGMIC_QT_HOST=krita \
-DENABLE_ASAN=OFF \
-DENABLE_CURL=ON \
-DENABLE_DYNAMIC_LINKING=ON \
-DENABLE_FFTW3=ON \
-DENABLE_LTO=OFF
cd build-krita
make VERBOSE=1
}
INSTALL()
@@ -160,6 +176,9 @@ INSTALL()
cp build-qt/gmic_qt "$appsDir/G'MIC/G'MIC"
cp README "$appsDir/G'MIC"
mkdir -p "$appsDir/Krita"
cp build-krita/gmic_krita_qt "$appsDir/Krita"
local APP_SIGNATURE="application/x-vnd.gmic"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@@ -175,6 +194,17 @@ INSTALL()
addResourcesToBinaries gmic.rdef "$appsDir/G'MIC/G'MIC"
APP_SIGNATURE="application/x-vnd.gmic-krita-plugin"
sed \
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
-e "s|@LONG_INFO@|$LONG_INFO|" \
$portDir/additional-files/gmic.rdef.in > gmic.rdef
addResourcesToBinaries gmic.rdef "$appsDir/Krita/gmic_krita_qt"
addAppDeskbarSymlink "$appsDir/G'MIC/G'MIC"
prepareInstalledDevelLibs libgmic

View File

@@ -1,4 +1,4 @@
From 4ad3c1d9c998b6d07f783f4834ac854440713d11 Mon Sep 17 00:00:00 2001
From 822fced70522a4691fbae2e1af7a8910117e040b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 1 Oct 2021 20:50:15 +1000
Subject: Fix build for Haiku
@@ -48,7 +48,7 @@ index 6698bc0..1546281 100644
2.30.2
From ded9d6f8c2b1c814d4674a554baedcad0b726f52 Mon Sep 17 00:00:00 2001
From 8429831bfedfcf5a715fa44ed80dd865a5adf5dc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 3 Oct 2021 00:00:52 +1000
Subject: Add Haiku to detected OS
@@ -70,3 +70,27 @@ index efdbaf4..da43a30 100644
--
2.30.2
From 43034ff8912068f280b22bddd66cbdcc2103a3d2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 9 Oct 2021 21:23:21 +1000
Subject: Fix save file with default quality
diff --git a/gmic-qt/src/Host/None/ImageDialog.cpp b/gmic-qt/src/Host/None/ImageDialog.cpp
index 973c0ae..73eb636 100644
--- a/gmic-qt/src/Host/None/ImageDialog.cpp
+++ b/gmic-qt/src/Host/None/ImageDialog.cpp
@@ -56,9 +56,6 @@ bool ImageView::save(const QString & filename, int quality)
if ((ext == "jpg" || ext == "jpeg") && (quality == -1)) {
quality = JpegQualityDialog::ask(dynamic_cast<QWidget *>(parent()), -1);
}
- if (quality == -1) {
- return false;
- }
if (!_image.save(filename, nullptr, quality)) {
QMessageBox::critical(this, tr("Error"), tr("Could not write image file %1").arg(filename));
return false;
--
2.30.2