diff --git a/qimgv-0.6-no_return_in_nonvoid.patch b/qimgv-0.6-no_return_in_nonvoid.patch deleted file mode 100644 index 6747ec9..0000000 --- a/qimgv-0.6-no_return_in_nonvoid.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: qimgv-0.6/gui/viewers/videoplayermpvproxy.cpp -=================================================================== ---- qimgv-0.6.orig/gui/viewers/videoplayermpvproxy.cpp -+++ qimgv-0.6/gui/viewers/videoplayermpvproxy.cpp -@@ -24,6 +24,7 @@ inline void VideoPlayerMpvProxy::initPla - bool VideoPlayerMpvProxy::openMedia(Clip *clip) { - initPlayer(); - player->openMedia(clip); -+ return NULL; - } - - void VideoPlayerMpvProxy::seek(int pos) { diff --git a/qimgv-0.6-qt511.patch b/qimgv-0.6-qt511.patch new file mode 100644 index 0000000..f258fb1 --- /dev/null +++ b/qimgv-0.6-qt511.patch @@ -0,0 +1,22 @@ +From bd5cdb210c1d5885b26cde89106fd14fd8ee5a1e Mon Sep 17 00:00:00 2001 +From: easymodo +Date: Sun, 27 May 2018 19:57:26 +0300 +Subject: [PATCH] [CMake] remove deprecated macro + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ead5858..1c298c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,7 +40,7 @@ add_executable(qimgv ${SRC} ${RES}) + + target_link_libraries(qimgv actionmanager cache directorymanager loader scaler thumbnailer gui utils sourcecontainers) + +-qt5_use_modules (qimgv Core Widgets Concurrent) ++target_link_libraries(qimgv Qt5::Core Qt5::Widgets Qt5::Concurrent) + + # binary + install(PROGRAMS ${CMAKE_BINARY_DIR}/qimgv diff --git a/qimgv-0.6-qt56.patch b/qimgv-0.6-qt56.patch deleted file mode 100644 index fd15ff0..0000000 --- a/qimgv-0.6-qt56.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qimgv-0.6/components/directorymanager/watchers/directorywatcher_p.h -=================================================================== ---- qimgv-0.6.orig/components/directorymanager/watchers/directorywatcher_p.h -+++ qimgv-0.6/components/directorymanager/watchers/directorywatcher_p.h -@@ -11,6 +11,8 @@ - #include - #include - #include -+#include -+#include - - class DirectoryWatcherPrivate : public QObject { - Q_OBJECT diff --git a/qimgv-0.6.3.tar.gz b/qimgv-0.6.3.tar.gz new file mode 100644 index 0000000..55a3641 --- /dev/null +++ b/qimgv-0.6.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:695705f146be9dbffd9835f332c0a9f43ef16012f180b91ea2179f54fb881349 +size 238521 diff --git a/qimgv-0.6.tar.gz b/qimgv-0.6.tar.gz deleted file mode 100644 index e5730b4..0000000 --- a/qimgv-0.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4f5b5400e892ddcc1a417d8652eda25122b520308dd20fa9d9d5da4b5784892 -size 232586 diff --git a/qimgv.changes b/qimgv.changes index c894776..4c9a55d 100644 --- a/qimgv.changes +++ b/qimgv.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jun 11 18:29:58 UTC 2018 - aloisio@gmx.com + +- Update to version 0.6.3 + * You can now mirror images by pressing H / V keys. + version 0.6.2 + * WebM/MP4 playback issues #49 + version 0.6.1 + * Initial HiDPI support. May be buggy. + * Add scroll animation. + * Add a checkbox for .mp4 playback. + * Rewrite crop overlay logic. + * Workaround for https://bugreports.qt.io/browse/QTBUG-66387 + +- Dropped qimgv-0.6-qt56.patch and + qimgv-0.6-no_return_in_nonvoid.patch (merged upstream) + +- Added qimgv-0.6-qt511.patch to fix build with Qt 5.11 + ------------------------------------------------------------------- Fri Jan 12 09:29:51 UTC 2018 - aloisio@gmx.com diff --git a/qimgv.spec b/qimgv.spec index 50a7cb3..cb99f8d 100644 --- a/qimgv.spec +++ b/qimgv.spec @@ -17,17 +17,15 @@ Name: qimgv -Version: 0.6 +Version: 0.6.3 Release: 0 Summary: Qt5 image viewer -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Graphics/Viewers Url: https://github.com/easymodo/qimgv Source0: https://github.com/easymodo/qimgv/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM qimgv-0.6-qt56.patch -Patch0: qimgv-0.6-qt56.patch -# PATCH-FIX-UPSTREAM qimgv-0.6-no_return_in_nonvoid.patch -Patch1: qimgv-0.6-no_return_in_nonvoid.patch +# PATCH-FIX-UPSTREAM qimgv-0.6-qt511.patch +Patch2: qimgv-0.6-qt511.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -41,8 +39,7 @@ Qt5 image viewer with webm support. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch2 -p1 %build %cmake