Update to 3.0.2

OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=72

0001-Remove-unneeded-CImg-include.patch

@@ -0,0 +1,38 @@
+From de25bc1fab42ce294fbc0aa94f0cd0621491bf2e Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Mon, 7 Feb 2022 22:12:15 +0100
+Subject: [PATCH] Remove unneeded CImg include
+
+Build fails if CImg.h is included before gmic.h
+---
+ src/gmic_cli.cpp  | 1 -
+ src/gmic_libc.cpp | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/gmic_cli.cpp b/src/gmic_cli.cpp
+index b9ffa22..6d21160 100644
+--- a/src/gmic_cli.cpp
++++ b/src/gmic_cli.cpp
+@@ -49,7 +49,6 @@
+ */
+ 
+ #include <signal.h>
+-#include "CImg.h"
+ #include "gmic.h"
+ using namespace cimg_library;
+ 
+diff --git a/src/gmic_libc.cpp b/src/gmic_libc.cpp
+index 0736126..9aef11a 100644
+--- a/src/gmic_libc.cpp
++++ b/src/gmic_libc.cpp
+@@ -41,7 +41,6 @@
+ */
+ 
+ #include <string>
+-#include "CImg.h"
+ #include "gmic.h"
+ #include "gmic_libc.h"
+ 
+-- 
+2.35.1
+

56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch

@@ -1,30 +0,0 @@
-From 56f7340ecb1fbbe6fce87d0a5c8d35dd13359577 Mon Sep 17 00:00:00 2001
-From: David Tschumperle <David.Tschumperle@unicaen.fr>
-Date: Sun, 16 Jan 2022 20:52:13 +0100
-Subject: [PATCH] Add '/usr/share/gmic/' to the list of folders to explore when
- trying to load resource files.
-
----
- src/gmic_stdlib.gmic | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/gmic_stdlib.gmic b/src/gmic_stdlib.gmic
-index 36e024f4..ce8e3eb9 100644
---- a/src/gmic_stdlib.gmic
-+++ b/src/gmic_stdlib.gmic
-@@ -3765,9 +3765,13 @@ _input_glob :
-   path_test1=$_path_rc
-   path_test2=${-path_gimp}plug-ins/
-   path_test3=${-path_gimp}plug-ins/gmic_gimp_qt/
--  path_test4=$g_path_unix
-+  if !${-is_windows}
-+    path_test4=/usr/share/gmic/
-+    path_test5=$g_path_unix
-+  fi
-   file_found=0
--  repeat 5
-+  repeat inf
-+    if ['${path_test$>}']==0 break fi
-     file=${path_test$>}$basename
-     l[] i $file file_found=1 onfail endl
-     if $file_found break fi

gmic-make-build-without-gmic-cpp.patch

