From 5db82a66e52ec3341e5e44dec858c4fe9f2be7092a455d664ee1fef2b9ec5669 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Wed, 15 May 2024 11:37:10 +0000 Subject: [PATCH 1/3] Accepting request 1173382 from home:AndnoVember:branches:X11:LXQt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to 2.0.2: * Fixed a regression in running executable files in terminal. * Removed a redundant child-parent relation in path-bar to prevent a rare crash with Qt ≥ 6.7. * Ported to Qt6. * Added lxqt-menu-data dependency to README.md. * Updated mime types of lxqt-archiver and arqiver. * Added 4 menu icons. * Workaround for Qt bug in a context menu invoked by Menu key. OBS-URL: https://build.opensuse.org/request/show/1173382 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/libfm-qt?expand=0&rev=55 --- libfm-qt-1.4.0.tar.xz | 3 - libfm-qt-1.4.0.tar.xz.asc | 17 ----- libfm-qt-2.0.2.tar.xz | 3 + libfm-qt-2.0.2.tar.xz.asc | 17 +++++ libfm-qt.changes | 13 ++++ libfm-qt.keyring | 2 +- libfm-qt.spec | 131 +++++++++++++++++--------------------- 7 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 libfm-qt-1.4.0.tar.xz delete mode 100644 libfm-qt-1.4.0.tar.xz.asc create mode 100644 libfm-qt-2.0.2.tar.xz create mode 100644 libfm-qt-2.0.2.tar.xz.asc diff --git a/libfm-qt-1.4.0.tar.xz b/libfm-qt-1.4.0.tar.xz deleted file mode 100644 index 892e7b5..0000000 --- a/libfm-qt-1.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ee3882e023df1df31a53f03575856d38364aa63bec39e9a47fde3730d6f7753 -size 398004 diff --git a/libfm-qt-1.4.0.tar.xz.asc b/libfm-qt-1.4.0.tar.xz.asc deleted file mode 100644 index 7801b5f..0000000 --- a/libfm-qt-1.4.0.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmVHeacVHHRzdWphbjIw -MDBAZ21haWwuY29tAAoJEL55MAetIt9+eFwQAJ5gGCZ+iDAJeXnndzsvnnU1OXtq -DMR/8C/sIsJP5jNnR2sBTQPBpz2qdOqn8TY3ymQE5s8kVw40oEn8S8U7yDEAYAvU -TdeoGMzxyLim/J7lZ653xW87EmXY//latRHjdTTPRdM6NbYgz1SPGIacPdQ27X1f -6NMSSpgCjB2WxjJDfTyVpRCKgt5opKXki9cBFfeA9y1rTJJdoKD3H+J/IOMjhvFl -TZovxdGlvKbbCQIKrbD5VYRyv6P/3FGhFvGNwrdocsWebOWhlJosx8ItZ+gxskK/ -wLvqSeAI6wbv8ip7O1R8pwJHl4W4NCi6JlbNe7HGXmwy+beQH8e4bxYwwRGcN7HY -A9Bjf6rrpNlZuk+3ky7dA/xswsxhxQ60iuvb0pesQAu6EWdUm3Wzx9VhfeWLqamb -V3SIklyVK5//kDCWE+O2kH5LCB4Zke+4F+rPkgBb508EyW3C2GWAlO7KtYBRUFkw -WPb9o39rb7zP5Opn8pYxikf2HWnOY9H3Yb7OL+zPtBvFbVw5TaxRkaTaq/iNENPr -OydvBluI++udG6MurBFG20WnnDXmND4bNB983+duzXS1YDWWnTNXFy3ixJpAzMtr -U38+k3+qrGpYj//XSPXfDuPmqxkKGkGlhDgHacGBiDLV3Ipm8dESRDXh0Cj3tuQf -YTHQWwgAiHtoickG -=1A7T ------END PGP SIGNATURE----- diff --git a/libfm-qt-2.0.2.tar.xz b/libfm-qt-2.0.2.tar.xz new file mode 100644 index 0000000..5bc4361 --- /dev/null +++ b/libfm-qt-2.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:411ae1d7d549f34d10389953ded47fba030f128d716373c6af6d45a1bddc2755 +size 412452 diff --git a/libfm-qt-2.0.2.tar.xz.asc b/libfm-qt-2.0.2.tar.xz.asc new file mode 100644 index 0000000..5da65cd --- /dev/null +++ b/libfm-qt-2.0.2.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmY7qZYVHHRzdWphbjIw +MDBAZ21haWwuY29tAAoJEL55MAetIt9+EC8P/RX6Cs9b929K4mHGv7zTdOSnBNxI +Okx5ajGJdiIwP83y3ZF2U0jHCbhh0z8Afy/fDJx0b6iLURWRJzJSb77EaIONkl6j +cJFaarO0sqPrdC51loqndH5CQbxZOBTmDAygl/5SaoiepzlGdLVgbiIdBES9y9un +1raI9G/co6uurgWoyKpYCzbh/OWJF/cbr82e6Vhcc5lrmxMMjQNY4mwo1tTOaWOL +QZcSL5bqSnvyt7wg/4R9yWWq9O8u6KtSskiK9x+Y6jMfdv9Y1PAJ9lanAVUxXmD+ +Mm/JO1aVp6o5rAeTZedeRs4SxBLfHhRpI9N/RHIyw0tCVa0cHqKJrF9iCTK8GEk/ +/k4N3LlM5em24J/z0fZl1zhlsOsz2b+1Bp/2kFV/KDFscm2WVvYBquTI+iIQeLnd +yMjVVjoMmxj0MXyowc4lKThn8UDSJP7qf4dkj1+RQOtjjA2MBEhTx3Vh9w3+4K+1 +AyKkga4O/93v8h0zJ1tsjqALuJzTbdbCepnLhO1HVE2o5q7eHVG0mOTsHJ01k0e7 +iUmdARDiE3rMvzm2GsRwORO0HM4rv+pg0BdLmR8ntzRqKKd4EJGdSJv4WcthnqN9 +AIFiKK+2vlL/IJKtFfvmF1B+TmozVqYWiCzYYjbjbr7I0SDOs7nILbit7uS83Ftw +wQ44h2U2rPw61b47 +=kckF +-----END PGP SIGNATURE----- diff --git a/libfm-qt.changes b/libfm-qt.changes index c13ffd2..c0593ea 100644 --- a/libfm-qt.changes +++ b/libfm-qt.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat May 11 04:11:37 UTC 2024 - Андрей Алыпов + +- Update to 2.0.2: + * Fixed a regression in running executable files in terminal. + * Removed a redundant child-parent relation in path-bar to prevent + a rare crash with Qt ≥ 6.7. + * Ported to Qt6. + * Added lxqt-menu-data dependency to README.md. + * Updated mime types of lxqt-archiver and arqiver. + * Added 4 menu icons. + * Workaround for Qt bug in a context menu invoked by Menu key. + ------------------------------------------------------------------- Fri Nov 10 17:27:16 UTC 2023 - Shawn Dunn diff --git a/libfm-qt.keyring b/libfm-qt.keyring index 35388e4..74b74f1 100644 --- a/libfm-qt.keyring +++ b/libfm-qt.keyring @@ -49,4 +49,4 @@ bJSJ/O/vzlRtDjOJ1JDlMRLs7TnOFeUh5pgwyaJoidYbJEiGlMGJbI6BjwhDTBFO NLJtd3SsRjc7ICtGdCvej59IvCDTjxtkhx5okF03APi1aXpHQrE18/arFD7BpoGO sw== =gSIv ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libfm-qt.spec b/libfm-qt.spec index 23f4030..cb98b50 100644 --- a/libfm-qt.spec +++ b/libfm-qt.spec @@ -1,7 +1,7 @@ # # spec file for package libfm-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 @@ -16,117 +16,104 @@ # +%define _ver 14 +%define _name libfm-qt6 Name: libfm-qt -Version: 1.4.0 +Version: 2.0.2 Release: 0 -Summary: Library providing components to build desktop file managers +Summary: Core library of PCManFM-Qt (Qt binding for libfm) License: BSD-3-Clause AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ -URL: http://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 -Source2: libfm-qt.keyring -BuildRequires: cmake >= 3.1.0 -# Needs private headers, see xdndworkaround.cpp -BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libqt5-qttools-devel -BuildRequires: lxqt-build-tools-devel >= 0.13.0 +URL: https://github.com/lxqt/libfm-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.18.0 +BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: qt6-gui-private-devel +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Widgets) >= 6.6.0 BuildRequires: cmake(lxqt-menu-data) -BuildRequires: pkgconfig(Qt5Widgets) >= 5.15 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.15 -BuildRequires: pkgconfig(Qt5Xdg) +BuildRequires: cmake(lxqt2-build-tools) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.50.0 +BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libmenu-cache) >= 1.1.0 -BuildRequires: pkgconfig(lxqt) -BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) %description -libfm-qt is the Qt port of libfm, a library providing components to -build desktop file managers. +Libfm-Qt is a companion library providing components to build desktop file managers -%{lang_package -r libfm-qt14} +%lang_package -n %{_name} -%package -n libfm-qt14 -Summary: Library providing components to build desktop file managers -# Require data files read by the library. For parallel installed library versions, the newest one wins +%package -n %{_name}-%{_ver} +Summary: Libfm-qt libraries Group: System/Libraries -Requires: %{name}-data >= %{version} -Recommends: %{name}-lang -Conflicts: pcmanfm <= 0.10.0 -Provides: libfm-qt +Requires: %{_name}-data = %{version}-%{release} +Recommends: %{_name}-lang = %{version}-%{release} -%description -n libfm-qt14 -libfm-qt is the Qt port of libfm, a library providing components to -build desktop file managers. +%description -n %{_name}-%{_ver} +Libfm-Qt is a companion library providing components to build desktop file managers -%package data +%package -n %{_name}-data Summary: Data files for libfm library -# libfm-qt6 wrongly shipped those files as part of the library package -# resulting in file conflicts when the soname changed -# No way to fix the old package, so we conflict it Group: Development/Libraries/C and C++ -Conflicts: libfm-qt6 BuildArch: noarch -%description data +%description -n %{_name}-data Provides data to be read by libfm-qt -%package -n libfm-qt-devel +%package -n %{_name}-devel Summary: Development files for libfm-qt Group: Development/Libraries/C and C++ -Requires: libfm-qt14 >= %{version} -Requires: pkgconfig -# libfm-qt has an -I on a path from menu-cache-devel -Requires: pkgconfig(libmenu-cache) >= 0.4.0 +Requires: %{_name}-%{_ver} = %{version}-%{release} -%description -n libfm-qt-devel +%description -n %{_name}-devel Libfm-Qt libraries for development %prep -%setup -q +%autosetup %build -%cmake -DPULL_TRANSLATIONS=No -%make_build +%cmake_qt6 +%{qt6_build} %install -%cmake_install +%{qt6_install} %find_lang %{name} --with-qt -%post -n libfm-qt14 -p /sbin/ldconfig -%postun -n libfm-qt14 -p /sbin/ldconfig +%ldconfig_scriptlets -n %{_name}-%{_ver} -%files -n libfm-qt14 -%license LICENSE LICENSE.BSD-3-Clause -%doc README.md -%{_libdir}/libfm-qt.so.* +%files -n %{_name}-%{_ver} +%doc AUTHORS CHANGELOG README.md +%{_libdir}/%{_name}.so.* +%license LICENSE -%files data -%dir %{_datadir}/libfm-qt/ -%{_datadir}/libfm-qt/archivers.list -%{_datadir}/libfm-qt/terminals.list -%{_datadir}/mime/packages/libfm-qt-mimetypes.xml +%files -n %{_name}-data +%dir %{_datadir}/%{_name} +%{_datadir}/%{_name}/archivers.list +%{_datadir}/%{_name}/terminals.list +%{_datadir}/mime/packages/%{_name}-mimetypes.xml -%files -n libfm-qt-devel -%doc %{_datadir}/cmake/fm-qt -%{_includedir}/libfm-qt/ -%{_libdir}/libfm-qt.so -%{_libdir}/pkgconfig/libfm-qt.pc -%{_datadir}/cmake/fm-qt/fm-qt-config-version.cmake -%{_datadir}/cmake/fm-qt/fm-qt-config.cmake -%{_datadir}/cmake/fm-qt/fm-qt-targets-*.cmake -%{_datadir}/cmake/fm-qt/fm-qt-targets.cmake +%files -n %{_name}-devel +%dir %{_datadir}/cmake/fm-qt6 +%{_includedir}/%{_name}/ +%{_libdir}/%{_name}.so +%{_libdir}/pkgconfig/%{_name}.pc +%{_datadir}/cmake/fm-qt6/fm-qt6-config-version.cmake +%{_datadir}/cmake/fm-qt6/fm-qt6-config.cmake +%{_datadir}/cmake/fm-qt6/fm-qt6-targets-*.cmake +%{_datadir}/cmake/fm-qt6/fm-qt6-targets.cmake +%license LICENSE.BSD-3-Clause -%files lang -f %{name}.lang -%dir %{_datadir}/libfm-qt -%dir %{_datadir}/libfm-qt/translations -%{_datadir}/libfm-qt/translations/* +%files -n %{_name}-lang -f %{name}.lang +%dir %{_datadir}/%{_name}/translations/ +%if 0%{?sle_version} +%{_datadir}/%{_name}/translations/%{name}_???.qm +%endif %changelog From b31fba3ea1443d9671fe3edf51ab1aa79f3827d7d0617537a8239eebd58f7c3b Mon Sep 17 00:00:00 2001 From: Shawn Dunn Date: Mon, 3 Jun 2024 21:08:51 +0000 Subject: [PATCH 2/3] Accepting request 1178381 from home:DocB:branches:X11:LXQt - Requires fixed OBS-URL: https://build.opensuse.org/request/show/1178381 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/libfm-qt?expand=0&rev=56 --- libfm-qt.changes | 5 +++++ libfm-qt.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libfm-qt.changes b/libfm-qt.changes index c0593ea..a1befe5 100644 --- a/libfm-qt.changes +++ b/libfm-qt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 3 20:09:16 UTC 2024 - Axel Braun + +- Requires fixed + ------------------------------------------------------------------- Sat May 11 04:11:37 UTC 2024 - Андрей Алыпов diff --git a/libfm-qt.spec b/libfm-qt.spec index cb98b50..82ec6f2 100644 --- a/libfm-qt.spec +++ b/libfm-qt.spec @@ -52,8 +52,7 @@ Libfm-Qt is a companion library providing components to build desktop file manag %package -n %{_name}-%{_ver} Summary: Libfm-qt libraries Group: System/Libraries -Requires: %{_name}-data = %{version}-%{release} -Recommends: %{_name}-lang = %{version}-%{release} +Requires: %{_name}-data >= %{version} %description -n %{_name}-%{_ver} Libfm-Qt is a companion library providing components to build desktop file managers From 90949ef098f65da3414fc8b92857e4cb44724470c40d1fbe1fad402abd63276c Mon Sep 17 00:00:00 2001 From: Shawn Dunn Date: Tue, 4 Jun 2024 14:29:28 +0000 Subject: [PATCH 3/3] - Added: * Provides: libfm-qt6 >= %{version} for main library * Specfile Cleanup * %check section OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/libfm-qt?expand=0&rev=57 --- libfm-qt.changes | 8 ++++++++ libfm-qt.spec | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libfm-qt.changes b/libfm-qt.changes index a1befe5..769d5f1 100644 --- a/libfm-qt.changes +++ b/libfm-qt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 4 14:28:21 UTC 2024 - Shawn Dunn + +- Added: + * Provides: libfm-qt6 >= %{version} for main library + * Specfile Cleanup + * %check section + ------------------------------------------------------------------- Mon Jun 3 20:09:16 UTC 2024 - Axel Braun diff --git a/libfm-qt.spec b/libfm-qt.spec index 82ec6f2..f93d797 100644 --- a/libfm-qt.spec +++ b/libfm-qt.spec @@ -23,7 +23,6 @@ Version: 2.0.2 Release: 0 Summary: Core library of PCManFM-Qt (Qt binding for libfm) License: BSD-3-Clause AND LGPL-2.1-or-later -Group: Development/Libraries/C and C++ URL: https://github.com/lxqt/libfm-qt Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc @@ -51,15 +50,14 @@ Libfm-Qt is a companion library providing components to build desktop file manag %package -n %{_name}-%{_ver} Summary: Libfm-qt libraries -Group: System/Libraries Requires: %{_name}-data >= %{version} +Provides: %{_name} >= %{version} %description -n %{_name}-%{_ver} Libfm-Qt is a companion library providing components to build desktop file managers %package -n %{_name}-data Summary: Data files for libfm library -Group: Development/Libraries/C and C++ BuildArch: noarch %description -n %{_name}-data @@ -67,7 +65,6 @@ Provides data to be read by libfm-qt %package -n %{_name}-devel Summary: Development files for libfm-qt -Group: Development/Libraries/C and C++ Requires: %{_name}-%{_ver} = %{version}-%{release} %description -n %{_name}-devel @@ -87,6 +84,9 @@ Libfm-Qt libraries for development %ldconfig_scriptlets -n %{_name}-%{_ver} +%check +%ctest + %files -n %{_name}-%{_ver} %doc AUTHORS CHANGELOG README.md %{_libdir}/%{_name}.so.*