Accepting request 1030040 from graphics

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/1030040 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qimgv?expand=0&rev=25
2022-10-20 09:11:31 +00:00 · 2022-10-20 09:11:31 +00:00 · 5d2c702bc7
commit 5d2c702bc7
parent 92a3b5be5e 9ebcab2b7f
9 changed files with 94 additions and 65 deletions
--- a/15
+++ b/15
@ -1,12 +1,16 @@
-<!--
-# vim: set syntax=xml
-->
-
 <services>
  <service name="obs_scm" mode="disabled">
    <param name="url">https://github.com/easymodo/qimgv</param>
    <param name="scm">git</param>
-    <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
+    <!-- TESTING -->
+    <!-- LAST KNOWN GOOD:  (older) ;  (newer)
+    <param name="revision">fa75f65</param>
+    -->
+    <!-- BUILD FAILS:      (older) ;  (newer)
+    <param name="revision">df8ebbd</param>  # Something seems to break here.
+    <param name="revision">bc355f6</param>
+    <param name="revision">cfed4cb</param>
+    -->
    <!-- Commenting out for TEMP
    <param name="versionrewrite-pattern">v(.*)</param>
    -->
@ -14,6 +18,7 @@
    <param name="versionrewrite-pattern">v1.0.3-alpha</param>
    <param name="versionrewrite-replacement">1.0.3a</param>
    <!-- /TEMP -->
+    <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
    <param name="changesgenerate">enable</param>
  </service>
  <service name="set_version" mode="disabled"/>
--- a/2
+++ b/2
@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                <param name="url">https://github.com/easymodo/qimgv</param>
-              <param name="changesrevision">b219278c5099cc8f1ba7d28f710747a0fb75eeb8</param></service></servicedata>
+              <param name="changesrevision">d24f3fa9df86b8abfb0ac9c790c3202d49d1b149</param></service></servicedata>
--- a/qimgv-1.0.3a+git20220621.b219278c.tar.gz
+++ b/qimgv-1.0.3a+git20220621.b219278c.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1a41d707508c8ab178fdfd73aacc0b1dfe9ccca5a944513c98f09287a426daf
-size 706869
--- a/qimgv-1.0.3a+git20220914.d24f3fa.tar.gz
+++ 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
--- a/qimgv-PIE.patch
+++ b/qimgv-PIE.patch
@ -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)
--- a/qimgv-includepath.patch
+++ b/qimgv-includepath.patch
@ -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 <QSysInfo>
- #include <QDebug>
- #include <cstring>
-#include <opencv4/opencv2/imgproc.hpp>
-+#include <opencv2/imgproc.hpp>
- 
- 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 <QtGui/qimage.h>
-#include <opencv4/opencv2/core.hpp>
-+#include <opencv2/core.hpp>
- 
- namespace QtOcv {
- 
--- a/qimgv.changes
+++ b/qimgv.changes
@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Wed Oct 12 17:07:07 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
+
+- 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

--- 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
--- 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