@@ -1,34 +0,0 @@
-Index: gmic-3.0.1/src/gmic.h
-===================================================================
---- gmic-3.0.1.orig/src/gmic.h
-+++ gmic-3.0.1/src/gmic.h
-@@ -258,12 +258,12 @@ inline double gmic_mp_store(const Ts *co
- 
- #endif // #if cimg_OS==2
- 
-+#endif // #ifndef gmic_build
-+
- // Define some special character codes used for replacement in double quoted strings.
- const char gmic_dollar = 23, gmic_lbrace = 24, gmic_rbrace = 25, gmic_comma = 26, gmic_dquote = 28,
-   gmic_store = 29; // <- this one is only used in variable names.
- 
--#endif // #ifndef gmic_build
--
- // Define main libgmic class 'gmic'.
- //----------------------------------
- #define gmic_image cimg_library::CImg
-
-Index: gmic-3.0.1/CMakeLists.txt
-===================================================================
---- gmic-3.0.1.orig/CMakeLists.txt
-+++ gmic-3.0.1/CMakeLists.txt
-@@ -165,7 +165,7 @@ if(BUILD_LIB)
-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-   )
--  install(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+  install(FILES src/gmic.h src/CImg.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- endif()
- 
- 
-

gmic-qt-make-it-work-without-gmic-cpp.patch

@@ -1,7 +1,7 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
+diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt
-index 5de581b..2b46de0 100644
+index fe92d48..8bba11e 100644
---- a/CMakeLists.txt
+--- a/gmic-qt/CMakeLists.txt
-+++ b/CMakeLists.txt
++++ b/gmic-qt/CMakeLists.txt
 @@ -29,17 +29,24 @@ else()
    message("Building for target host application: " ${GMIC_QT_HOST})
  endif()
@@ -144,15 +144,7 @@ index 5de581b..2b46de0 100644
  #
  # Threads
  #
-@@ -281,7 +297,6 @@ if(ENABLE_CURL)
+@@ -360,14 +376,19 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-     endif()
- endif()
- 
--add_definitions(-Dgmic_build)
- add_definitions(-Dgmic_community)
- add_definitions(-Dcimg_use_abort)
- add_definitions(-Dgmic_is_parallel)
-@@ -360,14 +375,19 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
      else()
        string(REPLACE "-O2" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
        string(REPLACE "-O3" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
@@ -174,7 +166,7 @@ index 5de581b..2b46de0 100644
  
  set (gmic_qt_SRCS
  
-@@ -443,11 +463,19 @@ set (gmic_qt_SRCS
+@@ -443,11 +464,19 @@ set (gmic_qt_SRCS
    src/Widgets/ProgressInfoWindow.h
    src/Widgets/VisibleTagSelector.h
    src/ZoomConstraint.h
@@ -197,7 +189,7 @@ index 5de581b..2b46de0 100644
    src/ClickableLabel.cpp
    src/Common.cpp
    src/OverrideCursor.cpp
-@@ -540,7 +568,9 @@ if(ENABLE_DYNAMIC_LINKING)
+@@ -540,7 +569,9 @@ if(ENABLE_DYNAMIC_LINKING)
      ${gmic_qt_LIBRARIES}
      "gmic"
      )
@@ -208,316 +200,3 @@ index 5de581b..2b46de0 100644
  else(ENABLE_DYNAMIC_LINKING)
    set(gmic_qt_SRCS
      ${gmic_qt_SRCS}
-diff --git a/gmic_qt.pro b/gmic_qt.pro
-index 53308cd..bb4ae61 100644
---- a/gmic_qt.pro
-+++ b/gmic_qt.pro
-@@ -68,7 +68,7 @@ equals( HOST, "gimp3" ) {
- 
- DEFINES += cimg_use_cpp11=1
- DEFINES += cimg_use_fftw3 cimg_use_zlib
--DEFINES += gmic_build cimg_use_abort gmic_is_parallel cimg_use_curl cimg_use_png
-+DEFINES += cimg_use_abort gmic_is_parallel cimg_use_curl cimg_use_png
- DEFINES += cimg_appname="\\\"gmic\\\""
- 
- equals(TIMING, "on") {
-diff --git a/src/CroppedActiveLayerProxy.cpp b/src/CroppedActiveLayerProxy.cpp
-index a5ae94e..eaf3b8e 100644
---- a/src/CroppedActiveLayerProxy.cpp
-+++ b/src/CroppedActiveLayerProxy.cpp
-@@ -27,6 +27,7 @@
- #include <QDebug>
- #include "Common.h"
- #include "Host/GmicQtHost.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/CroppedImageListProxy.cpp b/src/CroppedImageListProxy.cpp
-index b1ae9f6..a2482d0 100644
---- a/src/CroppedImageListProxy.cpp
-+++ b/src/CroppedImageListProxy.cpp
-@@ -28,6 +28,7 @@
- #include <cmath>
- #include "Common.h"
- #include "Host/GmicQtHost.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/FilterSelector/FavesModelReader.cpp b/src/FilterSelector/FavesModelReader.cpp
-index 184c95b..dfed485 100644
---- a/src/FilterSelector/FavesModelReader.cpp
-+++ b/src/FilterSelector/FavesModelReader.cpp
-@@ -38,6 +38,7 @@
- #include "FilterSelector/FavesModel.h"
- #include "Logger.h"
- #include "Utils.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/FilterSelector/FiltersModelReader.cpp b/src/FilterSelector/FiltersModelReader.cpp
-index 871efb0..277274b 100644
---- a/src/FilterSelector/FiltersModelReader.cpp
-+++ b/src/FilterSelector/FiltersModelReader.cpp
-@@ -38,6 +38,7 @@
- #include "LanguageSettings.h"
- #include "Logger.h"
- #include "Utils.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/FilterSyncRunner.cpp b/src/FilterSyncRunner.cpp
-index 1b40c4a..5d1e19a 100644
---- a/src/FilterSyncRunner.cpp
-+++ b/src/FilterSyncRunner.cpp
-@@ -30,6 +30,7 @@
- #include "GmicStdlib.h"
- #include "Logger.h"
- #include "Misc.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/FilterThread.cpp b/src/FilterThread.cpp
-index de4c2c7..aad0964 100644
---- a/src/FilterThread.cpp
-+++ b/src/FilterThread.cpp
-@@ -29,6 +29,7 @@
- #include "GmicStdlib.h"
- #include "Logger.h"
- #include "Misc.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/GmicProcessor.cpp b/src/GmicProcessor.cpp
-index e0bf1f1..98879b3 100644
---- a/src/GmicProcessor.cpp
-+++ b/src/GmicProcessor.cpp
-@@ -42,6 +42,7 @@
- #include "Logger.h"
- #include "Misc.h"
- #include "OverrideCursor.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/GmicQt.cpp b/src/GmicQt.cpp
-index e836072..5925e94 100644
---- a/src/GmicQt.cpp
-+++ b/src/GmicQt.cpp
-@@ -45,6 +45,7 @@
- #include "Updater.h"
- #include "Widgets/InOutPanel.h"
- #include "Widgets/ProgressInfoWindow.h"
-+#include "CImg.h"
- #include "gmic.h"
- #ifdef _IS_MACOS_
- #include <libgen.h>
-diff --git a/src/GmicStdlib.cpp b/src/GmicStdlib.cpp
-index 4abe758..02ab2d0 100644
---- a/src/GmicStdlib.cpp
-+++ b/src/GmicStdlib.cpp
-@@ -31,6 +31,7 @@
- #include <QStringList>
- #include "Common.h"
- #include "Utils.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/HeadlessProcessor.cpp b/src/HeadlessProcessor.cpp
-index 446d1a8..930facb 100644
---- a/src/HeadlessProcessor.cpp
-+++ b/src/HeadlessProcessor.cpp
-@@ -40,6 +40,7 @@
- #include "ParametersCache.h"
- #include "Updater.h"
- #include "Widgets/ProgressInfoWindow.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- #ifdef _IS_WINDOWS_
-diff --git a/src/Host/8bf/host_8bf.cpp b/src/Host/8bf/host_8bf.cpp
-index 816f10b..7bc7b09 100644
---- a/src/Host/8bf/host_8bf.cpp
-+++ b/src/Host/8bf/host_8bf.cpp
-@@ -42,6 +42,7 @@
- #include "Host/GmicQtHost.h"
- #include "ImageTools.h"
- #include "GmicQt.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- struct Gmic8bfLayer
-diff --git a/src/Host/Gimp/host_gimp.cpp b/src/Host/Gimp/host_gimp.cpp
-index cd19443..cd0c9c6 100644
---- a/src/Host/Gimp/host_gimp.cpp
-+++ b/src/Host/Gimp/host_gimp.cpp
-@@ -38,6 +38,7 @@
- #include "Host/GmicQtHost.h"
- #include "ImageTools.h"
- #include "GmicQt.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- /*
-diff --git a/src/Host/Krita/host_krita.cpp b/src/Host/Krita/host_krita.cpp
-index afb2a64..0cfc031 100644
---- a/src/Host/Krita/host_krita.cpp
-+++ b/src/Host/Krita/host_krita.cpp
-@@ -41,6 +41,7 @@
- #include "Common.h"
- #include "Host/GmicQtHost.h"
- #include "GmicQt.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- /*
-diff --git a/src/Host/None/ImageDialog.cpp b/src/Host/None/ImageDialog.cpp
-index 973c0ae..55bac48 100644
---- a/src/Host/None/ImageDialog.cpp
-+++ b/src/Host/None/ImageDialog.cpp
-@@ -31,6 +31,7 @@
- #include <QStringList>
- #include "Common.h"
- #include "JpegQualityDialog.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace gmic_qt_standalone
-diff --git a/src/Host/None/host_none.cpp b/src/Host/None/host_none.cpp
-index 35b68ea..300e69a 100644
---- a/src/Host/None/host_none.cpp
-+++ b/src/Host/None/host_none.cpp
-@@ -40,6 +40,7 @@
- #include "GmicQt.h"
- #include "Host/GmicQtHost.h"
- #include "Host/None/ImageDialog.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- #define STRINGIFY(X) #X
-diff --git a/src/Host/PaintDotNet/host_paintdotnet.cpp b/src/Host/PaintDotNet/host_paintdotnet.cpp
-index 60bdab7..fe5eb3c 100644
---- a/src/Host/PaintDotNet/host_paintdotnet.cpp
-+++ b/src/Host/PaintDotNet/host_paintdotnet.cpp
-@@ -33,6 +33,7 @@
- #include "Host/GmicQtHost.h"
- #include "MainWindow.h"
- #include "GmicQt.h"
-+#include "CImg.h"
- #include "gmic.h"
- #include <Windows.h>
- 
-diff --git a/src/ImageTools.cpp b/src/ImageTools.cpp
-index f27ce72..ff592b0 100644
---- a/src/ImageTools.cpp
-+++ b/src/ImageTools.cpp
-@@ -27,6 +27,7 @@
- #include <QImage>
- #include <QPainter>
- #include "GmicStdlib.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- /*
-diff --git a/src/Logger.cpp b/src/Logger.cpp
-index ddff5d9..81a4af4 100644
---- a/src/Logger.cpp
-+++ b/src/Logger.cpp
-@@ -29,6 +29,7 @@
- #include "Common.h"
- #include "Utils.h"
- #include "GmicQt.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
-index 33db6e4..4f5e650 100644
---- a/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
-@@ -61,6 +61,7 @@
- #include "Utils.h"
- #include "Widgets/VisibleTagSelector.h"
- #include "ui_mainwindow.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace
-diff --git a/src/Misc.cpp b/src/Misc.cpp
-index 3a4148b..c59b272 100644
---- a/src/Misc.cpp
-+++ b/src/Misc.cpp
-@@ -38,6 +38,7 @@
- #include "Globals.h"
- #include "HtmlTranslator.h"
- #include "Logger.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace
-diff --git a/src/ParametersCache.cpp b/src/ParametersCache.cpp
-index c7bcad8..8d2fc45 100644
---- a/src/ParametersCache.cpp
-+++ b/src/ParametersCache.cpp
-@@ -35,6 +35,7 @@
- #include "Globals.h"
- #include "Logger.h"
- #include "Utils.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/Updater.cpp b/src/Updater.cpp
-index 47f6882..2f8e7de 100644
---- a/src/Updater.cpp
-+++ b/src/Updater.cpp
-@@ -33,6 +33,7 @@
- #include "Logger.h"
- #include "Misc.h"
- #include "Utils.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/Utils.cpp b/src/Utils.cpp
-index dc0e1e4..ee6a119 100644
---- a/src/Utils.cpp
-+++ b/src/Utils.cpp
-@@ -36,6 +36,7 @@
- #include "Common.h"
- #include "Host/GmicQtHost.h"
- #include "Logger.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- #ifdef _IS_WINDOWS_
-diff --git a/src/Widgets/PreviewWidget.cpp b/src/Widgets/PreviewWidget.cpp
-index 6415b46..f87edac 100644
---- a/src/Widgets/PreviewWidget.cpp
-+++ b/src/Widgets/PreviewWidget.cpp
-@@ -42,6 +42,7 @@
- #include "Logger.h"
- #include "Misc.h"
- #include "OverrideCursor.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt
-diff --git a/src/Widgets/ProgressInfoWindow.cpp b/src/Widgets/ProgressInfoWindow.cpp
-index 5095528..341e2e0 100644
---- a/src/Widgets/ProgressInfoWindow.cpp
-+++ b/src/Widgets/ProgressInfoWindow.cpp
-@@ -38,6 +38,7 @@
- #include "HeadlessProcessor.h"
- #include "Updater.h"
- #include "ui_progressinfowindow.h"
-+#include "CImg.h"
- #include "gmic.h"
- 
- namespace GmicQt

gmic.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Feb  7 10:11:38 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 3.0.2. No changelog.
+- Drop upstream changes:
+  * gmic-make-build-without-gmic-cpp.patch
+  * 56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
+- Rebase patches:
+  * gmic-qt-make-it-work-without-gmic-cpp.patch
+  * krita5.patch
+- Add patch:
+  * 0001-Remove-unneeded-CImg-include.patch
+
 -------------------------------------------------------------------
 Tue Jan 18 10:11:09 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 

gmic.spec

@@ -40,7 +40,7 @@
 %define gmic_datadir %{_datadir}/gmic
 
 Name:           gmic
-Version:        3.0.1
+Version:        3.0.2
 Release:        0
 Summary:        GREYC's Magick for Image Computing (denoise and others)
 # gmic-qt is GPL-3.0-or-later, zart is CECILL-2.0, libgmic and cli program are
@@ -51,15 +51,12 @@ URL:            https://gmic.eu
 # Git URL:      https://github.com/dtschump/gmic
 Source0:        https://gmic.eu/files/source/gmic_%{version}.tar.gz
 Source1:        gmic_qt.png
-Source99:       series
-# PATCH-FIX-UPSTREAM gmic-make-build-without-gmic-cpp.patch - all those changes are already merged
-Patch0:         gmic-make-build-without-gmic-cpp.patch
 # PATCH-FIX-UPSTREAM gmic-qt-make-it-work-without-gmic-cpp.patch - https://github.com/c-koi/gmic-qt/pull/134
-Patch1:         gmic-qt-make-it-work-without-gmic-cpp.patch
+Patch0:         gmic-qt-make-it-work-without-gmic-cpp.patch
 # PATCH-FIX-UPSTREAM krita.patch - Will be sent upstream soon. For now https://github.com/darix/gmic-qt/tree/krita5
-Patch2:         krita5.patch
+Patch1:         krita5.patch
-# PATCH-FIX-UPSTREAM 56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch - Already upstream
+# PATCH-FIX-UPSTREAM
-Patch3:         https://github.com/dtschump/gmic/commit/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
+Patch2:         0001-Remove-unneeded-CImg-include.patch
 BuildRequires:  cmake >= 3.14.0
 BuildRequires:  fftw3-threads-devel
 #
@@ -178,13 +175,7 @@ BuildArch:      noarch
 This package contains shared data files for the various gmic frontends.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch0 -p1
-pushd gmic-qt
-%patch1 -p1
-%patch2 -p1
-popd
-%patch3 -p1
 
 %build
 # Build gmic

gmic_3.0.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6cc20a20e3ab53ce485ccf6e044a30141b3d62cf7743b83bb04906ff29453035
-size 10457923

gmic_3.0.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68acec32c45d56fb0b0408acec4f63166171816d70722d63106787f1e7d17030
+size 10458732

krita5.patch

@@ -1,7 +1,7 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
+diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt
-index 2b46de0..b5974b7 100644
+index 8bba11e..6137f59 100644
---- a/CMakeLists.txt
+--- a/gmic-qt/CMakeLists.txt
-+++ b/CMakeLists.txt
++++ b/gmic-qt/CMakeLists.txt
 @@ -22,7 +22,7 @@ endif()
  
  message("Build type is " ${CMAKE_BUILD_TYPE})
@@ -11,7 +11,7 @@ index 2b46de0..b5974b7 100644
  if (${GMIC_QT_HOST} STREQUAL "none")
    message("Building standalone version.")
  else()
-@@ -656,6 +656,71 @@ elseif (${GMIC_QT_HOST} STREQUAL "krita")
+@@ -657,6 +657,71 @@ elseif (${GMIC_QT_HOST} STREQUAL "krita")
        ${gmic_qt_LIBRARIES}
        )
      install(TARGETS gmic_krita_qt RUNTIME DESTINATION bin)
@@ -83,7 +83,7 @@ index 2b46de0..b5974b7 100644
  
  elseif (${GMIC_QT_HOST} STREQUAL "none")
  
-@@ -699,7 +764,7 @@ elseif (${GMIC_QT_HOST} STREQUAL "8bf")
+@@ -700,7 +765,7 @@ elseif (${GMIC_QT_HOST} STREQUAL "8bf")
        )
  
  else()
@@ -92,11 +92,11 @@ index 2b46de0..b5974b7 100644
  endif()
  
  feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-diff --git a/gmic_krita_qt.desktop b/gmic_krita_qt.desktop
+diff --git a/gmic-qt/gmic_krita_qt.desktop b/gmic-qt/gmic_krita_qt.desktop
 new file mode 100644
 index 0000000..579d427
 --- /dev/null
-+++ b/gmic_krita_qt.desktop
++++ b/gmic-qt/gmic_krita_qt.desktop
 @@ -0,0 +1,9 @@
 +[Desktop Entry]
 +Name=gmic_krita_qt
@@ -107,10 +107,10 @@ index 0000000..579d427
 +Icon=gmic_krita_qt
 +Categories=Qt;KDE;Graphics;
 +StartupNotify=false
-diff --git a/src/DialogSettings.cpp b/src/DialogSettings.cpp
+diff --git a/gmic-qt/src/DialogSettings.cpp b/gmic-qt/src/DialogSettings.cpp
 index b3d8c53..e4050b4 100644
---- a/src/DialogSettings.cpp
+--- a/gmic-qt/src/DialogSettings.cpp
-+++ b/src/DialogSettings.cpp
++++ b/gmic-qt/src/DialogSettings.cpp
 @@ -93,11 +93,7 @@ DialogSettings::DialogSettings(QWidget * parent) : QDialog(parent), ui(new Ui::D
  #ifdef _GMIC_QT_DEBUG_
    ui->cbUpdatePeriodicity->addItem(tr("At launch (debug)"), QVariant(0));
@@ -233,10 +233,10 @@ index b3d8c53..e4050b4 100644
  }
  
  QString DialogSettings::languageCode()
-diff --git a/src/FilterParameters/BoolParameter.cpp b/src/FilterParameters/BoolParameter.cpp
+diff --git a/gmic-qt/src/FilterParameters/BoolParameter.cpp b/gmic-qt/src/FilterParameters/BoolParameter.cpp
 index 7f24464..3ba8313 100644
---- a/src/FilterParameters/BoolParameter.cpp
+--- a/gmic-qt/src/FilterParameters/BoolParameter.cpp
-+++ b/src/FilterParameters/BoolParameter.cpp
++++ b/gmic-qt/src/FilterParameters/BoolParameter.cpp
 @@ -59,12 +59,14 @@ bool BoolParameter::addTo(QWidget * widget, int row)
    delete _label;
    _checkBox = new QCheckBox(_name, widget);
@@ -252,10 +252,10 @@ index 7f24464..3ba8313 100644
    _grid->addWidget(_checkBox, row, 0, 1, 3);
    connectCheckBox();
    return true;
-diff --git a/src/FilterParameters/FloatParameter.cpp b/src/FilterParameters/FloatParameter.cpp
+diff --git a/gmic-qt/src/FilterParameters/FloatParameter.cpp b/gmic-qt/src/FilterParameters/FloatParameter.cpp
 index c47fc9c..67a0a3e 100644
---- a/src/FilterParameters/FloatParameter.cpp
+--- a/gmic-qt/src/FilterParameters/FloatParameter.cpp
-+++ b/src/FilterParameters/FloatParameter.cpp
++++ b/gmic-qt/src/FilterParameters/FloatParameter.cpp
 @@ -72,13 +72,14 @@ bool FloatParameter::addTo(QWidget * widget, int row)
    _slider->setMinimumWidth(SLIDER_MIN_WIDTH);
    _slider->setRange(0, SLIDER_MAX_RANGE);
@@ -272,10 +272,10 @@ index c47fc9c..67a0a3e 100644
    _spinBox = new CustomDoubleSpinBox(widget, _min, _max);
    _spinBox->setSingleStep(double(_max - _min) / 100.0);
    _spinBox->setValue((double)_value);
-diff --git a/src/FilterParameters/IntParameter.cpp b/src/FilterParameters/IntParameter.cpp
+diff --git a/gmic-qt/src/FilterParameters/IntParameter.cpp b/gmic-qt/src/FilterParameters/IntParameter.cpp
 index 0a32a65..b12058d 100644
---- a/src/FilterParameters/IntParameter.cpp
+--- a/gmic-qt/src/FilterParameters/IntParameter.cpp
-+++ b/src/FilterParameters/IntParameter.cpp
++++ b/gmic-qt/src/FilterParameters/IntParameter.cpp
 @@ -80,12 +80,14 @@ bool IntParameter::addTo(QWidget * widget, int row)
  
    _spinBox = new CustomSpinBox(widget, _min, _max);
@@ -291,10 +291,10 @@ index 0a32a65..b12058d 100644
    _grid->addWidget(_label = new QLabel(_name, widget), row, 0, 1, 1);
    _grid->addWidget(_slider, row, 1, 1, 1);
    _grid->addWidget(_spinBox, row, 2, 1, 1);
-diff --git a/src/FilterParameters/NoteParameter.cpp b/src/FilterParameters/NoteParameter.cpp
+diff --git a/gmic-qt/src/FilterParameters/NoteParameter.cpp b/gmic-qt/src/FilterParameters/NoteParameter.cpp
 index 34d3424..bd1df33 100644
---- a/src/FilterParameters/NoteParameter.cpp
+--- a/gmic-qt/src/FilterParameters/NoteParameter.cpp
-+++ b/src/FilterParameters/NoteParameter.cpp
++++ b/gmic-qt/src/FilterParameters/NoteParameter.cpp
 @@ -87,14 +87,14 @@ bool NoteParameter::initFromText(const QString & filterName, const char * text,
    _text = list[1].trimmed(); // Notes are never translated
    _text.remove(QRegExp("^\"")).remove(QRegExp("\"$")).replace(QString("\\\""), "\"");
@@ -312,10 +312,10 @@ index 34d3424..bd1df33 100644
    _text.replace(QRegExp("color\\s*=\\s*\""), QString("style=\"color:"));
    _text.replace(QRegExp("foreground\\s*=\\s*\""), QString("style=\"color:"));
    _text = HtmlTranslator::fromUtf8Escapes(_text);
-diff --git a/src/FilterParameters/SeparatorParameter.cpp b/src/FilterParameters/SeparatorParameter.cpp
+diff --git a/gmic-qt/src/FilterParameters/SeparatorParameter.cpp b/gmic-qt/src/FilterParameters/SeparatorParameter.cpp
 index 40347f7..941b280 100644
---- a/src/FilterParameters/SeparatorParameter.cpp
+--- a/gmic-qt/src/FilterParameters/SeparatorParameter.cpp
-+++ b/src/FilterParameters/SeparatorParameter.cpp
++++ b/gmic-qt/src/FilterParameters/SeparatorParameter.cpp
 @@ -58,9 +58,11 @@ bool SeparatorParameter::addTo(QWidget * widget, int row)
    _frame->setSizePolicy(sizePolicy);
    _frame->setFrameShape(QFrame::HLine);
@@ -328,10 +328,10 @@ index 40347f7..941b280 100644
    _grid->addWidget(_frame, row, 0, 1, 3);
    return true;
  }
-diff --git a/src/FilterSelector/FiltersPresenter.cpp b/src/FilterSelector/FiltersPresenter.cpp
+diff --git a/gmic-qt/src/FilterSelector/FiltersPresenter.cpp b/gmic-qt/src/FilterSelector/FiltersPresenter.cpp
 index e39270f..18e722e 100644
---- a/src/FilterSelector/FiltersPresenter.cpp
+--- a/gmic-qt/src/FilterSelector/FiltersPresenter.cpp
-+++ b/src/FilterSelector/FiltersPresenter.cpp
++++ b/gmic-qt/src/FilterSelector/FiltersPresenter.cpp
 @@ -416,7 +416,7 @@ void FiltersPresenter::expandFaveFolder()
  void FiltersPresenter::expandPreviousSessionExpandedFolders()
  {
@@ -341,10 +341,10 @@ index e39270f..18e722e 100644
      _filtersView->expandFolders(expandedFolderPaths);
    }
  }
-diff --git a/src/Globals.h b/src/Globals.h
+diff --git a/gmic-qt/src/Globals.h b/gmic-qt/src/Globals.h
 index 9d38982..782a732 100644
---- a/src/Globals.h
+--- a/gmic-qt/src/Globals.h
-+++ b/src/Globals.h
++++ b/gmic-qt/src/Globals.h
 @@ -55,7 +55,13 @@ const char WarningPrefix = '!';
  #define ONE_WEEK_HOURS (7 * 24)
  #define TWO_WEEKS_HOURS (14 * 24)
@@ -377,11 +377,11 @@ index 9d38982..782a732 100644
 +#endif
 +
  #endif // GMIC_QT_GLOBALS_H
-diff --git a/src/GmicQt.cpp b/src/GmicQt.cpp
+diff --git a/gmic-qt/src/GmicQt.cpp b/gmic-qt/src/GmicQt.cpp
-index 5925e94..9ac512c 100644
+index e836072..ddf2d40 100644
---- a/src/GmicQt.cpp
+--- a/gmic-qt/src/GmicQt.cpp
-+++ b/src/GmicQt.cpp
++++ b/gmic-qt/src/GmicQt.cpp
-@@ -88,7 +88,7 @@ RunParameters lastAppliedFilterRunParameters(ReturnedRunParametersFlag flag)
+@@ -87,7 +87,7 @@ RunParameters lastAppliedFilterRunParameters(ReturnedRunParametersFlag flag)
  {
    configureApplication();
    RunParameters parameters;
@@ -390,7 +390,7 @@ index 5925e94..9ac512c 100644
    const QString path = settings.value(QString("LastExecution/host_%1/FilterPath").arg(GmicQtHost::ApplicationShortname)).toString();
    parameters.filterPath = path.toStdString();
    QString args = settings.value(QString("LastExecution/host_%1/Arguments").arg(GmicQtHost::ApplicationShortname)).toString();
-@@ -198,7 +198,7 @@ int run(UserInterfaceMode interfaceMode,                   //
+@@ -197,7 +197,7 @@ int run(UserInterfaceMode interfaceMode,                   //
      LanguageSettings::installTranslators();
      MainWindow mainWindow;
      mainWindow.setPluginParameters(parameters);
@@ -399,7 +399,7 @@ index 5925e94..9ac512c 100644
        mainWindow.showMaximized();
      } else {
        mainWindow.show();
-@@ -546,10 +546,12 @@ namespace
+@@ -545,10 +545,12 @@ namespace
  
  void configureApplication()
  {
@@ -412,10 +412,10 @@ index 5925e94..9ac512c 100644
  }
  
  void disableModes(const std::list<GmicQt::InputMode> & disabledInputModes, //
-diff --git a/src/HeadlessProcessor.cpp b/src/HeadlessProcessor.cpp
+diff --git a/gmic-qt/src/HeadlessProcessor.cpp b/gmic-qt/src/HeadlessProcessor.cpp
-index 930facb..fc45aaa 100644
+index 446d1a8..3fadf4a 100644
---- a/src/HeadlessProcessor.cpp
+--- a/gmic-qt/src/HeadlessProcessor.cpp
-+++ b/src/HeadlessProcessor.cpp
++++ b/gmic-qt/src/HeadlessProcessor.cpp
 @@ -27,6 +27,7 @@
  #include <QMessageBox>
  #include <QSettings>
@@ -424,7 +424,7 @@ index 930facb..fc45aaa 100644
  #include "Common.h"
  #include "DialogSettings.h"
  #include "FilterParameters/FilterParametersWidget.h"
-@@ -72,7 +73,7 @@ HeadlessProcessor::~HeadlessProcessor()
+@@ -71,7 +72,7 @@ HeadlessProcessor::~HeadlessProcessor()
  
  bool HeadlessProcessor::setPluginParameters(const RunParameters & parameters)
  {
@@ -433,7 +433,7 @@ index 930facb..fc45aaa 100644
    _path = QString::fromStdString(parameters.filterPath);
    _inputMode = (parameters.inputMode == InputMode::Unspecified) ? DefaultInputMode : parameters.inputMode;
    _outputMode = (parameters.outputMode == OutputMode::Unspecified) ? DefaultOutputMode : parameters.outputMode;
-@@ -239,7 +240,7 @@ void HeadlessProcessor::onProcessingFinished()
+@@ -238,7 +239,7 @@ void HeadlessProcessor::onProcessingFinished()
        GmicQtHost::outputImages(images, _filterThread->imageNames(), _outputMode);
        _processingCompletedProperly = true;
      }
@@ -442,7 +442,7 @@ index 930facb..fc45aaa 100644
      if (!status.isEmpty() && !_hash.isEmpty()) {
        ParametersCache::setValues(_hash, status);
        ParametersCache::save();
-@@ -272,7 +273,9 @@ void HeadlessProcessor::endApplication(const QString & errorMessage)
+@@ -271,7 +272,9 @@ void HeadlessProcessor::endApplication(const QString & errorMessage)
    if (!errorMessage.isEmpty()) {
      Logger::error(errorMessage);
    }
@@ -452,11 +452,11 @@ index 930facb..fc45aaa 100644
  }
  
  } // namespace GmicQt
-diff --git a/src/Host/KritaPlugin/gmicqttoolplugin.cpp b/src/Host/KritaPlugin/gmicqttoolplugin.cpp
+diff --git a/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.cpp b/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.cpp
 new file mode 100644
 index 0000000..6ef6a4e
 --- /dev/null
-+++ b/src/Host/KritaPlugin/gmicqttoolplugin.cpp
++++ b/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.cpp
 @@ -0,0 +1,204 @@
 +/*
 + *  This file is part of G'MIC-Qt, a generic plug-in for raster graphics
@@ -662,11 +662,11 @@ index 0000000..6ef6a4e
 +}
 +
 +#include "gmicqttoolplugin.moc"
-diff --git a/src/Host/KritaPlugin/gmicqttoolplugin.h b/src/Host/KritaPlugin/gmicqttoolplugin.h
+diff --git a/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.h b/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.h
 new file mode 100644
 index 0000000..bea9056
 --- /dev/null
-+++ b/src/Host/KritaPlugin/gmicqttoolplugin.h
++++ b/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.h
 @@ -0,0 +1,55 @@
 +/*
 + *  This file is part of G'MIC-Qt, a generic plug-in for raster graphics
@@ -723,11 +723,11 @@ index 0000000..bea9056
 +};
 +
 +#endif
-diff --git a/src/Host/KritaPlugin/gmicqttoolplugin.json b/src/Host/KritaPlugin/gmicqttoolplugin.json
+diff --git a/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.json b/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.json
 new file mode 100644
 index 0000000..4639d5e
 --- /dev/null
-+++ b/src/Host/KritaPlugin/gmicqttoolplugin.json
++++ b/gmic-qt/src/Host/KritaPlugin/gmicqttoolplugin.json
 @@ -0,0 +1,9 @@
 +{
 +    "Id": "GMic-Qt Krita Plugin",
@@ -738,12 +738,12 @@ index 0000000..4639d5e
 +    ],
 +    "X-Krita-Version": "28"
 +}
-diff --git a/src/Host/KritaPlugin/host.cpp b/src/Host/KritaPlugin/host.cpp
+diff --git a/gmic-qt/src/Host/KritaPlugin/host.cpp b/gmic-qt/src/Host/KritaPlugin/host.cpp
 new file mode 100644
-index 0000000..7206922
+index 0000000..1f244f6
 --- /dev/null
-+++ b/src/Host/KritaPlugin/host.cpp
++++ b/gmic-qt/src/Host/KritaPlugin/host.cpp
-@@ -0,0 +1,188 @@
+@@ -0,0 +1,187 @@
 +/*
 + * Copyright (C) 2017 Boudewijn Rempt <boud@valdyas.org>
 + * Copyright (C) 2020-2021 L. E. Segovia <amy@amyspark.me>
@@ -779,7 +779,6 @@ index 0000000..7206922
 +
 +#include "GmicQt.h"
 +#include "Host/GmicQtHost.h"
-+#include "CImg.h"
 +#include "gmic.h"
 +#include "kis_qmic_interface.h"
 +
@@ -932,10 +931,10 @@ index 0000000..7206922
 +}
 +
 +} // namespace GmicQtHost
-diff --git a/src/Host/None/JpegQualityDialog.cpp b/src/Host/None/JpegQualityDialog.cpp
+diff --git a/gmic-qt/src/Host/None/JpegQualityDialog.cpp b/gmic-qt/src/Host/None/JpegQualityDialog.cpp
 index b351994..3ea120d 100644
---- a/src/Host/None/JpegQualityDialog.cpp
+--- a/gmic-qt/src/Host/None/JpegQualityDialog.cpp
-+++ b/src/Host/None/JpegQualityDialog.cpp
++++ b/gmic-qt/src/Host/None/JpegQualityDialog.cpp
 @@ -1,6 +1,7 @@
  #include "JpegQualityDialog.h"
  #include <QSettings>
@@ -962,10 +961,10 @@ index b351994..3ea120d 100644
    });
    connect(ui->pbOk, &QPushButton::clicked, this, &QDialog::accept);
    connect(ui->pbCancel, &QPushButton::clicked, this, &QDialog::reject);
-diff --git a/src/LanguageSettings.cpp b/src/LanguageSettings.cpp
+diff --git a/gmic-qt/src/LanguageSettings.cpp b/gmic-qt/src/LanguageSettings.cpp
 index e18f31f..8c6f8f2 100644
---- a/src/LanguageSettings.cpp
+--- a/gmic-qt/src/LanguageSettings.cpp
-+++ b/src/LanguageSettings.cpp
++++ b/gmic-qt/src/LanguageSettings.cpp
 @@ -23,6 +23,7 @@
   *
   */
@@ -996,11 +995,11 @@ index e18f31f..8c6f8f2 100644
        installTranslator(QString(":/translations/filters/%1.qm").arg(lang));
      }
    }
-diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+diff --git a/gmic-qt/src/MainWindow.cpp b/gmic-qt/src/MainWindow.cpp
-index 4f5e650..d614cd8 100644
+index 33db6e4..9311901 100644
---- a/src/MainWindow.cpp
+--- a/gmic-qt/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
++++ b/gmic-qt/src/MainWindow.cpp
-@@ -185,8 +185,12 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent), ui(new Ui::MainW
+@@ -184,8 +184,12 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent), ui(new Ui::MainW
      updateShortcutF5->setContext(Qt::ApplicationShortcut);
      QShortcut * updateShortcutCtrlR = new QShortcut(QKeySequence("Ctrl+R"), this);
      updateShortcutCtrlR->setContext(Qt::ApplicationShortcut);
@@ -1013,7 +1012,7 @@ index 4f5e650..d614cd8 100644
      ui->tbUpdateFilters->setToolTip(updateText);
    }
  
-@@ -274,6 +278,7 @@ void MainWindow::setIcons()
+@@ -273,6 +277,7 @@ void MainWindow::setIcons()
    ui->tbExpandCollapse->setIcon(_expandIcon);
  }
  
@@ -1021,7 +1020,7 @@ index 4f5e650..d614cd8 100644
  void MainWindow::setDarkTheme()
  {
    // SHOW(QStyleFactory::keys());
-@@ -326,6 +331,7 @@ void MainWindow::setDarkTheme()
+@@ -325,6 +330,7 @@ void MainWindow::setDarkTheme()
    ui->vSplitterLine->setStyleSheet("QFrame{ border-top: 0px none #a0a0a0; border-bottom: 1px solid rgb(160,160,160);}");
    DialogSettings::UnselectedFilterTextColor = DialogSettings::UnselectedFilterTextColor.darker(150);
  }
@@ -1029,7 +1028,7 @@ index 4f5e650..d614cd8 100644
  
  void MainWindow::setPluginParameters(const RunParameters & parameters)
  {
-@@ -380,7 +386,7 @@ void MainWindow::buildFiltersTree()
+@@ -379,7 +385,7 @@ void MainWindow::buildFiltersTree()
      _filtersPresenter->importGmicGTKFaves();
      _filtersPresenter->saveFaves();
      _gtkFavesShouldBeImported = false;
@@ -1038,7 +1037,7 @@ index 4f5e650..d614cd8 100644
    }
  
    _filtersPresenter->toggleSelectionMode(withVisibility);
-@@ -478,7 +484,7 @@ void MainWindow::onStartupFiltersUpdateFinished(int status)
+@@ -477,7 +483,7 @@ void MainWindow::onStartupFiltersUpdateFinished(int status)
    } else if (status == (int)Updater::UpdateStatus::NotNecessary) {
    }
  
@@ -1047,7 +1046,7 @@ index 4f5e650..d614cd8 100644
      _gtkFavesShouldBeImported = false;
    } else {
      _gtkFavesShouldBeImported = askUserForGTKFavesImport();
-@@ -495,7 +501,7 @@ void MainWindow::onStartupFiltersUpdateFinished(int status)
+@@ -494,7 +500,7 @@ void MainWindow::onStartupFiltersUpdateFinished(int status)
    }
  
    // Retrieve and select previously selected filter
@@ -1056,7 +1055,7 @@ index 4f5e650..d614cd8 100644
    if (_newSession || !_lastExecutionOK) {
      hash.clear();
    }
-@@ -560,7 +566,9 @@ void MainWindow::onEscapeKeyPressed()
+@@ -559,7 +565,9 @@ void MainWindow::onEscapeKeyPressed()
      } else {
        _processor.cancel();
        ui->previewWidget->displayOriginalImage();
@@ -1066,7 +1065,7 @@ index 4f5e650..d614cd8 100644
      }
    }
  }
