From e97ac5ae24b22ea353eab08f476bef6713a4c8d3 Mon Sep 17 00:00:00 2001
From: Síle Ekaterin Liszka <sheila@vulpine.house>
Date: Mon, 12 Dec 2022 08:43:57 +0000
Subject: user/lxqt-session: upgrade to 1.2.0

---
 user/lxqt-session/APKBUILD         | 12 +++++-------
 user/lxqt-session/fix-chrono.patch | 19 -------------------
 2 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 user/lxqt-session/fix-chrono.patch

(limited to 'user/lxqt-session')

diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD
index 0b2f841ab..1d212ab7a 100644
--- a/user/lxqt-session/APKBUILD
+++ b/user/lxqt-session/APKBUILD
@@ -1,20 +1,19 @@
 # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
 # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
 pkgname=lxqt-session
-pkgver=0.17.0
-_lxqt=0.9.0
+pkgver=1.2.0
+_lxqt=0.12.0
 pkgrel=0
 pkgdesc="Session management utilities for LXQt"
 url="https://lxqt.github.io/"
 arch="all"
 options="!check"  # No test suite.
 license="LGPL-2.1+"
-depends="xdg-user-dirs"
+depends="qtxdg-tools xdg-user-dirs"
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt eudev-dev
 	liblxqt-dev>=${pkgver%.*}.0 procps-dev qt5-qttools-dev kwindowsystem-dev"
 subpackages="$pkgname-doc"
-source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz
-	fix-chrono.patch"
+source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,5 +40,4 @@ package() {
 	rm "$pkgdir"/usr/share/man/man1/start*
 }
 
-sha512sums="e3573ee76e5fcf285b0ddd177ae7324f6fee038ea110c950d7054da622bf6615d9ac8715cc0cde6db9034d710933a80c80f14470197d2cc275d48695f74ba7b6  lxqt-session-0.17.0.tar.xz
-b74d5c27de6920ed9a714213903d2a16cc3d36ed6528f387491b82290aa5ec5d3c6a4886d1c4943fd8d1c2bf99394aaea38d39b4763aad803276f4b853af94a4  fix-chrono.patch"
+sha512sums="9edbf8ef084ebf5b3fc2e9b30c20d537d1dcefc518428e4367fd4a3ecb9e6a67fb4f8a56def838fb6ff167c481398491de4309f2ad16465bba1bbca1f1b7cf4d  lxqt-session-1.2.0.tar.xz"
diff --git a/user/lxqt-session/fix-chrono.patch b/user/lxqt-session/fix-chrono.patch
deleted file mode 100644
index ea1e66048..000000000
--- a/user/lxqt-session/fix-chrono.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nurd lxqt-session-0.17.0/lxqt-session/src/procreaper.cpp lxqt-session-0.17.0.new/lxqt-session/src/procreaper.cpp
---- lxqt-session-0.17.0/lxqt-session/src/procreaper.cpp	2021-04-13 17:37:02.000000000 +0000
-+++ lxqt-session-0.17.0.new/lxqt-session/src/procreaper.cpp	2021-07-21 09:20:28.959046533 +0000
-@@ -58,7 +58,7 @@
-         if (pid <= 0)
-         {
-             QMutexLocker guard{&mMutex};
--            mWait.wait(&mMutex, std::chrono::seconds(1));
-+            mWait.wait(&mMutex, std::chrono::seconds(1).count());
-         }
- 
-         int status;
-@@ -111,5 +111,5 @@
-         QMutexLocker guard{&mMutex};
-         mShouldRun = false;
-     }
--    QThread::wait(std::chrono::seconds(5));
-+    QThread::wait(std::chrono::seconds(5).count());
- }
-- 
cgit v1.2.3-60-g2f50