From 1a32cd5b471562cc900652cbac9bb6b2727a079610364ac97beca4ed3eaa3d01 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 16 May 2024 14:37:20 +0000 Subject: [PATCH] Accepting request 1168681 from home:sfalken:branches:X11:LXQt - Update to 2.0.0: * Ported to Qt6 - Specfile cleanup and macro updates OBS-URL: https://build.opensuse.org/request/show/1168681 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/liblxqt?expand=0&rev=52 --- liblxqt-1.4.0.tar.xz | 3 --- liblxqt-1.4.0.tar.xz.asc | 17 -------------- liblxqt-2.0.0.tar.xz | 3 +++ liblxqt-2.0.0.tar.xz.asc | 17 ++++++++++++++ liblxqt.changes | 7 ++++++ liblxqt.spec | 51 +++++++++++++++++++--------------------- 6 files changed, 51 insertions(+), 47 deletions(-) delete mode 100644 liblxqt-1.4.0.tar.xz delete mode 100644 liblxqt-1.4.0.tar.xz.asc create mode 100644 liblxqt-2.0.0.tar.xz create mode 100644 liblxqt-2.0.0.tar.xz.asc diff --git a/liblxqt-1.4.0.tar.xz b/liblxqt-1.4.0.tar.xz deleted file mode 100644 index f25e60c..0000000 --- a/liblxqt-1.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b55073e7673e19d30339cabf5692a86b3aee244f3009f67e424b7c919f4d96f0 -size 84388 diff --git a/liblxqt-1.4.0.tar.xz.asc b/liblxqt-1.4.0.tar.xz.asc deleted file mode 100644 index a107471..0000000 --- a/liblxqt-1.4.0.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmVHdSEVHHRzdWphbjIw -MDBAZ21haWwuY29tAAoJEL55MAetIt9+350QAIRtqmbJ7qdUDbpU8I88hqU1PC9S -A6BR6SfGGZYyjg3Ja+hgoe8HNLzCL7mP0txUALbNwMOVttNjMs2eP2foKnGRkviV -M00xnliNQSVOOMaYad59aXGlPQuHPw1rBoDyDTiAErhwxdM+OreCpj41+bEccZF9 -8WLc7d/n0aYB8ReidA4bkNdvesY6xDx2S9LW+xqTF8Q5oIqnYAHlwOwX8MQvBWwy -ENg54vz/6xYPfBPw7QoymmLWTv+w7Q4h5i093ipgiGO4a+2puz/brJMjgaMn35/X -Gx/f0YjVrHdqkpTqQMyzxJ+kyALnm9rrC4l1GBz3XKpq7xBHATLocj7FBHgvQYYl -p3c0910ejJT2+gkzUeCeOtGePwsupJP3bReI6v8b9Pd+MA2Xg//ELxhr96B9vkXH -r/nPQrvnXVyYXxPFTfZuGD8vNs2kP1cffqV5KsLEQcThRXh2ca9YFWvUDtbhQ5bj -xBbPe/qy7SUNWsO3ybYUJRudzFbqY94Fl7dSKjgGARPZb1Djlaaxq9QJrIActWgB -RQKEl6NVhYmpPopFX1/qFPALZ0J0mN4V4wAtR9DHyOH6sia4/Sg3DBH3uNgO7TB7 -elN7wKYHCCKEbdpwJrOVFmVtRdfPCBheQ0AmhwnoBt2Tmy4xb8APk4JwHH0fnLAV -aKrTZ7YCOAk2ej0v -=lfDk ------END PGP SIGNATURE----- diff --git a/liblxqt-2.0.0.tar.xz b/liblxqt-2.0.0.tar.xz new file mode 100644 index 0000000..473d776 --- /dev/null +++ b/liblxqt-2.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61092556146b769dc9bab328550f3f157e618a1a09ae1e052db61fc0db07b3e4 +size 85988 diff --git a/liblxqt-2.0.0.tar.xz.asc b/liblxqt-2.0.0.tar.xz.asc new file mode 100644 index 0000000..703151c --- /dev/null +++ b/liblxqt-2.0.0.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmYfpB0VHHRzdWphbjIw +MDBAZ21haWwuY29tAAoJEL55MAetIt9+V1AQALJNohVRKEm4Vxa3dKeC1X//WRl6 +Q81vYqn9kbFfdjSLoMC9rRfZJsvK12xGSfYfkfk+7W2w7lOtleHHoBuHjGYwDKW4 +DD0btDcEK8fvFIjy7APV8i5jho0VCEvc1h2VUQI0a6TwCy0hCoHoqikQQW2F+dZ6 +t4/7F3Jm2dBP0LQgIY+1U6lTPldZ1kGua3quRh2Qor1g9SDT/sapQYSo326GI2zI +U26WzfREwARLCxf95l1vYhBI1MTzkNBkK5HvCUODR4panZeGsmuqunYc+flVKRG8 +yGpfspLZ7hI9/JsdnzGHBiHuXBCAELx8KqW15jLLvUE6RSjrG5B518sLRKZUCm2Y +SgKOMxgDkXm1ABblmRLheSX4PcIwEJVJdFyqPFRP5SkRSazyix3ittNTK8l6Cq/Z +qQ8tri/+Ydle6INH6txgPVskCcZWz/6FVjOgxuWXUJsF4P+06KTIviDjjofCvPi8 +I9+ek17v7zSdDqKxOqKN4KF8bMy+YrrjR02rGvp639uv4PrNfKerBTXVzcKHrjWm +wntbvnVKNRDqB8jAnsNskO6H55gHnj9JOzEBTeFu4WdeMEuEuygS24TJd+JzdwtS +LwJfrdH27gckXwFSWTKsElrYA9iDLny0wm4YewjmxSE9++rJ1XqG2D0EZOpAnbGB +k+pISQmTxGI5rcpc +=dFd+ +-----END PGP SIGNATURE----- diff --git a/liblxqt.changes b/liblxqt.changes index 7fdbfd7..7ab12f7 100644 --- a/liblxqt.changes +++ b/liblxqt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 17 23:51:21 UTC 2024 - Shawn Dunn + +- Update to 2.0.0: + * Ported to Qt6 +- Specfile cleanup and macro updates + ------------------------------------------------------------------- Fri Jan 12 15:40:39 UTC 2024 - Shawn Dunn diff --git a/liblxqt.spec b/liblxqt.spec index 4b81ed0..f96ab36 100644 --- a/liblxqt.spec +++ b/liblxqt.spec @@ -17,32 +17,32 @@ Name: liblxqt -Version: 1.4.0 +Version: 2.0.0 Release: 0 Summary: Core utility library for LXQt License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ 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 Source2: %{name}.keyring -BuildRequires: cmake >= 3.1.0 +BuildRequires: cmake >= 3.5.0 BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: lxqt-build-tools-devel >= 0.13.0 BuildRequires: pkgconfig -BuildRequires: cmake(KF5WindowSystem) >= 5.36.0 -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xdg) >= 3.9.0 -BuildRequires: pkgconfig(polkit-qt5-1) +BuildRequires: cmake(KF6WindowSystem) >= 6.0.0 +BuildRequires: cmake(PolkitQt6-1) >= 0.200.0 +BuildRequires: cmake(Qt6DBus) >= 6.6 +BuildRequires: cmake(Qt6LinguistTools) >= 6.6 +BuildRequires: cmake(Qt6UiTools) >= 6.6 +BuildRequires: cmake(lxqt2-build-tools) >= 2.0.0 +BuildRequires: pkgconfig(Qt6Xdg) >= 4.0.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xscrnsaver) Obsoletes: liblxqt-qt5 < %{version} Provides: liblxqt-qt5 = %{version} # moved files to correct location in liblxqt1 (/lxqt-backlight_backend, power.conf, polkit) Conflicts: liblxqt0 +Conflicts: liblxqt1 Requires: /usr/bin/pkexec %description @@ -51,22 +51,20 @@ functionality needed by nearly all of its components. %lang_package -%package -n liblxqt1 +%package -n liblxqt2 Summary: LXQt core library -Group: System/Libraries Recommends: %{name}-lang Requires: %{name} >= %{version} -%description -n liblxqt1 +%description -n liblxqt2 liblxqt represents the core library of LXQt providing essential functionality needed by nearly all of its components. %package devel Summary: Devel files for liblxqt -Group: Development/Libraries/C and C++ -Requires: liblxqt1 = %{version} +Requires: liblxqt2 = %{version} Requires: pkgconfig -Requires: pkgconfig(Qt5Xdg) +Requires: pkgconfig(Qt6Xdg) >= 4.0.0 %description devel liblxqt represents the core library of LXQt providing essential @@ -76,19 +74,18 @@ This subpackage contains libraries and header files for developing applications that want to make use of liblxqt. %prep -%setup -q -n liblxqt-%{version} +%autosetup -p1 %build -%cmake -DPULL_TRANSLATIONS=No -%make_build +%cmake_qt6 +%{qt6_build} %install -%cmake_install +%{qt6_install} %find_lang %{name} --with-qt -%post -n liblxqt1 -p /sbin/ldconfig -%postun -n liblxqt1 -p /sbin/ldconfig +%ldconfig_scriptlets -n liblxqt2 %files %dir %{_datadir}/lxqt/ @@ -97,16 +94,16 @@ applications that want to make use of liblxqt. %dir %{_datadir}/polkit-1/ %{_datadir}/polkit-1/actions/ -%files -n liblxqt1 +%files -n liblxqt2 %license COPYING %doc AUTHORS -%{_libdir}/%{name}.so.? -%{_libdir}/%{name}.so.?.* +%{_qt6_libdir}/%{name}.so.? +%{_qt6_libdir}/%{name}.so.?.* %files devel %{_includedir}/lxqt/ -%{_libdir}/pkgconfig/lxqt.pc -%{_libdir}/%{name}.so +%{_qt6_libdir}/pkgconfig/lxqt.pc +%{_qt6_libdir}/%{name}.so %{_datadir}/cmake/lxqt/ %files lang -f %{name}.lang