Accepting request 1173353 from home:AndnoVember:branches:X11:LXQt

- Update to 2.0.1: * Fixed a crash on using annotations with Qt ≥ 6.7 * Fixed a memory leak * Ported to Qt6, and added some menu icons OBS-URL: https://build.opensuse.org/request/show/1173353 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lximage-qt?expand=0&rev=35
2024-05-16 14:42:47 +00:00 · 2024-05-16 14:42:47 +00:00 · 98f37587cd
commit 98f37587cd
parent 718ca5afd4
7 changed files with 59 additions and 51 deletions
--- a/lximage-qt-1.4.0.tar.xz
+++ b/lximage-qt-1.4.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0857650bdb32c5ba5befbd726fbff62137e45d2cf26bc88b0d32622e718cd34e
-size 841028
--- a/lximage-qt-1.4.0.tar.xz.asc
+++ b/lximage-qt-1.4.0.tar.xz.asc
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmVHfHsVHHRzdWphbjIw
-MDBAZ21haWwuY29tAAoJEL55MAetIt9+N/sP/1qj4cckRpCZ4oOT9RcDoHbxyRss
-ySBrtTZ8r/8U5bfjlR5hIWkNmQ6Eb7cVFDquC0UNIdzJq0ScT4Dg9mZVod1Ym2id
-+t0JxKQ9j96YiG9HMhGW+t+2rZqyLKpqGsaDjflvX8+DWDnUPPCWjm06pkCycKTi
-9qs/FXvgLBIkcwu/+3g9NXK36j387c9ph6hWlTt5JmWm0GjtAtQxD48N8KdMYnz8
-vZkI4zrJeKTR651BH0s2E+FAwvcXs45F9rVFcjuxFwpxYd9o4bhxs+F6yo4Pnd+f
-brB3V9lknafJE459HCTDySVqupZO2nPBc6rtlYMUDD/J600fX3VYoeilwmpilMJu
-Gri5g9C9jwotFNLE8RxGcC3dcct5jsdtNd5Rvz29o7VtMMarFgwGOFjizI595avM
-dPHBuT/IXm9cyPD0xCKuDzmJqLtANPz4y9W23Q0kSpiXxRijOvCwmK2mChd0lHtJ
-hpgL1EGhxMC2ja+3fnWdsBxNo9x6zKgnTw8B0MMuJy5llR2eBWCPgeK6gkwSRjCE
-OxEDSbw7UzcV6hzWwZ9vr0th6lkjzIeIvTrriBtrNKgotntUibZtnU0cIb9WYUOv
-vrmebVu5tNVm1Zys87QC7raX6aybxSaf8oMqRTAnwwFbBFY8G7yQvRmgUZRsLmVT
-398xsLNpJC55iT43
-=Zem2
-----END PGP SIGNATURE-----
--- a/lximage-qt-2.0.1.tar.xz
+++ b/lximage-qt-2.0.1.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55ca3bb14f58cda3abe364f820de011aeddb4b2840e3ae4467190c1097c40f8e
+size 848348
--- a/lximage-qt-2.0.1.tar.xz.asc
+++ b/lximage-qt-2.0.1.tar.xz.asc
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmY2dfoVHHRzdWphbjIw
+MDBAZ21haWwuY29tAAoJEL55MAetIt9+WlUP/iuBiOrgHeNO+XHf4ERlidudaEJi
+V/G2q92VZgLAxUxjSq9CcRld6KN4JukoFcJPijBcNP6oq2H70GXCIXX3hrj8WK0b
+ICMPWmkjnXE8gY2SKdIkMJ2Bd/XTIv5l53tl7UeoA2v319mBSV01wvtQ2hBr+PAm
+SliO4esKsRRdjveSU/3TkE+L/iJF0Lvr9q8OlAt891oDVwXovZ82S7tw0vX7cNif
+j9X1oCxYIdpW9Y91B7dKL4A9fLZACjk/NDzSNcUJ4pY928F4v7sd94BitekYYSFB
+PAR+IuzuheLivLriRnlD6FdpSBoe7gzQWVOK9UoLmwXDZkNNGz0W2DLWC6F/iPU9
+Be+BuFnTfQOZqhjfzv8lLjNQ9M1VVvs/d/Iv1MTyKo2hRrG3aFJZ1YJAK6gW7Hv6
+2ejNOnGMxwOjC/R3B7VYW1h8YYZ1DXNytQQBK0FN33OTOTyibawTqpCTudLjpOQp
+4m79JMnBafc7iu7fyJ5NiWDj3ZqDOXu3BLnQEcuh21K8w8Sf/oc/15E5mV0rY2I0
+Du2/DZqyYm7eje3ngYmQ7sztx2B+GxJJvxdQoVpSwCGifuAch5UkGyq91h4HyaVo
+txyyYX7gkSrKkFkPqIv2LPkAbCD77OJw0n20v3i9x8g0uOKSaEWRnsucE7sdNbap
+CSxTUBYiAzn0c8j/
+=/YhV
+-----END PGP SIGNATURE-----
--- a/lximage-qt.changes
+++ b/lximage-qt.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 10 19:23:54 UTC 2024 - Андрей Алыпов <and.november@opensuse.org>
+
+- Update to 2.0.1:
+  * Fixed a crash on using annotations with Qt ≥ 6.7
+  * Fixed a memory leak
+  * Ported to Qt6, and added some menu icons
+
 -------------------------------------------------------------------
 Mon Jan  1 07:24:41 UTC 2024 - Shawn Dunn <sfalken@opensuse.org>

