Accepting request 1174626 from X11:LXQt

OBS-URL: https://build.opensuse.org/request/show/1174626 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-session?expand=0&rev=32
2024-06-05 15:38:27 +00:00 · 2024-06-05 15:38:27 +00:00 · 45694aec67
commit 45694aec67
parent 9df53ad78e 95077101e8
6 changed files with 64 additions and 53 deletions
--- a/lxqt-session-1.4.0.tar.xz
+++ b/lxqt-session-1.4.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9dcdc846601f1972d01429f2203d36976088edcca5c166eef2b21ad73fcef656
-size 188324
--- a/lxqt-session-1.4.0.tar.xz.asc
+++ b/lxqt-session-1.4.0.tar.xz.asc
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmVHhGgVHHRzdWphbjIw
-MDBAZ21haWwuY29tAAoJEL55MAetIt9+HgQP/R10D0bwDQMMlQRE+RVAh2MoBr7u
-G3R80u/PDkdu920Q0F6jSczYuj/43P9k4LcKd7tavAj4oyfXesy+Q+ib8MIJF+QU
-xddnif3yV6MNeeadImJaoKbzCUO/HaUgmniW0rK8/8NLIR16kVQBvph555qIUR6k
-J+cVEYi9LISmTQokqGEl/3bnDLMoM2bw+JlEm/ayuS7uRm7wOpKf90dh9Get6afp
-BTka9LmKe3ENUidqplviirz6nlij1uyYnPq3Eqbrtx1sHv89Vuw10JKo+TIKp5uy
-jxRRX5XcJ687uYq3Gok7P2icSyohKPadrrV3BEtlL81Sf13Tz96LmQvFefKtipqA
-vvasqm8cjcTM6CMK9jo2/RNUPA1WrFfEHXrjR68Qe6c8n9Fpl2qIu8N5Sy+nl9jV
-eGZC3d3Zh2bOaCumER5RLuFQKjw7ZdfavBk/ZGpcpT3eaysiHsnB5PGTb8EGWC3n
-EPH9nWxmplcWHSJ+PEfOhbuZ6UbGP1q2iWllHJ0y6Q2KMejbzwhjtxKyNZl4bgeb
-CyklV/lHLjyaPZoRf3hhMjr0l21msBvSOs6ZI4N9n1E1W29VbiXMM7FyRsPx4LNn
-2cZgwnUHj5TF3CBEKcxXG24QLUK2NptvpNgRo6T/OXDWH/6gy4xAFRTtIXqsj2IY
-XU+ZPgjDNr4DH2Dd
-=36c4
-----END PGP SIGNATURE-----
--- a/lxqt-session-2.0.0.tar.xz
+++ b/lxqt-session-2.0.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74ea3b998fecb50834b8b09952c31a1bf128fde9f7cfdd31284f7397665cb428
+size 194480
--- a/lxqt-session-2.0.0.tar.xz.asc
+++ b/lxqt-session-2.0.0.tar.xz.asc
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmYfsSkVHHRzdWphbjIw
+MDBAZ21haWwuY29tAAoJEL55MAetIt9+laMQAN3sOHCB9p3knxEX+C9H4qWN7rJy
+AGkm3CoGAe38d+FK7zU9Iu0Sl1GwWtj2qnZp8wCGX0k8j9pb/Bu4LTc9vXmMMR2V
+eL9L0tC4jPBm0q+wSxpfi5RbdHdtBlzQ89fBLEchE6vs0TmuWj2rFPxAiktct75b
+kxIUsshzTHq2BWYBYNv7iAD3wEd/n7gtVD4UqGdpuu51zv+gHLqtp79tD6vHjis
+Tcl/AF+j73J0eg0jcPXSNRWr5wCemEmKCbfM+HGGcnaRMuMxLsTMKz+tBRedcIu+
+i21yGDrtA/TjWVPRtX/Y6rq6SeSe+0v27Q0JsZNHc8Z43zV848M9oJnl61s2ZAOU
+tNM+jHXhuKyGssDBlZ12Gf3NRe6B+NnGdYrcn+ctmEj2HOP0Snv7vQGZSCK0Au9P
+d0DLmPttSckcCYAo+EBsS7RgwmimgJbILqmDT00GCYN4VGY75/kpFk0X+SrlpRTs
+pHwUyIWoRk0JbabjJKJWRQ+ZEI7mZHKJRM8doIBDdGVko/atPNpbUZfdezuYgRF4
+jP+CkeXDB8feTAx/fYOrSDHLqp8JPa73xV69P/e3vfi0QH91X/e+nSyWYm0qleab
+YhFVllR5SqwF0oHuXqDzkRQ3iaTVG0V+c19NgQLilHFPBBzGP1rGSqxMSK+8OJMT
+L6j0yWho9kwYzlkG
+=+rYp
+-----END PGP SIGNATURE-----
--- a/lxqt-session.changes
+++ b/lxqt-session.changes
@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat May 11 16:01:52 UTC 2024 - Андрей Алыпов <and.november@opensuse.org>
+
+- Update to 2.0.0:
+  * Ported to Qt6.
+  * Used an overlay layer shell for the leaving dialog and centered
+    it under Wayland.
+  * Made the user inputs stricter in auto-start.
+  * Don't allow inputs consisting of only whitespaces, and remove
+    start and end whitespaces from them.
+
 -------------------------------------------------------------------
 Wed Feb 21 07:19:35 UTC 2024 - Michael Vetter <mvetter@suse.com>

