Hello community, here is the log from the commit of package nomacs for openSUSE:Factory checked in at 2020-11-09 13:57:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nomacs (Old) and /work/SRC/openSUSE:Factory/.nomacs.new.11331 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nomacs" Mon Nov 9 13:57:24 2020 rev:25 rq:844929 version:3.16.224 Changes: -------- --- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes 2020-08-10 14:57:34.675987180 +0200 +++ /work/SRC/openSUSE:Factory/.nomacs.new.11331/nomacs.changes 2020-11-09 13:58:51.455774863 +0100 @@ -1,0 +2,7 @@ +Thu Oct 29 19:29:54 UTC 2020 - Petr Vanek <[email protected]> + +- QuaZip1 migration + * patch quazip1_cmake_remove_after_new_version.diff also + sent to the upstream + +------------------------------------------------------------------- New: ---- quazip1_cmake_remove_after_new_version.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nomacs.spec ++++++ --- /var/tmp/diff_new_pack.zeJHHn/_old 2020-11-09 13:58:51.995773685 +0100 +++ /var/tmp/diff_new_pack.zeJHHn/_new 2020-11-09 13:58:51.999773676 +0100 @@ -24,6 +24,7 @@ Group: Productivity/Graphics/Viewers URL: https://nomacs.org/ Source: https://github.com/nomacs/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: quazip1_cmake_remove_after_new_version.diff BuildRequires: cmake >= 2.8 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -56,6 +57,7 @@ %prep %setup -q +%patch0 -p1 %build pushd ImageLounge/ ++++++ quazip1_cmake_remove_after_new_version.diff ++++++ diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake index 5567084b..c90ba320 100644 --- a/ImageLounge/cmake/Unix.cmake +++ b/ImageLounge/cmake/Unix.cmake @@ -102,14 +102,26 @@ unset(QT_ROOT CACHE) if(ENABLE_QUAZIP) if(USE_SYSTEM_QUAZIP) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - - find_package(QuaZip5 QUIET) - if(NOT QUAZIP_FOUND) - message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") - else() - add_definitions(-DWITH_QUAZIP) - endif() + # Let's try QuaZip1 first (it's the bright future) + find_package(QuaZip-Qt5 QUIET) + if (QuaZip-Qt5_FOUND) + message(STATUS "QUAZIP: QuaZip-1 for Qt5 found") + set(QUAZIP_LIBRARIES QuaZip::QuaZip) + add_definitions(-DWITH_QUAZIP1) + else () + message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x") + # QuaZip < 1.0. This leg can be removed (including cmake/FindQuaZip5.cmake) + # ater the final migration to 1.x in Linux distros + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + + find_package(QuaZip5 QUIET) + if(NOT QUAZIP_FOUND) + message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") + endif() + + endif (QuaZip-Qt5_FOUND) + # we have any QuaZip after all + add_definitions(-DWITH_QUAZIP) else() find_package(ZLIB REQUIRED) set(QUAZIP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/) diff --git a/ImageLounge/src/DkCore/DkBasicLoader.cpp b/ImageLounge/src/DkCore/DkBasicLoader.cpp index 7f9e889c..b7edfd43 100644 --- a/ImageLounge/src/DkCore/DkBasicLoader.cpp +++ b/ImageLounge/src/DkCore/DkBasicLoader.cpp @@ -54,8 +54,12 @@ // quazip #ifdef WITH_QUAZIP +#ifdef WITH_QUAZIP1 +#include <quazip/JlCompress.h> +#else #include <quazip5/JlCompress.h> #endif +#endif // opencv #ifdef WITH_OPENCV diff --git a/ImageLounge/src/DkCore/DkImageContainer.cpp b/ImageLounge/src/DkCore/DkImageContainer.cpp index 810994d3..150da9c2 100644 --- a/ImageLounge/src/DkCore/DkImageContainer.cpp +++ b/ImageLounge/src/DkCore/DkImageContainer.cpp @@ -41,8 +41,12 @@ // quazip #ifdef WITH_QUAZIP +#ifdef WITH_QUAZIP1 +#include <quazip/JlCompress.h> +#else #include <quazip5/JlCompress.h> #endif +#endif #pragma warning(pop) // no warnings from includes - end #pragma warning(disable: 4251) // TODO: remove diff --git a/ImageLounge/src/DkCore/DkImageLoader.cpp b/ImageLounge/src/DkCore/DkImageLoader.cpp index 09d25d23..e4186f2b 100644 --- a/ImageLounge/src/DkCore/DkImageLoader.cpp +++ b/ImageLounge/src/DkCore/DkImageLoader.cpp @@ -79,8 +79,12 @@ // quazip #ifdef WITH_QUAZIP +#ifdef WITH_QUAZIP1 +#include <quazip/JlCompress.h> +#else #include <quazip5/JlCompress.h> #endif +#endif // opencv #ifdef WITH_OPENCV @@ -2212,4 +2216,4 @@ QString DkImageLoader::fileName() const { return mCurrentImage->fileName(); } -} \ No newline at end of file +} diff --git a/ImageLounge/src/DkGui/DkDialog.cpp b/ImageLounge/src/DkGui/DkDialog.cpp index 008c9a3b..85842eca 100644 --- a/ImageLounge/src/DkGui/DkDialog.cpp +++ b/ImageLounge/src/DkGui/DkDialog.cpp @@ -97,8 +97,12 @@ // quazip #ifdef WITH_QUAZIP +#ifdef WITH_QUAZIP1 +#include <quazip/JlCompress.h> +#else #include <quazip5/JlCompress.h> #endif +#endif #pragma warning(pop) // no warnings from includes - end