-@@ -672,7 +680,9 @@ void MainWindow::onPreviewUpdateRequested(bool synchronous)
+@@ -671,7 +679,9 @@ void MainWindow::onPreviewUpdateRequested(bool synchronous)
      ui->previewWidget->displayOriginalImage();
      return;
    }
@@ -1076,7 +1075,7 @@ index 4f5e650..d614cd8 100644
  
    const FiltersPresenter::Filter currentFilter = _filtersPresenter->currentFilter();
    GmicProcessor::FilterContext context;
-@@ -734,7 +744,9 @@ void MainWindow::onPreviewImageAvailable()
+@@ -733,7 +743,9 @@ void MainWindow::onPreviewImageAvailable()
    }
    ui->previewWidget->setPreviewImage(_processor.previewImage());
    ui->previewWidget->enableRightClick();
@@ -1086,7 +1085,7 @@ index 4f5e650..d614cd8 100644
    if (_pendingActionAfterCurrentProcessing == ProcessingAction::Close) {
      close();
    }
-@@ -744,7 +756,9 @@ void MainWindow::onPreviewError(const QString & message)
+@@ -743,7 +755,9 @@ void MainWindow::onPreviewError(const QString & message)
  {
    ui->previewWidget->setPreviewErrorMessage(message);
    ui->previewWidget->enableRightClick();
@@ -1096,7 +1095,7 @@ index 4f5e650..d614cd8 100644
    if (_pendingActionAfterCurrentProcessing == ProcessingAction::Close) {
      close();
    }
-@@ -970,7 +984,7 @@ void MainWindow::saveCurrentParameters()
+@@ -969,7 +983,7 @@ void MainWindow::saveCurrentParameters()
  
  void MainWindow::saveSettings()
  {
@@ -1105,7 +1104,7 @@ index 4f5e650..d614cd8 100644
  
    _filtersPresenter->saveSettings(settings);
  
-@@ -1011,7 +1025,7 @@ void MainWindow::saveSettings()
+@@ -1010,7 +1024,7 @@ void MainWindow::saveSettings()
  
  void MainWindow::loadSettings()
  {
@@ -1114,7 +1113,7 @@ index 4f5e650..d614cd8 100644
    _filtersPresenter->loadSettings(settings);
  
    _lastExecutionOK = settings.value("LastExecution/ExitedNormally", true).toBool();
-@@ -1027,9 +1041,11 @@ void MainWindow::loadSettings()
+@@ -1026,9 +1040,11 @@ void MainWindow::loadSettings()
    if (settings.value("Config/PreviewPosition", "Left").toString() == "Left") {
      setPreviewPosition(PreviewPosition::Left);
    }
@@ -1126,7 +1125,7 @@ index 4f5e650..d614cd8 100644
    if (!DialogSettings::logosAreVisible()) {
      ui->logosLabel->hide();
    }
-@@ -1069,7 +1085,7 @@ void MainWindow::loadSettings()
+@@ -1068,7 +1084,7 @@ void MainWindow::loadSettings()
      ui->splitter->setSizes(sizes);
    }
  
@@ -1135,7 +1134,7 @@ index 4f5e650..d614cd8 100644
  }
  
  void MainWindow::setPreviewPosition(MainWindow::PreviewPosition position)
-@@ -1131,7 +1147,7 @@ void MainWindow::setPreviewPosition(MainWindow::PreviewPosition position)
+@@ -1130,7 +1146,7 @@ void MainWindow::setPreviewPosition(MainWindow::PreviewPosition position)
  void MainWindow::adjustVerticalSplitter()
  {
    QList<int> sizes;
@@ -1144,7 +1143,7 @@ index 4f5e650..d614cd8 100644
    sizes.push_back(settings.value(QString("Config/ParamsVerticalSplitterSizeTop"), -1).toInt());
    sizes.push_back(settings.value(QString("Config/ParamsVerticalSplitterSizeBottom"), -1).toInt());
    const int splitterHeight = ui->verticalSplitter->height();
-@@ -1252,12 +1268,16 @@ void MainWindow::showEvent(QShowEvent * event)
+@@ -1251,12 +1267,16 @@ void MainWindow::showEvent(QShowEvent * event)
    Updater::setOutputMessageMode(DialogSettings::outputMessageMode());
    int ageLimit;
    {
@@ -1163,7 +1162,7 @@ index 4f5e650..d614cd8 100644
  }
  
  void MainWindow::resizeEvent(QResizeEvent * e)
-@@ -1274,17 +1294,19 @@ bool MainWindow::askUserForGTKFavesImport()
+@@ -1273,17 +1293,19 @@ bool MainWindow::askUserForGTKFavesImport()
                           QMessageBox::Yes | QMessageBox::No, this);
    messageBox.setDefaultButton(QMessageBox::Yes);
    QCheckBox * cb = new QCheckBox(tr("Don't ask again"));
@@ -1184,10 +1183,10 @@ index 4f5e650..d614cd8 100644
      }
      return false;
    }