--- a/lxqt-session.spec
+++ b/lxqt-session.spec
@ -17,41 +17,40 @@


 Name:           lxqt-session
-Version:        1.4.0
+Version:        2.0.0
 Release:        0
 Summary:        LXQt Session Manager
 License:        LGPL-2.1-or-later
 Group:          System/GUI/Other
-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/lxqt-session
+Source0:        %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
+Source1:        %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
 # FIX-OPENSUSE mvetter@suse.com bsc#1099800
 Patch0:         lxqt-0.13.0-xdg-config-dir.patch
 # mvetter@suse.com bsc#1127043 - Use Openbox as default WM
-Patch1:         lxqt-session-default_wm.patch
-BuildRequires:  cmake >= 3.0.2
+Patch1:         %{name}-default_wm.patch
+BuildRequires:  cmake >= 3.18.0
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  lxqt-build-tools-devel >= 0.13.0
 BuildRequires:  pkgconfig
-BuildRequires:  qtxdg-tools
+BuildRequires:  qtxdg-tools >= 4.0.0
 BuildRequires:  xdg-user-dirs
-BuildRequires:  cmake(KF5WindowSystem) >= 5.36.0
-BuildRequires:  pkgconfig(Qt5UiTools) >= 5.15
-BuildRequires:  pkgconfig(Qt5Xdg)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(libprocps)
+BuildRequires:  cmake(KF6WindowSystem)
+BuildRequires:  cmake(LayerShellQt) >= 6.0.0
+BuildRequires:  cmake(Qt6DBus)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Widgets)
+BuildRequires:  cmake(lxqt2-build-tools)
+BuildRequires:  cmake(qtxdg-tools)
+BuildRequires:  pkgconfig(libproc2) >= 4.0.0
 BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(lxqt) >= %{version}
+BuildRequires:  pkgconfig(lxqt) >= 2.0.0
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(x11-xcb)
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 Requires:       qtxdg-tools
-Recommends:     %{name}-lang
-Obsoletes:      lxqt-common <= 0.12.0
-Obsoletes:      lxqt-l10n <= 0.12.0
+Recommends:     %{name}-lang = %{version}-%{release}

 %description
 lxqt-session is the standard session manager used by LXQt. The lxqt-session manager
@ -63,22 +62,23 @@ use when a user logs out and to restart them the next time the user logs in.

 %prep
 %autosetup -p1
-# Changing LXQt into X-LXQt in desktop files to be freedesktop compliant and shut rpmlint warnings
-#find -name '*desktop.in*' -exec sed -ri 's/(LXQt;)/X-\1/' {} +
+sed -i 's/^\(Type=\).*/\1XSession/' xsession/lxqt.desktop.in
+sed -i '/^Categories/s/\(LXQt\;\)/X-\1/' lxqt-config-session/lxqt-config-session.desktop.in

 %build
-%cmake -DPULL_TRANSLATIONS=No
+%cmake_qt6
+%{qt6_build}

 %install
-%cmake_install
-%fdupes %{buildroot}/%{_datadir}
+%{qt6_install}
+%fdupes -s %{buildroot}%{_datadir}

 # for default-xsession
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
 ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop

-%find_lang %{name} --with-qt
+%find_lang %{name} --with-qt --all-name

 %post
 %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
@ -90,12 +90,12 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi

 %files
 %license LICENSE
-%doc AUTHORS
+%doc AUTHORS CHANGELOG README.md
 %{_bindir}/lxqt-config-session
-%{_bindir}/lxqt-session
+%{_bindir}/%{name}
 %{_bindir}/lxqt-leave
-%{_datadir}/applications/*.desktop
-%{_mandir}/man?/lxqt-*%{ext_man}
+%{_datadir}/applications/lxqt-*.desktop
+%{_mandir}/man?/lxqt-*%{?ext_man}
 %config %{_sysconfdir}/xdg/autostart/lxqt-xscreensaver-autostart.desktop
 %{_bindir}/startlxqt
 %{_mandir}/man1/startlxqt.1%{?ext_man}
@ -107,13 +107,13 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi
 # for default-xsession
 %ghost %{_sysconfdir}/alternatives/default-xsession.desktop
 %ghost %{_sysconfdir}/alternatives/default.desktop
-%{_datadir}/xsessions/*.desktop
+%{_datadir}/xsessions/default.desktop

 %files lang -f %{name}.lang
 %dir %{_datadir}/lxqt
 %dir %{_datadir}/lxqt/translations
-%{_datadir}/lxqt/translations/lxqt-config-session
-%{_datadir}/lxqt/translations/lxqt-leave
-%{_datadir}/lxqt/translations/lxqt-session
+%dir %{_datadir}/lxqt/translations/lxqt-config-session
+%dir %{_datadir}/lxqt/translations/lxqt-leave
+%dir %{_datadir}/lxqt/translations/%{name}

 %changelog