diff --git a/qimgv-0.9.1.tar.gz b/qimgv-0.9.1.tar.gz deleted file mode 100644 index 79981c4..0000000 --- a/qimgv-0.9.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:728b05b0e26d0188b3d25eb564effab4a77dd0c7453d82e024f1eaa8781e8f4b -size 670033 diff --git a/qimgv-1.0.0.tar.gz b/qimgv-1.0.0.tar.gz new file mode 100644 index 0000000..238da59 --- /dev/null +++ b/qimgv-1.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82888f744435e7e944558d26b0b4ac053cf5f2e581e2497cbb6ce3d65cf47fea +size 680855 diff --git a/qimgv-PIE.patch b/qimgv-PIE.patch index 18d55aa..ff9e860 100644 --- a/qimgv-PIE.patch +++ b/qimgv-PIE.patch @@ -1,8 +1,8 @@ -Index: qimgv-0.8.9/qimgv/CMakeLists.txt +Index: qimgv-1.0.0/qimgv/CMakeLists.txt =================================================================== ---- qimgv-0.8.9.orig/qimgv/CMakeLists.txt -+++ qimgv-0.8.9/qimgv/CMakeLists.txt -@@ -21,6 +21,9 @@ add_subdirectory(utils) +--- qimgv-1.0.0.orig/qimgv/CMakeLists.txt ++++ qimgv-1.0.0/qimgv/CMakeLists.txt +@@ -36,6 +36,9 @@ endif() target_compile_features(qimgv PRIVATE cxx_std_17) set_target_properties(qimgv PROPERTIES CXX_EXTENSIONS OFF) @@ -10,5 +10,5 @@ Index: qimgv-0.8.9/qimgv/CMakeLists.txt +set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") + # LINK STUFF - target_link_libraries(qimgv PRIVATE Qt5::Core Qt5::Widgets Qt5::Concurrent) - if(USING_LIBSTDCXX) + target_link_libraries(qimgv PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Svg Qt${QT_VERSION_MAJOR}::PrintSupport) + if(QT_VERSION_MAJOR GREATER_EQUAL 6) diff --git a/qimgv-no_return_in_nonvoid.patch b/qimgv-no_return_in_nonvoid.patch new file mode 100644 index 0000000..ae4ac92 --- /dev/null +++ b/qimgv-no_return_in_nonvoid.patch @@ -0,0 +1,12 @@ +Index: qimgv-1.0.0/qimgv/utils/fileoperations.cpp +=================================================================== +--- qimgv-1.0.0.orig/qimgv/utils/fileoperations.cpp ++++ qimgv-1.0.0/qimgv/utils/fileoperations.cpp +@@ -60,6 +60,7 @@ QString FileOperations::decodeResult(con + case FileOpResult::OTHER_ERROR: + return "Other error."; + } ++ return NULL; + } + + void FileOperations::copyFileTo(const QString &srcFilePath, const QString &destDirPath, bool force, FileOpResult &result) { diff --git a/qimgv-pluginpath_1.patch b/qimgv-pluginpath_1.patch deleted file mode 100644 index 8187714..0000000 --- a/qimgv-pluginpath_1.patch +++ /dev/null @@ -1,212 +0,0 @@ -From ac915ba6a9c6a9ad2491eb2d779a3e9de485e93d Mon Sep 17 00:00:00 2001 -From: easymodo -Date: Sun, 31 May 2020 15:34:48 +0300 -Subject: [PATCH] place qimgv librares/plugins in lib/qimgv #231 rename to - player_mpv.so, unversioned - ---- - CMakeLists.txt | 7 +++++- - .../player_mpv}/CMakeLists.txt | 25 ++++++++++--------- - .../player_mpv}/src/mpvwidget.cpp | 0 - .../player_mpv}/src/mpvwidget.h | 0 - .../player_mpv}/src/qthelper.hpp | 0 - .../player_mpv}/src/videoplayer.cpp | 0 - .../player_mpv}/src/videoplayer.h | 0 - .../player_mpv}/src/videoplayermpv.cpp | 0 - .../player_mpv}/src/videoplayermpv.h | 0 - qimgv/CMakeLists.txt | 3 +++ - qimgv/gui/viewers/videoplayerinitproxy.cpp | 24 +++++++++++++++--- - 11 files changed, 42 insertions(+), 17 deletions(-) - rename {qimgv_libs/qimgv_player_mpv => plugins/player_mpv}/CMakeLists.txt (51%) - rename {qimgv_libs/qimgv_player_mpv => plugins/player_mpv}/src/mpvwidget.cpp (100%) - rename {qimgv_libs/qimgv_player_mpv => plugins/player_mpv}/src/mpvwidget.h (100%) - rename {qimgv_libs/qimgv_player_mpv => plugins/player_mpv}/src/qthelper.hpp (100%) - rename {qimgv_libs/qimgv_player_mpv => plugins/player_mpv}/src/videoplayer.cpp (100%) - rename {qimgv_libs/qimgv_player_mpv => plugins/player_mpv}/src/videoplayer.h (100%) - rename {qimgv_libs/qimgv_player_mpv => plugins/player_mpv}/src/videoplayermpv.cpp (100%) - rename {qimgv_libs/qimgv_player_mpv => plugins/player_mpv}/src/videoplayermpv.h (100%) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a97ea91..e7848b9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,6 +12,11 @@ project(qimgv - #endif() - message(STATUS "Build configuration: " ${CMAKE_BUILD_TYPE}) - -+set(QIMGV_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qimgv") -+ADD_DEFINITIONS(-D_QIMGV_PLUGIN_PATH="${QIMGV_PLUGIN_PATH}/") -+ -+message(STATUS "Plugin path: " ${QIMGV_PLUGIN_PATH}) -+ - # detect if libstdc++ is in use to know if libstdc++fs should be linked - include(CheckCXXSourceCompiles) - check_cxx_source_compiles("#include -@@ -67,5 +72,5 @@ endif() - add_subdirectory(qimgv) - - if(VIDEO_SUPPORT) -- add_subdirectory(qimgv_libs/qimgv_player_mpv) -+ add_subdirectory(plugins/player_mpv) - endif() -diff --git a/qimgv_libs/qimgv_player_mpv/CMakeLists.txt b/plugins/player_mpv/CMakeLists.txt -similarity index 51% -rename from qimgv_libs/qimgv_player_mpv/CMakeLists.txt -rename to plugins/player_mpv/CMakeLists.txt -index b12ab97..0fdccfd 100644 ---- a/qimgv_libs/qimgv_player_mpv/CMakeLists.txt -+++ b/plugins/player_mpv/CMakeLists.txt -@@ -1,10 +1,12 @@ - cmake_minimum_required(VERSION 3.11) --project(qimgv_player_mpv VERSION 1.0 -+project(player_mpv - DESCRIPTION "video player widget for qimgv (using mpv)" - LANGUAGES CXX) - - set(CMAKE_AUTOMOC ON) - -+set(QIMGV_LIBDIR "${CMAKE_INSTALL_LIBDIR}/qimgv") -+ - find_package(Qt5 REQUIRED COMPONENTS Core Widgets) - - find_package(PkgConfig REQUIRED) -@@ -12,31 +14,30 @@ pkg_check_modules(Mpv REQUIRED IMPORTED_TARGET mpv) - - include(GNUInstallDirs) - --add_library(qimgv_player_mpv SHARED -+add_library(player_mpv SHARED - src/videoplayer.cpp - src/mpvwidget.cpp - src/videoplayermpv.cpp - src/qthelper.hpp) - --target_compile_features(qimgv_player_mpv PRIVATE cxx_std_11) -+target_compile_features(player_mpv PRIVATE cxx_std_11) - --target_link_libraries(qimgv_player_mpv PRIVATE -+target_link_libraries(player_mpv PRIVATE - Qt5::Core Qt5::Widgets PkgConfig::Mpv) - --set_target_properties(qimgv_player_mpv PROPERTIES -+set_target_properties(player_mpv PROPERTIES - CXX_EXTENSIONS OFF -- VERSION ${PROJECT_VERSION} -- SOVERSION 1) -+ PREFIX "") - --target_include_directories(qimgv_player_mpv PRIVATE src) -+target_include_directories(player_mpv PRIVATE src) - - if(WIN32) -- target_include_directories(qimgv_player_mpv PRIVATE -+ target_include_directories(player_mpv PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/mpv-dev/include) -- target_link_directories(qimgv_player_mpv PRIVATE -+ target_link_directories(player_mpv PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/mpv-dev/$,x86_64,i686>) - endif() - --target_compile_definitions(qimgv_player_mpv PRIVATE QIMGV_PLAYER_MPV_LIBRARY) -+target_compile_definitions(player_mpv PRIVATE player_mpv_LIBRARY) - --install(TARGETS qimgv_player_mpv LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS player_mpv LIBRARY DESTINATION ${QIMGV_LIBDIR}) -diff --git a/qimgv_libs/qimgv_player_mpv/src/mpvwidget.cpp b/plugins/player_mpv/src/mpvwidget.cpp -similarity index 100% -rename from qimgv_libs/qimgv_player_mpv/src/mpvwidget.cpp -rename to plugins/player_mpv/src/mpvwidget.cpp -diff --git a/qimgv_libs/qimgv_player_mpv/src/mpvwidget.h b/plugins/player_mpv/src/mpvwidget.h -similarity index 100% -rename from qimgv_libs/qimgv_player_mpv/src/mpvwidget.h -rename to plugins/player_mpv/src/mpvwidget.h -diff --git a/qimgv_libs/qimgv_player_mpv/src/qthelper.hpp b/plugins/player_mpv/src/qthelper.hpp -similarity index 100% -rename from qimgv_libs/qimgv_player_mpv/src/qthelper.hpp -rename to plugins/player_mpv/src/qthelper.hpp -diff --git a/qimgv_libs/qimgv_player_mpv/src/videoplayer.cpp b/plugins/player_mpv/src/videoplayer.cpp -similarity index 100% -rename from qimgv_libs/qimgv_player_mpv/src/videoplayer.cpp -rename to plugins/player_mpv/src/videoplayer.cpp -diff --git a/qimgv_libs/qimgv_player_mpv/src/videoplayer.h b/plugins/player_mpv/src/videoplayer.h -similarity index 100% -rename from qimgv_libs/qimgv_player_mpv/src/videoplayer.h -rename to plugins/player_mpv/src/videoplayer.h -diff --git a/qimgv_libs/qimgv_player_mpv/src/videoplayermpv.cpp b/plugins/player_mpv/src/videoplayermpv.cpp -similarity index 100% -rename from qimgv_libs/qimgv_player_mpv/src/videoplayermpv.cpp -rename to plugins/player_mpv/src/videoplayermpv.cpp -diff --git a/qimgv_libs/qimgv_player_mpv/src/videoplayermpv.h b/plugins/player_mpv/src/videoplayermpv.h -similarity index 100% -rename from qimgv_libs/qimgv_player_mpv/src/videoplayermpv.h -rename to plugins/player_mpv/src/videoplayermpv.h -diff --git a/qimgv/CMakeLists.txt b/qimgv/CMakeLists.txt -index dcf8ce8..bf95811 100644 ---- a/qimgv/CMakeLists.txt -+++ b/qimgv/CMakeLists.txt -@@ -42,6 +42,9 @@ if(KDE_SUPPORT) - endif() - if(VIDEO_SUPPORT) - target_compile_definitions(qimgv PRIVATE USE_MPV) -+ if(NOT WIN32) -+ ADD_DEFINITIONS(-D_QIMGV_PLAYER_PLUGIN="player_mpv.so") -+ endif() - endif() - if(OPENCV_SUPPORT) - target_link_libraries(qimgv PRIVATE ${OpenCV_LIBS}) -diff --git a/qimgv/gui/viewers/videoplayerinitproxy.cpp b/qimgv/gui/viewers/videoplayerinitproxy.cpp -index 409d42f..7de3048 100644 ---- a/qimgv/gui/viewers/videoplayerinitproxy.cpp -+++ b/qimgv/gui/viewers/videoplayerinitproxy.cpp -@@ -1,5 +1,17 @@ - #include "videoplayerinitproxy.h" - -+#ifdef _QIMGV_PLUGIN_PATH -+ #define QIMGV_PLUGIN_PATH _QIMGV_PLUGIN_PATH -+#else -+ #define QIMGV_PLUGIN_PATH "" -+#endif -+ -+#ifdef _QIMGV_PLAYER_PLUGIN -+ #define QIMGV_PLAYER_PLUGIN _QIMGV_PLAYER_PLUGIN -+#else -+ #define QIMGV_PLAYER_PLUGIN "" -+#endif -+ - VideoPlayerInitProxy::VideoPlayerInitProxy(QWidget *parent) - : VideoPlayer(parent), - player(nullptr) -@@ -26,13 +38,19 @@ std::shared_ptr VideoPlayerInitProxy::getPlayer() { - } - - inline bool VideoPlayerInitProxy::initPlayer() { -+ QString path = QString(QIMGV_PLUGIN_PATH) + QIMGV_PLAYER_PLUGIN; - #ifndef USE_MPV - return false; - #endif - if(player) - return true; - #ifdef __linux -- playerLib.setFileName("qimgv_player_mpv"); -+ if(QFile::exists(path)) { -+ playerLib.setFileName(path); -+ } else { -+ qDebug() << "Plugin at:" << path << "does not exist."; -+ playerLib.setFileName("qimgv_player_mpv"); // let QLibrary try to find it -+ } - #else - playerLib.setFileName("libqimgv_player_mpv.dll"); - #endif -@@ -43,11 +61,9 @@ inline bool VideoPlayerInitProxy::initPlayer() { - player.reset(pl); - } - if(!player) { -- qDebug() << "[VideoPlayerInitProxy] Error - could not load player library"; -- qDebug() << playerLib.fileName(); -+ qDebug() << "Could not load plugin:" << playerLib.fileName(); - return false; - } -- //qDebug() << "[VideoPlayerInitProxy] Library load success!"; - - player->setMuted(!settings->playVideoSounds()); - player->setVideoUnscaled(!settings->expandImage()); diff --git a/qimgv-pluginpath_2.patch b/qimgv-pluginpath_2.patch deleted file mode 100644 index 837b39f..0000000 --- a/qimgv-pluginpath_2.patch +++ /dev/null @@ -1,121 +0,0 @@ -From dab45dd74ca2e8c208548f3e21546dc3e91acf34 Mon Sep 17 00:00:00 2001 -From: easymodo -Date: Sun, 31 May 2020 17:56:31 +0300 -Subject: [PATCH] [cmake] use absolute path for player .so; initPlayer() - - tweak file checks & error messages - ---- - CMakeLists.txt | 6 +++--- - qimgv/CMakeLists.txt | 2 +- - qimgv/gui/viewers/videoplayerinitproxy.cpp | 25 +++++++++------------- - qimgv/gui/viewers/videoplayerinitproxy.h | 1 + - 4 files changed, 15 insertions(+), 19 deletions(-) - -Index: qimgv-0.9.1/CMakeLists.txt -=================================================================== ---- qimgv-0.9.1.orig/CMakeLists.txt -+++ qimgv-0.9.1/CMakeLists.txt -@@ -12,10 +12,10 @@ project(qimgv - #endif() - message(STATUS "Build configuration: " ${CMAKE_BUILD_TYPE}) - --set(QIMGV_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qimgv") --ADD_DEFINITIONS(-D_QIMGV_PLUGIN_PATH="${QIMGV_PLUGIN_PATH}/") -+set(QIMGV_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qimgv") -+ADD_DEFINITIONS(-D_QIMGV_PLUGIN_DIR="${QIMGV_PLUGIN_DIR}") - --message(STATUS "Plugin path: " ${QIMGV_PLUGIN_PATH}) -+message(STATUS "Plugin dir: " ${QIMGV_PLUGIN_DIR}) - - # detect if libstdc++ is in use to know if libstdc++fs should be linked - include(CheckCXXSourceCompiles) -Index: qimgv-0.9.1/qimgv/CMakeLists.txt -=================================================================== ---- qimgv-0.9.1.orig/qimgv/CMakeLists.txt -+++ qimgv-0.9.1/qimgv/CMakeLists.txt -@@ -46,7 +46,7 @@ endif() - if(VIDEO_SUPPORT) - target_compile_definitions(qimgv PRIVATE USE_MPV) - if(NOT WIN32) -- ADD_DEFINITIONS(-D_QIMGV_PLAYER_PLUGIN="player_mpv.so") -+ ADD_DEFINITIONS(-D_QIMGV_PLAYER_PLUGIN="${QIMGV_PLUGIN_DIR}/player_mpv.so") - endif() - endif() - if(OPENCV_SUPPORT) -Index: qimgv-0.9.1/qimgv/gui/viewers/videoplayerinitproxy.cpp -=================================================================== ---- qimgv-0.9.1.orig/qimgv/gui/viewers/videoplayerinitproxy.cpp -+++ qimgv-0.9.1/qimgv/gui/viewers/videoplayerinitproxy.cpp -@@ -1,11 +1,5 @@ - #include "videoplayerinitproxy.h" - --#ifdef _QIMGV_PLUGIN_PATH -- #define QIMGV_PLUGIN_PATH _QIMGV_PLUGIN_PATH --#else -- #define QIMGV_PLUGIN_PATH "" --#endif -- - #ifdef _QIMGV_PLAYER_PLUGIN - #define QIMGV_PLAYER_PLUGIN _QIMGV_PLAYER_PLUGIN - #else -@@ -38,21 +32,22 @@ std::shared_ptr VideoPlayer - } - - inline bool VideoPlayerInitProxy::initPlayer() { -- QString path = QString(QIMGV_PLUGIN_PATH) + QIMGV_PLAYER_PLUGIN; -+ QString path = QIMGV_PLAYER_PLUGIN; - #ifndef USE_MPV - return false; - #endif - if(player) - return true; --#ifdef __linux -- if(QFile::exists(path)) { -+#ifdef _WIN32 -+ playerLib.setFileName("plugins/player_mpv.dll"); -+#else -+ QFileInfo pluginFile(path); -+ if(pluginFile.isFile() && pluginFile.isReadable()) { - playerLib.setFileName(path); - } else { - qDebug() << "Plugin at:" << path << "does not exist."; -- playerLib.setFileName("qimgv_player_mpv"); // let QLibrary try to find it -+ return false; - } --#else -- playerLib.setFileName("libqimgv_player_mpv.dll"); - #endif - typedef VideoPlayer* (*createPlayerWidgetFn)(); - createPlayerWidgetFn fn = (createPlayerWidgetFn) playerLib.resolve("CreatePlayerWidget"); -@@ -61,7 +56,7 @@ inline bool VideoPlayerInitProxy::initPl - player.reset(pl); - } - if(!player) { -- qDebug() << "Could not load plugin:" << playerLib.fileName(); -+ qDebug() << "Could not load plugin:" << playerLib.fileName() << ". Last error: " << playerLib.errorString(); - return false; - } - -@@ -75,8 +70,8 @@ inline bool VideoPlayerInitProxy::initPl - setFocusProxy(player.get()); - connect(player.get(), SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int))); - connect(player.get(), SIGNAL(positionChanged(int)), this, SIGNAL(positionChanged(int))); -- connect(player.get(), SIGNAL(videoPaused(bool)), this, SIGNAL(videoPaused(bool))); -- connect(player.get(), SIGNAL(playbackFinished()), this, SIGNAL(playbackFinished())); -+ connect(player.get(), SIGNAL(videoPaused(bool)), this, SIGNAL(videoPaused(bool))); -+ connect(player.get(), SIGNAL(playbackFinished()), this, SIGNAL(playbackFinished())); - return true; - } - -Index: qimgv-0.9.1/qimgv/gui/viewers/videoplayerinitproxy.h -=================================================================== ---- qimgv-0.9.1.orig/qimgv/gui/viewers/videoplayerinitproxy.h -+++ qimgv-0.9.1/qimgv/gui/viewers/videoplayerinitproxy.h -@@ -7,6 +7,7 @@ - #include "videoplayer.h" - #include "settings.h" - #include -+#include - #include - - class VideoPlayerInitProxy : public VideoPlayer { diff --git a/qimgv-pluginpath_3.patch b/qimgv-pluginpath_3.patch deleted file mode 100644 index e08230f..0000000 --- a/qimgv-pluginpath_3.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7b7f9c1403fd73174ef56237c8032cefac82d437 Mon Sep 17 00:00:00 2001 -From: easymodo -Date: Mon, 1 Jun 2020 17:27:58 +0300 -Subject: [PATCH] [cmake] check for absolute path; change SHARED > MODULE - ---- - CMakeLists.txt | 7 ++++++- - plugins/player_mpv/CMakeLists.txt | 2 +- - 2 files changed, 7 insertions(+), 2 deletions(-) - -Index: qimgv-0.9.1/CMakeLists.txt -=================================================================== ---- qimgv-0.9.1.orig/CMakeLists.txt -+++ qimgv-0.9.1/CMakeLists.txt -@@ -12,7 +12,12 @@ project(qimgv - #endif() - message(STATUS "Build configuration: " ${CMAKE_BUILD_TYPE}) - --set(QIMGV_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qimgv") -+if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) -+ set(QIMGV_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/qimgv") -+else() -+ set(QIMGV_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qimgv") -+endif() -+ - ADD_DEFINITIONS(-D_QIMGV_PLUGIN_DIR="${QIMGV_PLUGIN_DIR}") - - message(STATUS "Plugin dir: " ${QIMGV_PLUGIN_DIR}) -Index: qimgv-0.9.1/plugins/player_mpv/CMakeLists.txt -=================================================================== ---- qimgv-0.9.1.orig/plugins/player_mpv/CMakeLists.txt -+++ qimgv-0.9.1/plugins/player_mpv/CMakeLists.txt -@@ -14,7 +14,7 @@ pkg_check_modules(Mpv REQUIRED IMPORTED_ - - include(GNUInstallDirs) - --add_library(player_mpv SHARED -+add_library(player_mpv MODULE - src/videoplayer.cpp - src/mpvwidget.cpp - src/videoplayermpv.cpp diff --git a/qimgv.changes b/qimgv.changes index 7a5c88e..87e3bae 100644 --- a/qimgv.changes +++ b/qimgv.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Wed Sep 22 17:25:37 UTC 2021 - Luigi Baldoni + +- Update to version 1.0.0 + General: + * Qt6 support + * UI updates + * Custom theme support + * Printing support + * Export to pdf + * Improved image format compatibility + * Allow image resizing by percentage + * Tweak zoom step range + * Add absolute zoom step option + * Confirmation when overwriting files + * Allow Tab key in shortcuts + * Add slideshow / shuffle mode indication in window title + * Adjacent directory switching (shift+left / shift+right) + * Automatic seamless directory switching + * Allow more video formats besides webm/mp4 + * Zoom Lock feature + * Shortcut for toggling fullscreen infobar + * Show in folder menu option now pre-selects current file + Folder view: + * Display folders + * Display image resolution + * Filesystem navigation via Enter / Backspace + * Show path bar (will be improved in future) + * Allow multi-selection + * Mass rotate / delete + * Improved drag'n'drop + * Renaming now works in folderview + * Improved thumbnail loading responsiveness + * Unload off-screen thumbnails option + Misc: + * Fix video playback with the latest mpv + * Fix window positioning under some window managers + * Allow custom cache folder location + * Change default thumbnailer thread count to 4 + * Fix cursor autohide on wayland + * Fix context menu potentially appearing off-screen + * Other minor bug fixes + * Lots of visual fixes +- Refresh qimgv-PIE.patch +- Drop qimgv-pluginpath_1.patch, qimgv-pluginpath_2.patch and + qimgv-pluginpath_3.patch +- Add qimgv-no_return_in_nonvoid.patch + ------------------------------------------------------------------- Sun May 31 09:12:40 UTC 2020 - Luigi Baldoni diff --git a/qimgv.spec b/qimgv.spec index bc207d4..e08d817 100644 --- a/qimgv.spec +++ b/qimgv.spec @@ -1,7 +1,7 @@ # # spec file for package qimgv # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: qimgv -Version: 0.9.1 +Version: 1.0.0 Release: 0 Summary: Qt5 image viewer License: GPL-3.0-only @@ -27,23 +27,21 @@ Source0: https://github.com/easymodo/qimgv/archive/v%{version}.tar.gz#/%{ Patch1: qimgv-PIE.patch # PATCH-FIX-OPENSUSE qimgv-includepath.patch # aloisio@gmx.com use correct path for opencv includes Patch2: qimgv-includepath.patch -# PATCH-FIX-UPSTREAM qimgv-pluginpath_1.patch -Patch3: qimgv-pluginpath_1.patch -# PATCH-FIX-UPSTREAM qimgv-pluginpath_2.patch -Patch4: qimgv-pluginpath_2.patch -# PATCH-FIX-UPSTREAM qimgv-pluginpath_3.patch -Patch5: qimgv-pluginpath_3.patch +# PATCH-FIX-OPENSUSE qimgv-no_return_in_nonvoid.patch # aloisio@gmx.com pacify rpmlint +Patch6: qimgv-no_return_in_nonvoid.patch BuildRequires: cmake >= 3.13 %if 0%{?suse_version} > 1500 BuildRequires: gcc-c++ %else -BuildRequires: gcc8-c++ +BuildRequires: gcc9-c++ %endif BuildRequires: hicolor-icon-theme BuildRequires: opencv-devel BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.9 -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) >= 5.14 BuildRequires: pkgconfig(exiv2) BuildRequires: pkgconfig(mpv) >= 1.22.0 Requires: mpv >= 0.32.0 @@ -56,7 +54,7 @@ Qt5 image viewer with webm support. %build export CXX=g++ -test -x "$(type -p g++-8)" && export CXX=g++-8 +test -x "$(type -p g++-9)" && export CXX=g++-9 %cmake %make_jobs