--- a/lximage-qt.keyring
+++ b/lximage-qt.keyring
@ -49,4 +49,4 @@ bJSJ/O/vzlRtDjOJ1JDlMRLs7TnOFeUh5pgwyaJoidYbJEiGlMGJbI6BjwhDTBFO
 NLJtd3SsRjc7ICtGdCvej59IvCDTjxtkhx5okF03APi1aXpHQrE18/arFD7BpoGO
 sw==
 =gSIv
-----END PGP PUBLIC KEY BLOCK-----
+-----END PGP PUBLIC KEY BLOCK-----
--- a/lximage-qt.spec
+++ b/lximage-qt.spec
@ -1,7 +1,7 @@
 #
 # spec file for package lximage-qt
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,32 +17,35 @@


 Name:           lximage-qt
-Version:        1.4.0
+Version:        2.0.1
 Release:        0
 Summary:        LXQt Image Viewer
 License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Viewers
-URL:            http://www.lxqt.org
-Source:         https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
-Source1:        https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
+URL:            https://github.com/lxqt/lximage-qt
+Source0:        %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
+Source1:        %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
-BuildRequires:  cmake >= 3.1.0
+BuildRequires:  cmake >= 3.18.0
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  lxqt-build-tools-devel >= 0.13.0
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  lxqt2-build-tools
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
-BuildRequires:  cmake(KF5WindowSystem)
-BuildRequires:  cmake(Qt5LinguistTools)
-BuildRequires:  pkgconfig(Qt5DBus) >= 5.15.0
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5PrintSupport)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  cmake(Qt6DBus) >= 6.3.0
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Network)
+BuildRequires:  cmake(Qt6PrintSupport)
+BuildRequires:  cmake(Qt6Svg)
+BuildRequires:  cmake(Qt6SvgWidgets)
+BuildRequires:  cmake(Qt6Widgets)
+BuildRequires:  cmake(fm-qt6)
 BuildRequires:  pkgconfig(libexif)
-BuildRequires:  pkgconfig(libfm-qt) >= %{version}
-BuildRequires:  pkgconfig(lxqt) >= %{version}
+BuildRequires:  pkgconfig(libmenu-cache) >= 1.1.0
+BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xfixes)
+Recommends:     %{name}-lang = %{version}-%{release}
 Requires(post): desktop-file-utils
 Requires(pre):  desktop-file-utils

@ -52,35 +55,32 @@ Image Viewer for LXQt and Thumbnail Generator for PCManFM-Qt
 %lang_package

 %prep
-%setup -q
+%autosetup

 %build
-%cmake \
-    -DUSE_QT5=ON \
-    -DPULL_TRANSLATIONS=OFF
+%cmake_qt6
+%qt6_build

 %install
-%cmake_install
-
+%qt6_install
 %suse_update_desktop_file -r %{name} Graphics Viewer RasterGraphics 2DGraphics Photography
-
-%fdupes %{buildroot}%{_datadir}/%{name}
+%fdupes -s %{buildroot}%{_datadir}/%{name}

 %find_lang %{name} --with-qt

 %files
-%license COPYING
-%doc AUTHORS
-%dir %{_datadir}/icons/hicolor/48x48
-%dir %{_datadir}/icons/hicolor/48x48/apps
+%doc AUTHORS CHANGELOG README.md
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}*.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.??g
-%{_datadir}/metainfo/lximage-qt.metainfo.xml
+%{_datadir}/metainfo/%{name}.metainfo.xml
+%license COPYING

 %files lang -f %{name}.lang
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/translations
-%{_datadir}/%{name}/translations/*
+%if 0%{?sle_version}
+%{_datadir}/%{name}/translations/%{name}_???.qm
+%endif

 %changelog