-diff --git a/src/MainWindow.h b/src/MainWindow.h
+diff --git a/gmic-qt/src/MainWindow.h b/gmic-qt/src/MainWindow.h
 index a72f762..3819510 100644
---- a/src/MainWindow.h
+--- a/gmic-qt/src/MainWindow.h
-+++ b/src/MainWindow.h
++++ b/gmic-qt/src/MainWindow.h
 @@ -71,7 +71,9 @@ public:
    explicit MainWindow(QWidget * parent = nullptr);
    ~MainWindow() override;
@@ -1198,10 +1197,10 @@ index a72f762..3819510 100644
    void setPluginParameters(const RunParameters & parameters);
  
  public slots:
-diff --git a/src/Tags.cpp b/src/Tags.cpp
+diff --git a/gmic-qt/src/Tags.cpp b/gmic-qt/src/Tags.cpp
 index 4092ccc..d33e460 100644
---- a/src/Tags.cpp
+--- a/gmic-qt/src/Tags.cpp
-+++ b/src/Tags.cpp
++++ b/gmic-qt/src/Tags.cpp
 @@ -148,7 +148,10 @@ QAction * TagAssets::action(QObject * parent, TagColor color, IconMark mark)
    if ((color == TagColor::None) || (color == TagColor::Count)) {
      return nullptr;
@@ -1214,10 +1213,10 @@ index 4092ccc..d33e460 100644
  }
  
  QString TagAssets::colorName(TagColor color)
