From 9ebcab2b7f4968a4ee08ff8a55ae6f025a3f64e4 Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Wed, 12 Oct 2022 17:28:34 +0000 Subject: [PATCH] Accepting request 1010299 from home:sbradnick - Cleaning up unused files - Removing 'qimgv-PIE.patch' and 'qimgv-includepath.patch' from use - Adding (temporarily?) CFLAGS so build is successful - Adding 'cmake(Qt5LinguistTools)' BuildRequires - Update to version 1.0.3a+git20220914.d24f3fa: * Update msys2-dll-deps.txt * crash fix * [msys2] update build script * add ukrainian translation * [contextmenu] use SetDefaultConstraint * revert to gl player for now * [settingsdialog] improve icons & minor stuff * [settingsdialog] some design polishing * new option - unlockMinZoom * layout tweaks, finish other settings pages * another settings mockup * [imageviewerv2] add fixed zoom levels option * croppanel - fix width * workaround qt6 scaling issue with QImage::Format_Indexed8 * [viewerwidget] 'Up' arrow switches to FIT_WIDTH useful for quickly reading content while browsing with arrows * [contextmenu] layout - scale to always fit contents * Update settings.cpp * fix overlays when using large font * (wip) adjust widget size to accomodate oversized fonts * use qt dpi rounding * settings window update * Core::loadTranslation() - fallback to applicationDirPath()/translations * [settings] readable language names * [settings] language selector, fix .qm loading OBS-URL: https://build.opensuse.org/request/show/1010299 OBS-URL: https://build.opensuse.org/package/show/graphics/qimgv?expand=0&rev=49 --- _service | 15 ++++-- _servicedata | 2 +- qimgv-1.0.3a+git20220621.b219278c.tar.gz | 3 -- qimgv-1.0.3a+git20220914.d24f3fa.tar.gz | 3 ++ qimgv-PIE.patch | 14 ----- qimgv-includepath.patch | 26 --------- qimgv.changes | 68 ++++++++++++++++++++++++ qimgv.obsinfo | 6 +-- qimgv.spec | 22 ++++---- 9 files changed, 94 insertions(+), 65 deletions(-) delete mode 100644 qimgv-1.0.3a+git20220621.b219278c.tar.gz create mode 100644 qimgv-1.0.3a+git20220914.d24f3fa.tar.gz delete mode 100644 qimgv-PIE.patch delete mode 100644 qimgv-includepath.patch diff --git a/_service b/_service index 2b2bd00..be2ec13 100644 --- a/_service +++ b/_service @@ -1,12 +1,16 @@ - - https://github.com/easymodo/qimgv git - @PARENT_TAG@+git%cd.%h + + + @@ -14,6 +18,7 @@ v1.0.3-alpha 1.0.3a + @PARENT_TAG@+git%cd.%h enable diff --git a/_servicedata b/_servicedata index ff7ec15..a525c60 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/easymodo/qimgv - b219278c5099cc8f1ba7d28f710747a0fb75eeb8 \ No newline at end of file + d24f3fa9df86b8abfb0ac9c790c3202d49d1b149 \ No newline at end of file diff --git a/qimgv-1.0.3a+git20220621.b219278c.tar.gz b/qimgv-1.0.3a+git20220621.b219278c.tar.gz deleted file mode 100644 index a810b6c..0000000 --- a/qimgv-1.0.3a+git20220621.b219278c.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1a41d707508c8ab178fdfd73aacc0b1dfe9ccca5a944513c98f09287a426daf -size 706869 diff --git a/qimgv-1.0.3a+git20220914.d24f3fa.tar.gz b/qimgv-1.0.3a+git20220914.d24f3fa.tar.gz new file mode 100644 index 0000000..546617b --- /dev/null +++ b/qimgv-1.0.3a+git20220914.d24f3fa.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:780d1aee251b214f3095205bea2cd827693cbe94b5732d6f778ff2cb5d50cf10 +size 716627 diff --git a/qimgv-PIE.patch b/qimgv-PIE.patch deleted file mode 100644 index ff9e860..0000000 --- a/qimgv-PIE.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: qimgv-1.0.0/qimgv/CMakeLists.txt -=================================================================== ---- 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) - -+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE") -+set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") -+ - # LINK STUFF - 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-includepath.patch b/qimgv-includepath.patch deleted file mode 100644 index de6b50a..0000000 --- a/qimgv-includepath.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qimgv-0.9/qimgv/3rdparty/QtOpenCV/cvmatandqimage.cpp -=================================================================== ---- qimgv-0.9.orig/qimgv/3rdparty/QtOpenCV/cvmatandqimage.cpp -+++ qimgv-0.9/qimgv/3rdparty/QtOpenCV/cvmatandqimage.cpp -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - - namespace QtOcv { - namespace { -Index: qimgv-0.9/qimgv/3rdparty/QtOpenCV/cvmatandqimage.h -=================================================================== ---- qimgv-0.9.orig/qimgv/3rdparty/QtOpenCV/cvmatandqimage.h -+++ qimgv-0.9/qimgv/3rdparty/QtOpenCV/cvmatandqimage.h -@@ -27,7 +27,7 @@ - #define CVMATANDQIMAGE_H - - #include --#include -+#include - - namespace QtOcv { - diff --git a/qimgv.changes b/qimgv.changes index 2761e11..302554f 100644 --- a/qimgv.changes +++ b/qimgv.changes @@ -1,3 +1,71 @@ +------------------------------------------------------------------- +Wed Oct 12 17:07:07 UTC 2022 - Scott Bradnick + +- Cleaning up unused files + +------------------------------------------------------------------- +Tue Sep 27 20:14:58 UTC 2022 - scott.bradnick@suse.com + +- Removing 'qimgv-PIE.patch' and 'qimgv-includepath.patch' from use +- Adding (temporarily?) CFLAGS so build is successful +- Adding 'cmake(Qt5LinguistTools)' BuildRequires +- Update to version 1.0.3a+git20220914.d24f3fa: + * Update msys2-dll-deps.txt + * crash fix + * [msys2] update build script + * add ukrainian translation + * [contextmenu] use SetDefaultConstraint + * revert to gl player for now + * [settingsdialog] improve icons & minor stuff + * [settingsdialog] some design polishing + * new option - unlockMinZoom + * layout tweaks, finish other settings pages + * another settings mockup + * [imageviewerv2] add fixed zoom levels option + * croppanel - fix width + * workaround qt6 scaling issue with QImage::Format_Indexed8 + * [viewerwidget] 'Up' arrow switches to FIT_WIDTH useful for quickly reading content while browsing with arrows + * [contextmenu] layout - scale to always fit contents + * Update settings.cpp + * fix overlays when using large font + * (wip) adjust widget size to accomodate oversized fonts + * use qt dpi rounding + * settings window update + * Core::loadTranslation() - fallback to applicationDirPath()/translations + * [settings] readable language names + * [settings] language selector, fix .qm loading + * [cmake] paths tweak + * [cmake] some translation stuff + * remove the qopengl dependency, because some platform drivers do not support opengl + * Fix an issue that the fast panel displays only nine home directories + * Fix exiv2 exception capture + * Fixed an issue where the preferences preset button does not display + * reserve exiv2 exception capture + * Remove QIMGV_PLUGIN_DIR variable definitions + * Fix apng cannot play and update translation file + * Fix the problem of locales path and add an uninstall item + * fix i18n issues during development and provide simplified chinese translation + +------------------------------------------------------------------- +Tue Sep 27 20:13:58 UTC 2022 - scott.bradnick@suse.com + +- Update to version 1.0.3a+git20220701.cfed4cb9: + * [contextmenu] tweak item spacing + * [linux] setWallpaper - support kde / gnome + * [Core::setWallpaper] use string macros + * [thumbivew] always activate item on doubleclick + * fix statusbar being in the wrong layout #422 + * [thumbview] incorrect scene width + * [ImageViewerV2] fix offset being (0,0) after setting an empty pixmap + * [thumbview] fix showEvent() + * [panel] pin button #66 #279 #400 [panel] allow side-positioning #395 [panel] center current image #151 + +------------------------------------------------------------------- +Tue Jul 26 16:09:13 UTC 2022 - scott.bradnick@suse.com + +- Update to version 1.0.3a+git20220621.fa75f65d: + * [settings] memory allocation limit #418 + ------------------------------------------------------------------- Tue Jun 21 14:08:47 UTC 2022 - scott.bradnick@suse.com diff --git a/qimgv.obsinfo b/qimgv.obsinfo index af79a19..2f61dd8 100644 --- a/qimgv.obsinfo +++ b/qimgv.obsinfo @@ -1,4 +1,4 @@ name: qimgv -version: 1.0.3a+git20220621.b219278c -mtime: 1655794981 -commit: b219278c5099cc8f1ba7d28f710747a0fb75eeb8 +version: 1.0.3a+git20220914.d24f3fa +mtime: 1663151894 +commit: d24f3fa9df86b8abfb0ac9c790c3202d49d1b149 diff --git a/qimgv.spec b/qimgv.spec index 2587c49..2e3cd13 100644 --- a/qimgv.spec +++ b/qimgv.spec @@ -17,28 +17,20 @@ Name: qimgv -Version: 1.0.3a+git20220621.b219278c +Version: 1.0.3a+git20220914.d24f3fa Release: 0 Summary: Qt5 image viewer License: GPL-3.0-only +Group: Productivity/Multimedia/Other URL: https://github.com/easymodo/qimgv Source0: %{name}-%{version}.tar.gz -# PATCH-FEATURE-OPENSUSE qimgv-PIE.patch # aloisio@gmx.com add PIE flags -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-OPENSUSE qimgv-no_return_in_nonvoid.patch # aloisio@gmx.com pacify rpmlint -# Has been fixed upstream, smb 20220505 -#Patch6: qimgv-no_return_in_nonvoid.patch -# PATCH-FIX-UPSTREAM qimgv-mpv_v2_fix.patch -# Has been fixed upstream, smb 20220505 -#Patch7: qimgv-mpv_v2_fix.patch BuildRequires: cmake >= 3.13 %if 0%{?suse_version} > 1500 BuildRequires: gcc-c++ %else BuildRequires: gcc9-c++ %endif +BuildRequires: cmake(Qt5LinguistTools) BuildRequires: hicolor-icon-theme BuildRequires: opencv-devel BuildRequires: pkgconfig @@ -54,10 +46,11 @@ Requires: mpv >= 0.32.0 Qt5 image viewer with webm support. %prep -%autosetup -p1 +%autosetup %build -export CXX=g++ +# Might be easier to pass "-fPIE" here vs. patch ... +export CXX=g++ CXXFLAGS="-Wno-error -fPIE" test -x "$(type -p g++-9)" && export CXX=g++-9 %cmake %make_jobs @@ -68,11 +61,14 @@ test -x "$(type -p g++-9)" && export CXX=g++-9 %files %doc README.md %license LICENSE +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/translations %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_libdir}/%{name} %{_libdir}/%{name}/player_mpv.so %{_datadir}/metainfo/%{name}.appdata.xml +%{_datadir}/%{name}/translations/* %changelog