From 4f547b861e3856d768498e5e8664e1860ddc5b773fa7c3bb1daaef7cfd86c621 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Thu, 5 Jul 2018 20:57:54 +0000 Subject: [PATCH] Accepting request 621199 from home:darix:branches:graphics - Update to gmic-2.3.3 - fixes small bugs discovered these last days (+ provides updated filters). - drop patches included in update - gmic-2.3.0-zart-qbuttongroup.patch - updated the gmic-2.3.0-add-cmake-for-qt.patch to remove the chunks missing when upstream applied the patch OBS-URL: https://build.opensuse.org/request/show/621199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=11 --- gmic-2.3.0-add-cmake-for-qt.patch | 528 +---------------------------- gmic-2.3.0-zart-qbuttongroup.patch | 12 - gmic.changes | 11 + gmic.spec | 12 +- gmic_2.3.0.tar.gz | 3 - gmic_2.3.3.tar.gz | 3 + 6 files changed, 29 insertions(+), 540 deletions(-) delete mode 100644 gmic-2.3.0-zart-qbuttongroup.patch delete mode 100644 gmic_2.3.0.tar.gz create mode 100644 gmic_2.3.3.tar.gz diff --git a/gmic-2.3.0-add-cmake-for-qt.patch b/gmic-2.3.0-add-cmake-for-qt.patch index 9a7090a..7db5d2f 100644 --- a/gmic-2.3.0-add-cmake-for-qt.patch +++ b/gmic-2.3.0-add-cmake-for-qt.patch @@ -1,515 +1,7 @@ -Index: gmic-2.3.0/gmic-qt/CMakeLists.txt +Index: gmic-2.3.3/gmic-qt/cmake/modules/COPYING-CMAKE-SCRIPTS =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gmic-2.3.0/gmic-qt/CMakeLists.txt 2018-06-20 15:30:24.000000000 +0200 -@@ -0,0 +1,503 @@ -+project(gmic-qt) -+ -+message(STATUS "Using CMake version: ${CMAKE_VERSION}") -+ -+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) -+LIST (APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") -+include(FeatureSummary) -+ -+set(CMAKE_CXX_STANDARD 11) -+add_definitions(-Dcimg_use_cpp11=1) -+set(MIN_QT_VERSION 5.2.0) -+set(CMAKE_AUTOMOC ON) -+set(CMAKE_AUTOUIC OFF) -+set(CMAKE_AUTORCC ON) -+set(CMAKE_INCLUDE_CURRENT_DIR ON) -+ -+set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita or none.") -+if (${GMIC_QT_HOST} STREQUAL "none") -+ message("Building standalone version.") -+else() -+ message("Building for target host application: " ${GMIC_QT_HOST}) -+endif() -+ -+if(EXISTS "../src/gmic.cpp") -+ set (GMIC_PATH "../src" CACHE STRING "Define the path to the gmic headers") -+else() -+ set (GMIC_PATH "../gmic/src" CACHE STRING "Define the path to the gmic headers") -+endif() -+ -+message("G'MIC path: " ${GMIC_PATH}) -+ -+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") -+ -+# -+# 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.h -+# -+set(GMIC_FILES CImg.h gmic_stdlib.h) -+foreach(F ${GMIC_FILES}) -+ if(EXISTS ${GMIC_ABSOLUTE_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("Found " ${GMIC_PATH}/${F}) -+ else() -+ message(FATAL_ERROR "\nCannot obtain " ${GMIC_PATH}/${F}) -+ endif() -+ endif() -+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} "]") -+ -+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})) -+ message(FATAL_ERROR "\nVersion numbers of files 'gmic.h' (" ${GMIC_VERSION} ") and 'CImg.h' ("${CIMG_VERSION} ") mismatch") -+endif() -+ -+ -+ -+ -+ -+option(PRERELEASE "Set to ON makes this a prelease build") -+if (${PRERELEASE}) -+ string(TIMESTAMP PRERELEASE_DATE %y%m%d) -+ message("Prelease date is " ${PRERELEASE_DATE}) -+ add_definitions(-Dgmic_prelease=${PRERELEASE_DATE}) -+endif() -+ -+option(DRMINGW "Set to ON enables the drmingw debugger.") -+if (${DRMINGW}) -+ add_definitions(-DDRMINGW) -+endif() -+ -+ -+ -+# Required packages -+ -+# -+# Qt5 -+# -+find_package(Qt5 ${MIN_QT_VERSION} -+ REQUIRED COMPONENTS -+ Core -+ Gui -+ Widgets -+ Network -+) -+ -+# -+# For the translations -+# -+find_package(Qt5LinguistTools REQUIRED) -+ -+# -+# PNG -+# -+find_package(PNG REQUIRED) -+add_definitions(${PNG_DEFINITIONS}) -+add_definitions(-Dcimg_use_png) -+include_directories(SYSTEM ${PNG_INCLUDE_DIR}) -+if (APPLE) -+ # this is not added correctly on OSX -- see http://forum.kde.org/viewtopic.php?f=139&t=101867&p=221242#p221242 -+ include_directories(SYSTEM ${PNG_INCLUDE_DIR}) -+endif() -+ -+# -+# ZLIB -+# -+find_package(ZLIB REQUIRED) -+add_definitions(-Dcimg_use_zlib) -+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS} ) -+ -+# -+# FFTW3 -+# -+find_package(FFTW3 REQUIRED) -+add_definitions(-Dcimg_use_fftw3 ) -+add_definitions(-Dcimg_use_fftw3_singlethread ) -+include_directories(${FFTW3_INCLUDE_DIR}) -+ -+# -+# CURL -+# -+find_package(CURL) -+if (CURL_FOUND) -+ add_definitions(-Dcimg_use_curl) -+ include_directories(SYSTEM ${CURL_INCLUDE_DIRS} ) -+endif() -+ -+# -+# Test for OpenMP -+# -+find_package(OpenMP) -+set_package_properties(OpenMP PROPERTIES -+ DESCRIPTION "A low-level parallel execution library" -+ URL "http://openmp.org/wp/" -+ TYPE OPTIONAL -+ PURPOSE "Optionally used by gmic-qt") -+ -+if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.3 AND OPENMP_FOUND) -+ message("G'Mic: using OpenMP") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -+ add_definitions(-Dcimg_use_openmp) -+ add_definitions(-fopenmp) -+endif() -+ -+ -+# -+# add all defines -+# -+ -+set(gmic_qt_LIBRARIES -+ Qt5::Core -+ Qt5::Widgets -+ Qt5::Gui -+ Qt5::Network -+ ${PNG_LIBRARIES} -+ ${FFTW3_LIBRARIES} -+ ${ZLIB_LIBRARIES} -+) -+ -+if (CURL_FOUND) -+ set(gmic_qt_LIBRARIES -+ ${gmic_qt_LIBRARIES} -+ ${CURL_LIBRARIES} -+ ) -+endif() -+ -+add_definitions(-Dgmic_build) -+add_definitions(-Dcimg_use_abort) -+add_definitions(-Dgmic_is_parallel) -+add_definitions(-Dcimg_use_rng) -+add_definitions(-Dgmic_gui) -+add_definitions(-Dcimg_use_abort) -+add_definitions(-Dcimg_appname=\"gmic\") -+ -+if (UNIX AND NOT APPLE) -+ add_definitions(-Dcimg_display=1) -+ add_definitions(-D_IS_LINUX_) -+ add_definitions(-Dcimg_use_vt100) -+ add_definitions(-D_IS_UNIX_) -+ find_package(X11) -+ set(gmic_qt_LIBRARIES -+ ${gmic_qt_LIBRARIES} -+ ${X11_LIBRARIES} # XXX: Search for X11: Wayland is coming! -+ ) -+ -+endif() -+ -+if (APPLE) -+ add_definitions(-Dcimg_display=0) -+ add_definitions(-D_IS_MACOS_) -+ set(CMAKE_MACOSX_RPATH 1) -+ set(BUILD_WITH_INSTALL_RPATH 1) -+ add_definitions(-mmacosx-version-min=10.9 -Wno-macro-redefined -Wno-deprecated-register) -+endif() -+ -+if (WIN32) -+ add_definitions(-Dcimg_display=2) -+ add_definitions(-DPSAPI_VERSION=1) -+ set(gmic_qt_LIBRARIES -+ ${gmic_qt_LIBRARIES} -+ pthread psapi gdi32 -+ ) -+endif() -+ -+if (NOT CMAKE_BUILD_TYPE) -+ set(CMAKE_BUILD_TYPE "Release") -+endif() -+ -+if (CMAKE_BUILD_TYPE STREQUAL "Debug") -+ message("Debug build") -+ add_definitions(-D_GMIC_QT_DEBUG_) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address") -+elseif (CMAKE_BUILD_TYPE STREQUAL "Release") -+ message("Release build") -+ add_definitions(-DQT_NO_DEBUG_OUTPUT) -+ string(REPLACE "-O2" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -+ string(REPLACE "-O3" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast") -+elseif (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") -+ message("Release build with debug info") -+ add_definitions(-DQT_NO_DEBUG_OUTPUT) -+ 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") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2") -+else() -+ message(FATAL_ERROR "Build type not recognized (${CMAKE_BUILD_TYPE})") -+endif() -+ -+include_directories(${CMAKE_SOURCE_DIR}/src ${GMIC_PATH}) -+ -+set (gmic_qt_SRCS -+ -+ src/ClickableLabel.h -+ src/Common.h -+ src/OverrideCursor.h -+ src/DialogSettings.h -+ src/FilterParameters/AbstractParameter.h -+ src/FilterParameters/BoolParameter.h -+ src/FilterParameters/ButtonParameter.h -+ src/FilterParameters/ChoiceParameter.h -+ src/FilterParameters/ColorParameter.h -+ src/FilterParameters/ConstParameter.h -+ src/FilterParameters/FileParameter.h -+ src/FilterParameters/FilterParametersWidget.h -+ src/FilterParameters/FloatParameter.h -+ src/FilterParameters/FolderParameter.h -+ src/FilterParameters/IntParameter.h -+ src/FilterParameters/LinkParameter.h -+ src/FilterParameters/MultilineTextParameterWidget.h -+ src/FilterParameters/NoteParameter.h -+ src/FilterParameters/PointParameter.h -+ src/FilterParameters/SeparatorParameter.h -+ src/FilterParameters/TextParameter.h -+ src/FilterSelector/FiltersModel.h -+ src/FilterSelector/FiltersModelReader.h -+ src/FilterSelector/FiltersPresenter.h -+ src/FilterSelector/FiltersView/FiltersView.h -+ src/FilterSelector/FiltersView/TreeView.h -+ src/FilterSelector/FiltersVisibilityMap.h -+ src/FilterSyncRunner.h -+ src/FilterThread.h -+ src/Globals.h -+ src/gmic_qt.h -+ src/GmicStdlib.h -+ src/GmicProcessor.h -+ src/HeadlessProcessor.h -+ src/Host/host.h -+ src/HtmlTranslator.h -+ src/ImageConverter.h -+ src/ImageTools.h -+ src/InputOutputState.h -+ src/KeypointList.h -+ src/LayersExtentProxy.h -+ src/Logger.h -+ src/MainWindow.h -+ src/ParametersCache.h -+ src/PreviewMode.h -+ src/TimeLogger.h -+ src/Updater.h -+ src/Utils.h -+ src/FilterSelector/FiltersView/FilterTreeFolder.h -+ src/FilterSelector/FiltersView/FilterTreeItem.h -+ src/FilterSelector/FavesModel.h -+ src/FilterSelector/FavesModelReader.h -+ src/FilterSelector/FiltersView/FilterTreeAbstractItem.h -+ src/FilterSelector/FiltersView/FilterTreeItemDelegate.h -+ src/FilterSelector/FavesModelWriter.h -+ src/Widgets/ProgressInfoWidget.h -+ src/Widgets/PreviewWidget.h -+ src/Widgets/InOutPanel.h -+ src/Widgets/ZoomLevelSelector.h -+ src/Widgets/SearchFieldWidget.h -+ src/Widgets/LanguageSelectionWidget.h -+ src/Widgets/ProgressInfoWindow.h -+ -+ ${GMIC_PATH}/gmic.h -+ ${GMIC_PATH}/CImg.h -+ ${GMIC_PATH}/gmic_stdlib.h -+ -+ src/ClickableLabel.cpp -+ src/Common.cpp -+ src/OverrideCursor.cpp -+ src/DialogSettings.cpp -+ src/FilterParameters/AbstractParameter.cpp -+ src/FilterParameters/BoolParameter.cpp -+ src/FilterParameters/ButtonParameter.cpp -+ src/FilterParameters/ChoiceParameter.cpp -+ src/FilterParameters/ColorParameter.cpp -+ src/FilterParameters/ConstParameter.cpp -+ src/FilterParameters/FileParameter.cpp -+ src/FilterParameters/FilterParametersWidget.cpp -+ src/FilterParameters/FloatParameter.cpp -+ src/FilterParameters/FolderParameter.cpp -+ src/FilterParameters/IntParameter.cpp -+ src/FilterParameters/LinkParameter.cpp -+ src/FilterParameters/MultilineTextParameterWidget.cpp -+ src/FilterParameters/NoteParameter.cpp -+ src/FilterParameters/PointParameter.cpp -+ src/FilterParameters/SeparatorParameter.cpp -+ src/FilterParameters/TextParameter.cpp -+ src/FilterSelector/FiltersModel.cpp -+ src/FilterSelector/FiltersModelReader.cpp -+ src/FilterSelector/FiltersPresenter.cpp -+ src/FilterSelector/FiltersView/FiltersView.cpp -+ src/FilterSelector/FiltersView/TreeView.cpp -+ src/FilterSelector/FiltersVisibilityMap.cpp -+ src/FilterSyncRunner.cpp -+ src/FilterThread.cpp -+ src/gmic_qt.cpp -+ src/Globals.cpp -+ src/GmicStdlib.cpp -+ src/GmicProcessor.cpp -+ src/HeadlessProcessor.cpp -+ src/HtmlTranslator.cpp -+ src/ImageConverter.cpp -+ src/ImageTools.cpp -+ src/InputOutputState.cpp -+ src/KeypointList.cpp -+ src/LayersExtentProxy.cpp -+ src/Logger.cpp -+ src/MainWindow.cpp -+ src/ParametersCache.cpp -+ src/PreviewMode.cpp -+ src/TimeLogger.cpp -+ src/Updater.cpp -+ src/Utils.cpp -+ src/FilterSelector/FiltersView/FilterTreeItem.cpp -+ src/FilterSelector/FiltersView/FilterTreeFolder.cpp -+ src/FilterSelector/FavesModel.cpp -+ src/FilterSelector/FavesModelReader.cpp -+ src/FilterSelector/FiltersView/FilterTreeAbstractItem.cpp -+ src/FilterSelector/FiltersView/FilterTreeItemDelegate.cpp -+ src/FilterSelector/FavesModelWriter.cpp -+ src/Widgets/PreviewWidget.cpp -+ src/Widgets/ProgressInfoWidget.cpp -+ src/Widgets/InOutPanel.cpp -+ src/Widgets/ZoomLevelSelector.cpp -+ src/Widgets/SearchFieldWidget.cpp -+ src/Widgets/LanguageSelectionWidget.cpp -+ src/Widgets/ProgressInfoWindow.cpp -+) -+ -+if(ENABLE_DYNAMIC_LINKING) -+ set(CMAKE_SKIP_RPATH TRUE) -+ set(gmic_qt_LIBRARIES -+ ${gmic_qt_LIBRARIES} -+ "gmic" -+ ) -+ link_directories(${GMIC_LIB_PATH}) -+else(ENABLE_DYNAMIC_LINKING) -+ set(gmic_qt_SRCS -+ ${gmic_qt_SRCS} -+ ${GMIC_PATH}/gmic.cpp -+ ) -+endif(ENABLE_DYNAMIC_LINKING) -+ -+qt5_wrap_ui(gmic_qt_SRCS -+ ui/dialogsettings.ui -+ ui/filtersview.ui -+ ui/headlessprogressdialog.ui -+ ui/inoutpanel.ui -+ ui/languageselectionwidget.ui -+ ui/mainwindow.ui -+ ui/multilinetextparameterwidget.ui -+ ui/progressinfowidget.ui -+ ui/progressinfowindow.ui -+ ui/SearchFieldWidget.ui -+ ui/zoomlevelselector.ui -+) -+ -+# qt5_create_translation( -+# qmic_qt_QM -+# ${CMAKE_SOURCE_DIR}/translations -+# ${gmic_qt_SRCS} -+# translations/cs.ts -+# translations/de.ts -+# translations/es.ts -+# translations/fr.ts -+# translations/id.ts -+# translations/it.ts -+# translations/nl.ts -+# translations/pl.ts -+# translations/pt.ts -+# translations/ru.ts -+# translations/ua.ts -+# translations/ja.ts -+# translations/zh.ts -+# ) -+ -+qt5_add_translation(gmic_qt_QM -+ translations/cs.ts -+ translations/de.ts -+ translations/es.ts -+ translations/fr.ts -+ translations/id.ts -+ translations/it.ts -+ translations/nl.ts -+ translations/pl.ts -+ translations/pt.ts -+ translations/ru.ts -+ translations/ua.ts -+ translations/ja.ts -+ translations/zh.ts -+ ) -+ -+install(FILES ${gmic_qt_QM} DESTINATION ${CMAKE_SOURCE_DIR}/translations) -+ -+set(gmic_qt_QRC -+ gmic_qt.qrc -+ translations.qrc -+) -+ -+if (${GMIC_QT_HOST} STREQUAL "gimp") -+ -+ execute_process(COMMAND gimptool-2.0 --libs-noui OUTPUT_VARIABLE GIMP2_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) -+ execute_process(COMMAND gimptool-2.0 --cflags-noui OUTPUT_VARIABLE GIMP2_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GIMP2_INCLUDE_DIRS}") -+ -+ set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/Gimp/host_gimp.cpp) -+ add_definitions(-DGMIC_HOST=gimp_qt -DGIMP_DISABLE_DEPRECATED) -+ add_executable(gmic_gimp_qt ${gmic_qt_SRCS} ${gmic_qt_QRC} ${qmic_qt_QM}) -+ target_link_libraries( -+ gmic_gimp_qt -+ PRIVATE -+ ${GIMP2_LIBRARIES} -+ ${gmic_qt_LIBRARIES} -+ ) -+ -+elseif (${GMIC_QT_HOST} STREQUAL "krita") -+ -+ set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/Krita/host_krita.cpp) -+ add_definitions(-DGMIC_HOST=krita) -+ add_executable(gmic_krita_qt ${gmic_qt_SRCS} ${gmic_qt_QRC} ${qmic_qt_QM}) -+ target_link_libraries( -+ gmic_krita_qt -+ PRIVATE -+ ${gmic_qt_LIBRARIES} -+ ) -+ -+elseif (${GMIC_QT_HOST} STREQUAL "none") -+ -+ set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/None/host_none.cpp src/Host/None/ImageDialog.h src/Host/None/ImageDialog.cpp) -+ add_definitions(-DGMIC_HOST=standalone) -+ add_executable(gmic_qt ${gmic_qt_SRCS} ${gmic_qt_QRC} ${qmic_qt_QM}) -+ target_link_libraries(gmic_qt PRIVATE ${gmic_qt_LIBRARIES}) -+ -+else() -+ message(FATAL_ERROR "GMIC_QT_HOST is not defined as gimp, krita or none") -+endif() -+ -+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -Index: gmic-2.3.0/gmic-qt/cmake/modules/COPYING-CMAKE-SCRIPTS -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gmic-2.3.0/gmic-qt/cmake/modules/COPYING-CMAKE-SCRIPTS 2018-06-20 15:30:24.000000000 +0200 +--- /dev/null ++++ gmic-2.3.3/gmic-qt/cmake/modules/COPYING-CMAKE-SCRIPTS @@ -0,0 +1,22 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions @@ -520,7 +12,7 @@ Index: gmic-2.3.0/gmic-qt/cmake/modules/COPYING-CMAKE-SCRIPTS +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. -+3. The name of the author may not be used to endorse or promote products ++3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR @@ -533,10 +25,10 @@ Index: gmic-2.3.0/gmic-qt/cmake/modules/COPYING-CMAKE-SCRIPTS +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Index: gmic-2.3.0/gmic-qt/cmake/modules/FindFFTW3.cmake +Index: gmic-2.3.3/gmic-qt/cmake/modules/FindFFTW3.cmake =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gmic-2.3.0/gmic-qt/cmake/modules/FindFFTW3.cmake 2018-06-20 15:30:24.000000000 +0200 +--- /dev/null ++++ gmic-2.3.3/gmic-qt/cmake/modules/FindFFTW3.cmake @@ -0,0 +1,59 @@ + # - Try to find the Fftw3 Library +# Once done this will define @@ -597,10 +89,10 @@ Index: gmic-2.3.0/gmic-qt/cmake/modules/FindFFTW3.cmake + message(STATUS "Could not find FFTW3") +endif() +endif() -Index: gmic-2.3.0/gmic-qt/cmake/modules/LibFindMacros.cmake +Index: gmic-2.3.3/gmic-qt/cmake/modules/LibFindMacros.cmake =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gmic-2.3.0/gmic-qt/cmake/modules/LibFindMacros.cmake 2018-06-20 15:30:24.000000000 +0200 +--- /dev/null ++++ gmic-2.3.3/gmic-qt/cmake/modules/LibFindMacros.cmake @@ -0,0 +1,112 @@ +# Version 1.0 (2013-04-12) +# Public Domain, originally written by Lasse Kärkkäinen diff --git a/gmic-2.3.0-zart-qbuttongroup.patch b/gmic-2.3.0-zart-qbuttongroup.patch deleted file mode 100644 index af0e3b9..0000000 --- a/gmic-2.3.0-zart-qbuttongroup.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gmic-2.3.0/zart/src/MainWindow.cpp -=================================================================== ---- gmic-2.3.0.orig/zart/src/MainWindow.cpp 2018-06-21 10:21:03.000000000 +0200 -+++ gmic-2.3.0/zart/src/MainWindow.cpp 2018-06-21 15:57:19.706747707 +0200 -@@ -72,6 +72,7 @@ - #include - #include - #include -+#include - - #include "Common.h" - #include "DialogAbout.h" diff --git a/gmic.changes b/gmic.changes index f83f17a..8ea0dfa 100644 --- a/gmic.changes +++ b/gmic.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jul 5 17:09:54 UTC 2018 - mrueckert@suse.de + +- Update to gmic-2.3.3 + - fixes small bugs discovered these last days (+ provides updated + filters). +- drop patches included in update + - gmic-2.3.0-zart-qbuttongroup.patch +- updated the gmic-2.3.0-add-cmake-for-qt.patch to remove the + chunks missing when upstream applied the patch + ------------------------------------------------------------------- Thu Jun 21 12:47:34 UTC 2018 - asn@cryptomilk.org diff --git a/gmic.spec b/gmic.spec index 49dc165..de33c05 100644 --- a/gmic.spec +++ b/gmic.spec @@ -23,21 +23,20 @@ #define __builder ninja Name: gmic -Version: 2.3.0 +Version: 2.3.3 Release: 0 URL: https://gmic.eu Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz +Patch: gmic-2.3.0-add-cmake-for-qt.patch Source10: http://gmic.eu/gmic_reference.pdf -Patch0: gmic-2.3.0-add-cmake-for-qt.patch -Patch1: gmic-2.3.0-zart-qbuttongroup.patch - Summary: GREYC's Magick for Image Computing (denoise and others) License: CECILL-2.1 Group: Productivity/Graphics/Bitmap Editors BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: cmake BuildRequires: OpenEXR-devel BuildRequires: fftw3-devel BuildRequires: fftw3-threads-devel @@ -155,8 +154,7 @@ a GUI for G'MIC real-time manipulations on the output of a webcam. %prep %setup -%patch0 -p1 -%patch1 -p1 +%patch -p1 cp %{SOURCE10} . @@ -256,7 +254,7 @@ popd %files zart %defattr(-,root,root) #license zart/LICENSE -%doc zart/README +#doc zart/README %{_bindir}/zart %files -n gimp-plugin-gmic diff --git a/gmic_2.3.0.tar.gz b/gmic_2.3.0.tar.gz deleted file mode 100644 index 790de6b..0000000 --- a/gmic_2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8864abe38aaa65520a0992ee9b3f2c1d3bece5fd8ce069e93c7567f452efc375 -size 3659117 diff --git a/gmic_2.3.3.tar.gz b/gmic_2.3.3.tar.gz new file mode 100644 index 0000000..3ef52f6 --- /dev/null +++ b/gmic_2.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46417d48d9dd87a155ba979667834a7d6899652f097cc25652e0680ee0b13c6a +size 3691683