-diff --git a/src/Widgets/InOutPanel.cpp b/src/Widgets/InOutPanel.cpp
+diff --git a/gmic-qt/src/Widgets/InOutPanel.cpp b/gmic-qt/src/Widgets/InOutPanel.cpp
 index a388052..67bdcd1 100644
---- a/src/Widgets/InOutPanel.cpp
+--- a/gmic-qt/src/Widgets/InOutPanel.cpp
-+++ b/src/Widgets/InOutPanel.cpp
++++ b/gmic-qt/src/Widgets/InOutPanel.cpp
 @@ -158,10 +158,12 @@ void InOutPanel::onResetButtonClicked()
    setState(InputOutputState::Default, true);
  }
@@ -1231,10 +1230,10 @@ index a388052..67bdcd1 100644
  
  void InOutPanel::setDefaultInputMode()
  {
-diff --git a/src/Widgets/InOutPanel.h b/src/Widgets/InOutPanel.h
+diff --git a/gmic-qt/src/Widgets/InOutPanel.h b/gmic-qt/src/Widgets/InOutPanel.h
 index 381bc64..7939d3a 100644
---- a/src/Widgets/InOutPanel.h
+--- a/gmic-qt/src/Widgets/InOutPanel.h
-+++ b/src/Widgets/InOutPanel.h
++++ b/gmic-qt/src/Widgets/InOutPanel.h
 @@ -79,7 +79,9 @@ public slots:
    void onInputModeSelected(int);
    void onOutputModeSelected(int);
@@ -1245,11 +1244,11 @@ index 381bc64..7939d3a 100644
  
  private:
    static void setDefaultInputMode();
-diff --git a/src/Widgets/ProgressInfoWindow.cpp b/src/Widgets/ProgressInfoWindow.cpp
+diff --git a/gmic-qt/src/Widgets/ProgressInfoWindow.cpp b/gmic-qt/src/Widgets/ProgressInfoWindow.cpp
-index 341e2e0..cdde227 100644
+index 5095528..cb8f35f 100644
---- a/src/Widgets/ProgressInfoWindow.cpp
+--- a/gmic-qt/src/Widgets/ProgressInfoWindow.cpp
-+++ b/src/Widgets/ProgressInfoWindow.cpp
++++ b/gmic-qt/src/Widgets/ProgressInfoWindow.cpp
-@@ -60,9 +60,11 @@ ProgressInfoWindow::ProgressInfoWindow(HeadlessProcessor * processor) : QMainWin
+@@ -59,9 +59,11 @@ ProgressInfoWindow::ProgressInfoWindow(HeadlessProcessor * processor) : QMainWin
    connect(processor, &HeadlessProcessor::done, this, &ProgressInfoWindow::onProcessingFinished);
    _isShown = false;
  
@@ -1261,7 +1260,7 @@ index 341e2e0..cdde227 100644
  }
  
  ProgressInfoWindow::~ProgressInfoWindow()
-@@ -86,6 +88,7 @@ void ProgressInfoWindow::closeEvent(QCloseEvent * event)
+@@ -85,6 +87,7 @@ void ProgressInfoWindow::closeEvent(QCloseEvent * event)
    event->accept();
  }
  
@@ -1269,7 +1268,7 @@ index 341e2e0..cdde227 100644
  void ProgressInfoWindow::setDarkTheme()
  {
    qApp->setStyle(QStyleFactory::create("Fusion"));
-@@ -108,6 +111,7 @@ void ProgressInfoWindow::setDarkTheme()
+@@ -107,6 +110,7 @@ void ProgressInfoWindow::setDarkTheme()
    p.setColor(QPalette::Disabled, QPalette::WindowText, QColor(110, 110, 110));
    qApp->setPalette(p);
  }
@@ -1277,10 +1276,10 @@ index 341e2e0..cdde227 100644
  
  void ProgressInfoWindow::onCancelClicked(bool)
  {
-diff --git a/src/Widgets/ProgressInfoWindow.h b/src/Widgets/ProgressInfoWindow.h
+diff --git a/gmic-qt/src/Widgets/ProgressInfoWindow.h b/gmic-qt/src/Widgets/ProgressInfoWindow.h
 index 2fe13cd..d1c67ad 100644
---- a/src/Widgets/ProgressInfoWindow.h
+--- a/gmic-qt/src/Widgets/ProgressInfoWindow.h
-+++ b/src/Widgets/ProgressInfoWindow.h
++++ b/gmic-qt/src/Widgets/ProgressInfoWindow.h
 @@ -57,7 +57,9 @@ public:
  protected:
    void showEvent(QShowEvent *) override;
@@ -1291,10 +1290,10 @@ index 2fe13cd..d1c67ad 100644
  
  public slots:
    void onCancelClicked(bool);
-diff --git a/ui/dialogsettings.ui b/ui/dialogsettings.ui
+diff --git a/gmic-qt/ui/dialogsettings.ui b/gmic-qt/ui/dialogsettings.ui
 index 8345152..17d8bb8 100644
---- a/ui/dialogsettings.ui
+--- a/gmic-qt/ui/dialogsettings.ui
-+++ b/ui/dialogsettings.ui
++++ b/gmic-qt/ui/dialogsettings.ui
 @@ -108,7 +108,7 @@
          </widget>
         </item>

series

@@ -1,4 +0,0 @@
-gmic-make-build-without-gmic-cpp.patch
-gmic-qt-make-it-work-without-gmic-cpp.patch
-krita5.patch
-56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch