Accepting request 946946 from home:darix:playground

- added 56f7340ecb.patch make it search in /usr/share/gmic/ with all clients. - prepare gimp 3 support - install also the denoise data file - introduce a new gmic-data subpackage and require it from all the frontends so we can access it more easily once this is resolved: https://discuss.pixls.us/t/fixing-more-things-in-gmic-packaging/28894 - make bash-completion noarch - move shared options for all the gmic-qt versions into a define to reduce duplication - Rework patches: - drop old patches with git generated copies: - 5e34754707b78358ef818d542d1e81d008bb2d12.patch - dont-set-gmic_build.patch - gmic-krita5.patch - make-build-without-gmic-cpp.patch - new patches: - gmic-make-build-without-gmic-cpp.patch - gmic-qt-make-it-work-without-gmic-cpp.patch - krita5.patch - Update krita patch so we can apply it as normal patch without breaking other gmic-qt instances - Remove unneeded BuildRequires fftw3-devel and cmake(KF5CoreAddons) - Use simpler syntax for the pkg version comparison - enable building with Krita 5 new BR: krita-devel new patches: - 5e34754707b78358ef818d542d1e81d008bb2d12.patch - gmic-krita5.patch - Add dont-set-gmic_build.patch: Make gmic-qt flavors build without gmic.cpp. This should help with getting the new krita plugin built - enable opencv support xshm support - Add BuildRequires xorg-x11-devel - add missing files for to make the devel package work: make-build-without-gmic-cpp.patch - also track series for easier patching - Add Conflicts for krita >= 5 as it needs the intree version of gmic-qt now - Update to 3.0.1 https://discuss.pixls.us/t/on-the-road-to-3-1/28221 OBS-URL: https://build.opensuse.org/request/show/946946 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=65
2022-01-18 09:47:00 +00:00 · 2022-01-18 09:47:00 +00:00 · feb99f287c
commit feb99f287c
parent cc24ae2ac5
9 changed files with 2099 additions and 36 deletions
--- a/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
+++ b/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
@ -0,0 +1,30 @@
+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
--- a/gmic-make-build-without-gmic-cpp.patch
+++ b/gmic-make-build-without-gmic-cpp.patch
@ -0,0 +1,34 @@
+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()
+ 
+ 
+
--- a/gmic-qt-make-it-work-without-gmic-cpp.patch
+++ b/gmic-qt-make-it-work-without-gmic-cpp.patch
@ -0,0 +1,523 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5de581b..2b46de0 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -29,17 +29,24 @@ else()
+   message("Building for target host application: " ${GMIC_QT_HOST})
+ endif()
+ 
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../src/gmic.cpp")
+-  set (GMIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../src" CACHE STRING "Define the path to the gmic headers")
+option(ENABLE_SYSTEM_GMIC "Find GMIC shared library installed on the system" ON)
+
+if (ENABLE_SYSTEM_GMIC)
+  option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" ON)
+ else()
+  option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" OFF)
+
+  set (GMIC_LIB_PATH "${GMIC_PATH}" CACHE STRING "Define the path to the GMIC shared library")
+  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../src/gmic.cpp")
+  set (GMIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../src" CACHE STRING "Define the path to the gmic headers")
+  else()
+   set (GMIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../gmic/src" CACHE STRING "Define the path to the gmic headers")
+-endif()
+  endif()
+ 
+-message("G'MIC path: " ${GMIC_PATH})
+  message("G'MIC path: " ${GMIC_PATH})
+endif()
+ 
+-option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" OFF)
+ option(ENABLE_CURL "Add support for curl" ON)
+-set (GMIC_LIB_PATH "${GMIC_PATH}" CACHE STRING "Define the path to the GMIC shared library")
+ 
+ option(ENABLE_ASAN "Enable -fsanitize=address (if debug build)" ON)
+ option(ENABLE_FFTW3 "Enable FFTW3 library support" ON)
+@@ -61,55 +68,57 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ endif()
+ 
+ 
+-#
+-# Look for G'MIC repository
+-#
+-get_filename_component(GMIC_ABSOLUTE_PATH ${GMIC_PATH} ABSOLUTE BASEDIR ${CMAKE_SOURCE_DIR})
+-if (EXISTS ${GMIC_ABSOLUTE_PATH}/gmic.cpp)
+-  message("Found G'MIC repository")
+-else()
+-  get_filename_component(TARGET_CLONE_DIR ${GMIC_ABSOLUTE_PATH}/.. ABSOLUTE)
+-  message("")
+-  message("Cannot find G'MIC repository in " ${GMIC_ABSOLUTE_PATH} )
+-  message("")
+-  message("You should try:")
+-  message("")
+-  message("   git clone https://github.com/dtschump/gmic.git " ${TARGET_CLONE_DIR}/gmic )
+-  message("")
+-  message(FATAL_ERROR "\nG'MIC repository not found")
+-endif()
+if (NOT ENABLE_SYSTEM_GMIC)
+  #
+  # Look for G'MIC repository
+  #
+  get_filename_component(GMIC_ABSOLUTE_PATH ${GMIC_PATH} ABSOLUTE BASEDIR ${CMAKE_SOURCE_DIR})
+  if (EXISTS ${GMIC_ABSOLUTE_PATH}/gmic.cpp)
+    message("Found G'MIC repository")
+  else()
+    get_filename_component(TARGET_CLONE_DIR ${GMIC_ABSOLUTE_PATH}/.. ABSOLUTE)
+    message("")
+    message("Cannot find G'MIC repository in " ${GMIC_ABSOLUTE_PATH} )
+    message("")
+    message("You should try:")
+    message("")
+    message("   git clone https://github.com/dtschump/gmic.git " ${TARGET_CLONE_DIR}/gmic )
+    message("")
+    message(FATAL_ERROR "\nG'MIC repository not found")
+  endif()
+ 
+-#
+-# Look for CImg.h and gmic_stdlib_community.h
+-#
+-set(GMIC_FILES CImg.h gmic_stdlib_community.h)
+-foreach(F ${GMIC_FILES})
+  #
+  # Look for CImg.h and gmic_stdlib_community.h
+  #
+  set(GMIC_FILES CImg.h gmic_stdlib_community.h)
+  foreach(F ${GMIC_FILES})
+   if(EXISTS ${GMIC_ABSOLUTE_PATH}/${F})
+-    message("Found " ${GMIC_PATH}/${F})
+      message("Found " ${GMIC_PATH}/${F})
+   else()
+-    message(${F} " not found")
+-    execute_process(COMMAND make -C ${GMIC_ABSOLUTE_PATH} ${F})
+-    if(EXISTS ${GMIC_ABSOLUTE_PATH}/${F})
+      message(${F} " not found")
+      execute_process(COMMAND make -C ${GMIC_ABSOLUTE_PATH} ${F})
+      if(EXISTS ${GMIC_ABSOLUTE_PATH}/${F})
+       message("Found " ${GMIC_PATH}/${F})
+-    else()
+      else()
+       message(FATAL_ERROR "\nCannot obtain " ${GMIC_PATH}/${F})
+-    endif()
+      endif()
+   endif()
+-endforeach()
+  endforeach()
+ 
+-#
+-# Ensure that gmic and CImg are the same version
+-#
+-file(STRINGS ${GMIC_ABSOLUTE_PATH}/CImg.h CIMG_VERSION REGEX "cimg_version ")
+-string(REGEX REPLACE ".*cimg_version " "" CIMG_VERSION ${CIMG_VERSION})
+-message("CImg version is [" ${CIMG_VERSION} "]")
+  #
+  # Ensure that gmic and CImg are the same version
+  #
+  file(STRINGS ${GMIC_ABSOLUTE_PATH}/CImg.h CIMG_VERSION REGEX "cimg_version ")
+  string(REGEX REPLACE ".*cimg_version " "" CIMG_VERSION ${CIMG_VERSION})
+  message("CImg version is [" ${CIMG_VERSION} "]")
+ 
+-file(STRINGS ${GMIC_ABSOLUTE_PATH}/gmic.h GMIC_VERSION REGEX "gmic_version ")
+-string(REGEX REPLACE ".*gmic_version " "" GMIC_VERSION ${GMIC_VERSION})
+-message("G'MIC version is [" ${GMIC_VERSION} "]")
+  file(STRINGS ${GMIC_ABSOLUTE_PATH}/gmic.h GMIC_VERSION REGEX "gmic_version ")
+  string(REGEX REPLACE ".*gmic_version " "" GMIC_VERSION ${GMIC_VERSION})
+  message("G'MIC version is [" ${GMIC_VERSION} "]")
+ 
+-if (NOT(${GMIC_VERSION} EQUAL ${CIMG_VERSION}))
+  if (NOT(${GMIC_VERSION} EQUAL ${CIMG_VERSION}))
+   message(FATAL_ERROR "\nVersion numbers of files 'gmic.h' (" ${GMIC_VERSION} ") and 'CImg.h' (" ${CIMG_VERSION} ") mismatch")
+  endif()
+ endif()
+ 
+ 
+@@ -128,6 +137,13 @@ endif()
+ 
+ # Required packages
+ 
+#
+# Gmic
+#
+if (ENABLE_SYSTEM_GMIC)
+  find_package(Gmic REQUIRED CONFIG)
+endif (ENABLE_SYSTEM_GMIC)
+
+ #
+ # Threads
+ #
+@@ -281,7 +297,6 @@ if(ENABLE_CURL)
+     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}")
+-      set_source_files_properties(${GMIC_PATH}/gmic.cpp PROPERTIES COMPILE_FLAGS "-Ofast")
+      if (NOT ENABLE_SYSTEM_GMIC)
+          set_source_files_properties(${GMIC_PATH}/gmic.cpp PROPERTIES COMPILE_FLAGS "-Ofast")
+      endif (NOT ENABLE_SYSTEM_GMIC)
+       set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2")
+     endif()
+ else()
+     message(FATAL_ERROR "Build type not recognized (${CMAKE_BUILD_TYPE})")
+ endif()
+ 
+-include_directories(${CMAKE_SOURCE_DIR}/src ${GMIC_PATH})
+if (NOT ENABLE_SYSTEM_GMIC)
+    include_directories(${GMIC_PATH})
+endif (NOT ENABLE_SYSTEM_GMIC)
+include_directories(${CMAKE_SOURCE_DIR}/src)
+ 
+ set (gmic_qt_SRCS
+ 
+@@ -443,11 +463,19 @@ set (gmic_qt_SRCS
+   src/Widgets/ProgressInfoWindow.h
+   src/Widgets/VisibleTagSelector.h
+   src/ZoomConstraint.h
+)
+ 
+-  ${GMIC_PATH}/gmic.h
+-  ${GMIC_PATH}/CImg.h
+-  ${GMIC_PATH}/gmic_stdlib_community.h
+if (NOT ENABLE_SYSTEM_GMIC)
+    set(gmic_qt_SRCS
+        ${gmic_qt_SRCS}
+        ${GMIC_PATH}/gmic.h
+        ${GMIC_PATH}/CImg.h
+        ${GMIC_PATH}/gmic_stdlib_community.h
+    )
+endif()
+ 
+set(gmic_qt_SRCS
+  ${gmic_qt_SRCS}
+   src/ClickableLabel.cpp
+   src/Common.cpp
+   src/OverrideCursor.cpp
+@@ -540,7 +568,9 @@ if(ENABLE_DYNAMIC_LINKING)
+     ${gmic_qt_LIBRARIES}
+     "gmic"
+     )
+-  link_directories(${GMIC_LIB_PATH})
+  if (NOT ENABLE_SYSTEM_GMIC)
+    link_directories(${GMIC_LIB_PATH})
+  endif()
+ 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
--- a/gmic.changes
+++ b/gmic.changes
@ -1,3 +1,92 @@
+-------------------------------------------------------------------
+Sun Jan 16 21:16:02 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- added https://github.com/dtschump/gmic/commit/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
+  make it search in /usr/share/gmic/ with all clients.
+
+-------------------------------------------------------------------
+Sat Jan 15 18:48:24 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- prepare gimp 3 support
+- install also the denoise data file
+- introduce a new gmic-data subpackage and require it from all the
+  frontends so we can access it more easily once this is resolved:
+  https://discuss.pixls.us/t/fixing-more-things-in-gmic-packaging/28894
+- make bash-completion noarch
+
+-------------------------------------------------------------------
+Fri Jan 14 18:44:35 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- move shared options for all the gmic-qt versions into a define
+  to reduce duplication
+
+-------------------------------------------------------------------
+Fri Jan 14 18:41:47 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Rework patches:
+  - drop old patches with git generated copies:
+    - 5e34754707b78358ef818d542d1e81d008bb2d12.patch
+    - dont-set-gmic_build.patch
+    - gmic-krita5.patch
+    - make-build-without-gmic-cpp.patch
+  - new patches:
+    - gmic-make-build-without-gmic-cpp.patch
+    - gmic-qt-make-it-work-without-gmic-cpp.patch
+    - krita5.patch
+- Update krita patch so we can apply it as normal patch without
+  breaking other gmic-qt instances
+
+-------------------------------------------------------------------
+Fri Jan 14 17:39:09 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Remove unneeded BuildRequires fftw3-devel and cmake(KF5CoreAddons) 
+
+-------------------------------------------------------------------
+Fri Jan 14 17:31:52 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Use simpler syntax for the pkg version comparison
+
+-------------------------------------------------------------------
+Fri Jan 14 16:36:21 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- enable building with Krita 5
+  new BR: krita-devel
+  new patches:
+  - 5e34754707b78358ef818d542d1e81d008bb2d12.patch
+  - gmic-krita5.patch
+
+-------------------------------------------------------------------
+Fri Jan 14 11:01:21 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Add dont-set-gmic_build.patch:
+  Make gmic-qt flavors build without gmic.cpp. This should help
+  with getting the new krita plugin built
+
+-------------------------------------------------------------------
+Thu Jan 13 22:27:47 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- enable opencv support xshm support
+  - Add BuildRequires xorg-x11-devel 
+
+-------------------------------------------------------------------
+Thu Jan 13 22:26:56 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- add missing files for to make the devel package work:
+  make-build-without-gmic-cpp.patch
+- also track series for easier patching
+
+-------------------------------------------------------------------
+Thu Jan 13 21:41:27 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Add Conflicts for krita >= 5 as it needs the intree version of
+  gmic-qt now
+
+-------------------------------------------------------------------
+Thu Jan 13 21:25:00 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.0.1
+  https://discuss.pixls.us/t/on-the-road-to-3-1/28221
+
 -------------------------------------------------------------------
 Mon Dec 13 09:47:22 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

--- a/gmic.spec
+++ b/gmic.spec
@ -1,7 +1,7 @@
 #
 # spec file for package gmic
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -16,9 +16,31 @@
 #


-%global _gimpplugindir %(gimptool-2.0 --gimpplugindir)/plug-ins
+%if %{pkg_vcmp krita >= 5}
+%bcond_without krita5
+%else
+%bcond_with    krita5
+%endif
+
+%if %{pkg_vcmp gimp >= 2.99}
+%define gimp_suffix 3
+%global _gimpplugindir %(gimptool-2.99 --gimpplugindir)/plug-ins/
+%else
+%global _gimpplugindir %(gimptool-2.0 --gimpplugindir)/plug-ins/
+%endif
+
+%if %{with krita5}
+%define hostapps gimp%{?gimp_suffix}
+%else
+%define hostapps gimp%{?gimp_suffix} krita
+%endif
+
+%define gmic_qt_options -DENABLE_SYSTEM_GMIC=OFF -DENABLE_DYNAMIC_LINKING=ON -DGMIC_PATH=%{_builddir}/%{name}-%{version}/src -DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build
+
+%define gmic_datadir %{_datadir}/gmic
+
 Name:           gmic
-Version:        3.0.0
+Version:        3.0.1
 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
@ -29,10 +51,32 @@ 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
+Patch1:         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
+Patch2:         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
+Patch3:         krita5.patch
+# PATCH-FIX-UPSTREAM 56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch - Already upstream
+Patch4:         https://github.com/dtschump/gmic/commit/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
 BuildRequires:  cmake >= 3.14.0
 BuildRequires:  fftw3-threads-devel
+#
+# BR for pkg_vcmp
+#
+# Those 2 are used for the pkg_vcmp conditionals above and also the rich expressions in the BuildRequiresb below
+#
+BuildRequires:  gimp
+BuildRequires:  krita
+#
+#/BR for pkg_vcmp
+#
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
+BuildRequires:  (krita-devel if krita >= 5)
+BuildRequires:  (pkgconfig(gimp-2.0) if gimp < 2.99)
+BuildRequires:  (pkgconfig(gimp-3.0) if gimp >= 2.99)
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5LinguistTools)
@ -42,7 +86,6 @@ BuildRequires:  cmake(Qt5Xml)
 BuildRequires:  pkgconfig(GraphicsMagick++)
 BuildRequires:  pkgconfig(OpenEXR)
 BuildRequires:  pkgconfig(fftw3)
-BuildRequires:  pkgconfig(gimp-2.0)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
@ -61,6 +104,8 @@ BuildRequires:  pkgconfig(opencv4)
 BuildRequires:  pkgconfig(zlib)
 %endif
 %endif
+BuildRequires:  xorg-x11-devel
+Requires:       gmic-data = %{version}

 %description
 G'MIC is a framework for image processing, providing
@ -91,10 +136,11 @@ uses the gmic functionality provided by the gmic library.
 Summary:        GMIC plugin for gimp
 License:        GPL-3.0-or-later
 Group:          Productivity/Graphics/Bitmap Editors
-Requires:       gimp
+%requires_eq    gimp
 # This package was only available in the 'graphics' repo
 Provides:       gmic-gimp = %{version}
 Obsoletes:      gmic-gimp < %{version}
+Requires:       gmic-data = %{version}

 %description -n gimp-plugin-gmic
 This is a plugin for gimp that exposes many of the nice gmic features
@ -104,7 +150,8 @@ for interactive use in gimp.
 Summary:        GMIC plugin for krita
 License:        GPL-3.0-or-later
 Group:          Productivity/Graphics/Bitmap Editors
-Requires:       krita
+%requires_eq    krita
+Requires:       gmic-data = %{version}

 %description -n  krita-plugin-gmic
 This is a plugin for krita to provide gmic features.
@ -115,72 +162,94 @@ License:        CECILL-2.1
 Group:          Productivity/Graphics/Bitmap Editors
 Requires:       bash-completion
 Supplements:    (%{name} and bash-completion)
+BuildArch:      noarch

 %description bash-completion
-This package contain de bash completion command for gmic.
+This package contains the bash completion command for gmic.
+
+%package data
+Summary:        Shared data files for the various gmic frontends
+License:        CECILL-2.1
+Group:          Productivity/Graphics/Bitmap Editors
+BuildArch:      noarch
+
+%description data
+This package contains shared data files for the various gmic frontends.

 %prep
-%autosetup -p1
+%setup -q
+%patch1 -p1
+pushd gmic-qt
+%patch2 -p1
+%patch3 -p1
+popd
+%patch4 -p1

 %build
 # Build gmic
 %cmake \
    -DENABLE_DYNAMIC_LINKING=ON \
-    -DBUILD_LIB_STATIC=OFF
+    -DBUILD_LIB_STATIC=OFF \
+    -DENABLE_OPENCV:BOOL=ON \
+    -DENABLE_XSHM:BOOL=ON
 %cmake_build

 cd ..

 # Build gmic{_gimp|_krita}_qt
 pushd gmic-qt
-%cmake \
-    -DENABLE_DYNAMIC_LINKING=ON \
-    -DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \
-    -DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \
-    -DGMIC_QT_HOST=gimp
+
+%cmake %{gmic_qt_options} -DGMIC_QT_HOST=none
 %cmake_build

 cd ..

-%cmake \
-    -DENABLE_DYNAMIC_LINKING=ON \
-    -DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \
-    -DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \
-    -DGMIC_QT_HOST=krita
+for hostapp in %{hostapps} ; do
+%cmake %{gmic_qt_options} -DGMIC_QT_HOST=${hostapp}
 %cmake_build

 cd ..
+done

-%cmake \
-    -DENABLE_DYNAMIC_LINKING=ON \
-    -DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \
-    -DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \
-    -DGMIC_QT_HOST=none
-%cmake_build
+%if %{with krita5}
+
+%cmake_kf5 -d plugin-build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %{gmic_qt_options} -DGMIC_QT_HOST=krita-plugin -DCMAKE_BUILD_TYPE=RelWithDebInfo
+%make_jobs

 cd ..
+%endif
 popd

 %install
 %cmake_install

+%if %{with krita5}
+pushd gmic-qt/plugin-build
+%make_install
+popd
+%else
+# krita plugin
+install -m 0755 build/gmic_krita_qt %{buildroot}%{_bindir}/gmic_krita_qt
+%endif
+
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/gmic_qt.png

 %suse_update_desktop_file -c gmic_qt "G'Mic Qt" "G'MIC Qt GUI" "gmic_qt %%F" gmic_qt "Qt;Graphics;Photography;"

 # Film color lookup tables
-install -d -m 0755 %{buildroot}%{_gimpplugindir}
-install -m 0644 resources/gmic_cluts.gmz %{buildroot}%{_gimpplugindir}/gmic_cluts.gmz
+install -d -m 0755 \
+    %{buildroot}%{_gimpplugindir} \
+    %{buildroot}%{gmic_datadir}/
+
+for file in gmic_cluts.gmz gmic_denoise_cnn.gmz ; do
+    install -m 0644 resources/${file}      %{buildroot}%{gmic_datadir}/${file}
+done

 # qt_gmic
 pushd gmic-qt
 install -m 0755 build/gmic_qt %{buildroot}%{_bindir}/gmic_qt

-# krita plugin
-install -m 0755 build/gmic_krita_qt %{buildroot}%{_bindir}/gmic_krita_qt
-
 # gimp plugin
-install -d -m 0755 %{buildroot}%{_gimpplugindir}
 install -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt
 popd

@ -196,20 +265,28 @@ popd
 %{_datadir}/applications/gmic_qt.desktop
 %{_datadir}/pixmaps/gmic_qt.png

+%files data
+%license COPYING
+%{gmic_datadir}
+
 %files -n gimp-plugin-gmic
 %license COPYING
-%{_gimpplugindir}/gmic_gimp_qt
-%{_gimpplugindir}/gmic_cluts.gmz
+%{_gimpplugindir}/

 %files -n krita-plugin-gmic
 %license COPYING
+%if %{with krita5}
+%{_libdir}/kritaplugins/krita_gmic_qt.so
+%else
 %{_bindir}/gmic_krita_qt
+%endif

 %files -n libgmic1
 %license COPYING
 %{_libdir}/libgmic.so.*

 %files -n libgmic-devel
+%{_includedir}/CImg.h
 %{_includedir}/gmic.h
 %{_libdir}/libgmic.so
 %{_libdir}/cmake/gmic/
--- a/gmic_3.0.0.tar.gz
+++ b/gmic_3.0.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f056bb9e6dbf0674af4c8dce59f4198172187662f7fbb36cc63ebc8c1b71120
-size 10225122
--- a/gmic_3.0.1.tar.gz
+++ b/gmic_3.0.1.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cc20a20e3ab53ce485ccf6e044a30141b3d62cf7743b83bb04906ff29453035
+size 10457923
--- a/krita5.patch
+++ b/krita5.patch
--- a/4
+++ b/4
@ -0,0 +1,4 @@
+gmic-make-build-without-gmic-cpp.patch
+gmic-qt-make-it-work-without-gmic-cpp.patch
+krita5.patch
+56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch