Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gmic for openSUSE:Factory checked in
at 2022-02-09 20:39:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gmic (Old)
and /work/SRC/openSUSE:Factory/.gmic.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gmic"
Wed Feb 9 20:39:02 2022 rev:21 rq:952271 version:3.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/gmic/gmic.changes 2022-01-21
01:26:19.126217572 +0100
+++ /work/SRC/openSUSE:Factory/.gmic.new.1898/gmic.changes 2022-02-09
20:40:01.862495233 +0100
@@ -1,0 +2,13 @@
+Mon Feb 7 10:11:38 UTC 2022 - Christophe Giboudeaux <christo...@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
+
+-------------------------------------------------------------------
Old:
----
56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
gmic-make-build-without-gmic-cpp.patch
gmic_3.0.1.tar.gz
series
New:
----
0001-Remove-unneeded-CImg-include.patch
gmic_3.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gmic.spec ++++++
--- /var/tmp/diff_new_pack.N9iweO/_old 2022-02-09 20:40:02.758497376 +0100
+++ /var/tmp/diff_new_pack.N9iweO/_new 2022-02-09 20:40:02.766497395 +0100
@@ -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 @@
# 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
-# PATCH-FIX-UPSTREAM 56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch - Already
upstream
-Patch3:
https://github.com/dtschump/gmic/commit/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
+Patch1: krita5.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Remove-unneeded-CImg-include.patch
BuildRequires: cmake >= 3.14.0
BuildRequires: fftw3-threads-devel
#
@@ -178,13 +175,7 @@
This package contains shared data files for the various gmic frontends.
%prep
-%setup -q
-%patch0 -p1
-pushd gmic-qt
-%patch1 -p1
-%patch2 -p1
-popd
-%patch3 -p1
+%autosetup -p1
%build
# Build gmic
++++++ 0001-Remove-unneeded-CImg-include.patch ++++++
>From de25bc1fab42ce294fbc0aa94f0cd0621491bf2e Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christo...@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
++++++ gmic-qt-make-it-work-without-gmic-cpp.patch ++++++
--- /var/tmp/diff_new_pack.N9iweO/_old 2022-02-09 20:40:02.826497539 +0100
+++ /var/tmp/diff_new_pack.N9iweO/_new 2022-02-09 20:40:02.830497549 +0100
@@ -1,7 +1,7 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5de581b..2b46de0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt
+index fe92d48..8bba11e 100644
+--- a/gmic-qt/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 @@
#
# 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")
+@@ -360,14 +376,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 @@
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 @@
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,317 +200,4 @@
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_3.0.1.tar.gz -> gmic_3.0.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/gmic/gmic_3.0.1.tar.gz
/work/SRC/openSUSE:Factory/.gmic.new.1898/gmic_3.0.2.tar.gz differ: char 5,
line 1
++++++ krita5.patch ++++++
++++ 610 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/gmic/krita5.patch
++++ and /work/SRC/openSUSE:Factory/.gmic.new.1898/krita5.patch
