Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 82CFC1A9239 for ; Fri, 19 Nov 2021 14:17:47 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id B953584D6B; Fri, 19 Nov 2021 14:17:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F0A0384D67 for ; Fri, 19 Nov 2021 14:17:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id J7uMAiQ-tT09 for ; Fri, 19 Nov 2021 14:17:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0A10584CE2 for ; Fri, 19 Nov 2021 14:17:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 039B6FAEC; Fri, 19 Nov 2021 14:17:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1637331464270100" MIME-Version: 1.0 Date: Fri, 19 Nov 2021 14:17:44 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/x11/lxqt-session To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20211119141745.039B6FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1637331464270100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Fri Nov 19 14:17:44 UTC 2021 Modified Files: pkgsrc/x11/lxqt-session: Makefile PLIST distinfo Added Files: pkgsrc/x11/lxqt-session/patches: patch-lxqt-session_CMakeLists.txt patch-lxqt-session_src_procreaper.cpp Log Message: x11/lxqt-session: update to 1.0.0 -Bumped minimum required Qt version to 5.15 and updated translations. -Added procreaper support for FreeBSD. pkgsrc-specific changes: disable libudev only on non-Linux systems, add partial procreaper support for NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/lxqt-session/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/lxqt-session/PLIST cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/lxqt-session/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/lxqt-session/patches/patch-lxqt-session_CMakeLists.txt \ pkgsrc/x11/lxqt-session/patches/patch-lxqt-session_src_procreaper.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1637331464270100 Content-Disposition: inline Content-Length: 7952 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/lxqt-session/Makefile diff -u pkgsrc/x11/lxqt-session/Makefile:1.13 pkgsrc/x11/lxqt-session/Makefile:1.14 --- pkgsrc/x11/lxqt-session/Makefile:1.13 Mon May 24 19:56:02 2021 +++ pkgsrc/x11/lxqt-session/Makefile Fri Nov 19 14:17:44 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2021/05/24 19:56:02 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2021/11/19 14:17:44 gutteridge Exp $ -DISTNAME= lxqt-session-0.17.1 -PKGREVISION= 2 +DISTNAME= lxqt-session-1.0.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/} GITHUB_RELEASE= ${PKGVERSION_NOREV} @@ -19,7 +18,10 @@ USE_LANGUAGES= c c++ CONFIGURE_DIRS= build CMAKE_ARG_PATH= .. +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} != "Linux" CMAKE_ARGS+= -DWITH_LIBUDEV=OFF +.endif AUTOSTART_CONF= share/examples/autostart PKG_SYSCONFSUBDIR= xdg @@ -39,7 +41,7 @@ SUBST_SED.prefix= -e 's,/usr/bin,${PREFI pre-configure: ${MKDIR} -p ${WRKSRC}/build -TOOL_DEPENDS+= lxqt-build-tools>=0.9:../../devel/lxqt-build-tools +TOOL_DEPENDS+= lxqt-build-tools>=0.10.0:../../devel/lxqt-build-tools TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools DEPENDS+= xdg-user-dirs-[0-9]*:../../x11/xdg-user-dirs Index: pkgsrc/x11/lxqt-session/PLIST diff -u pkgsrc/x11/lxqt-session/PLIST:1.5 pkgsrc/x11/lxqt-session/PLIST:1.6 --- pkgsrc/x11/lxqt-session/PLIST:1.5 Tue Apr 20 18:56:04 2021 +++ pkgsrc/x11/lxqt-session/PLIST Fri Nov 19 14:17:44 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2021/04/20 18:56:04 pin Exp $ +@comment $NetBSD: PLIST,v 1.6 2021/11/19 14:17:44 gutteridge Exp $ bin/lxqt-config-session bin/lxqt-leave bin/lxqt-session @@ -33,6 +33,7 @@ share/lxqt/translations/lxqt-config-sess share/lxqt/translations/lxqt-config-session/lxqt-config-session_es.qm share/lxqt/translations/lxqt-config-session/lxqt-config-session_es_UY.qm share/lxqt/translations/lxqt-config-session/lxqt-config-session_es_VE.qm +share/lxqt/translations/lxqt-config-session/lxqt-config-session_et.qm share/lxqt/translations/lxqt-config-session/lxqt-config-session_eu.qm share/lxqt/translations/lxqt-config-session/lxqt-config-session_fi.qm share/lxqt/translations/lxqt-config-session/lxqt-config-session_fr.qm @@ -75,6 +76,7 @@ share/lxqt/translations/lxqt-leave/lxqt- share/lxqt/translations/lxqt-leave/lxqt-leave_de.qm share/lxqt/translations/lxqt-leave/lxqt-leave_el.qm share/lxqt/translations/lxqt-leave/lxqt-leave_es.qm +share/lxqt/translations/lxqt-leave/lxqt-leave_et.qm share/lxqt/translations/lxqt-leave/lxqt-leave_fi.qm share/lxqt/translations/lxqt-leave/lxqt-leave_fr.qm share/lxqt/translations/lxqt-leave/lxqt-leave_gl.qm @@ -93,9 +95,11 @@ share/lxqt/translations/lxqt-leave/lxqt- share/lxqt/translations/lxqt-leave/lxqt-leave_pt_BR.qm share/lxqt/translations/lxqt-leave/lxqt-leave_ru.qm share/lxqt/translations/lxqt-leave/lxqt-leave_si.qm +share/lxqt/translations/lxqt-leave/lxqt-leave_sk.qm share/lxqt/translations/lxqt-leave/lxqt-leave_sl.qm share/lxqt/translations/lxqt-leave/lxqt-leave_tr.qm share/lxqt/translations/lxqt-leave/lxqt-leave_uk.qm +share/lxqt/translations/lxqt-leave/lxqt-leave_vi.qm share/lxqt/translations/lxqt-leave/lxqt-leave_zh_CN.qm share/lxqt/translations/lxqt-leave/lxqt-leave_zh_TW.qm share/lxqt/translations/lxqt-session/lxqt-session_ar.qm @@ -112,6 +116,7 @@ share/lxqt/translations/lxqt-session/lxq share/lxqt/translations/lxqt-session/lxqt-session_es.qm share/lxqt/translations/lxqt-session/lxqt-session_es_UY.qm share/lxqt/translations/lxqt-session/lxqt-session_es_VE.qm +share/lxqt/translations/lxqt-session/lxqt-session_et.qm share/lxqt/translations/lxqt-session/lxqt-session_eu.qm share/lxqt/translations/lxqt-session/lxqt-session_fi.qm share/lxqt/translations/lxqt-session/lxqt-session_fr.qm Index: pkgsrc/x11/lxqt-session/distinfo diff -u pkgsrc/x11/lxqt-session/distinfo:1.8 pkgsrc/x11/lxqt-session/distinfo:1.9 --- pkgsrc/x11/lxqt-session/distinfo:1.8 Tue Oct 26 11:34:12 2021 +++ pkgsrc/x11/lxqt-session/distinfo Fri Nov 19 14:17:44 2021 @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.8 2021/10/26 11:34:12 nia Exp $ +$NetBSD: distinfo,v 1.9 2021/11/19 14:17:44 gutteridge Exp $ -BLAKE2s (lxqt-session-0.17.1.tar.xz) = 3d4bdc9076a14cbdd88cffd90d07101357f481507b96af1ef65684da82dfa473 -SHA512 (lxqt-session-0.17.1.tar.xz) = a86b2a2f8fafc0e1b706f6a2a44958039c7f324d43357d70c3b13dd4c3197a05e671cb3d4543512ac79cb238ed1386b5de2f76a1aec90b3db870a1c2276153e0 -Size (lxqt-session-0.17.1.tar.xz) = 178976 bytes +BLAKE2s (lxqt-session-1.0.0.tar.xz) = 4b215c76d328c4fc27ed7d290d7479a2f7a9f17150f9055b32dff4322c2c1f9f +SHA512 (lxqt-session-1.0.0.tar.xz) = 4f18852a55088fef7f1cd1617501acbd9f3a97a3810527b545625c116c249a3bcc084dc1bb073602e5dd10aa3a771c2ad0aaac10d1fe504832bd53d210136b98 +Size (lxqt-session-1.0.0.tar.xz) = 182600 bytes SHA1 (patch-autostart_CMakeLists.txt) = a791cc51e03e794e1bf81bf0d6f8462ba11e2e84 +SHA1 (patch-lxqt-session_CMakeLists.txt) = e11c457b746f4d6006ef66b50427c5ec73aa1c99 +SHA1 (patch-lxqt-session_src_procreaper.cpp) = 871c314cac5a01239d79ef771e7ea13f3e248b4a Added files: Index: pkgsrc/x11/lxqt-session/patches/patch-lxqt-session_CMakeLists.txt diff -u /dev/null pkgsrc/x11/lxqt-session/patches/patch-lxqt-session_CMakeLists.txt:1.1 --- /dev/null Fri Nov 19 14:17:44 2021 +++ pkgsrc/x11/lxqt-session/patches/patch-lxqt-session_CMakeLists.txt Fri Nov 19 14:17:44 2021 @@ -0,0 +1,18 @@ +$NetBSD: patch-lxqt-session_CMakeLists.txt,v 1.1 2021/11/19 14:17:44 gutteridge Exp $ + +Add NetBSD support. +https://github.com/lxqt/lxqt-session/pull/403 + +--- lxqt-session/CMakeLists.txt.orig 2021-11-05 10:14:38.000000000 +0000 ++++ lxqt-session/CMakeLists.txt +@@ -75,6 +75,10 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Free + target_link_libraries(lxqt-session + -lutil + ) ++elseif (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") ++ target_link_libraries(lxqt-session ++ -lkvm ++ ) + endif() + + if (WITH_LIBUDEV) Index: pkgsrc/x11/lxqt-session/patches/patch-lxqt-session_src_procreaper.cpp diff -u /dev/null pkgsrc/x11/lxqt-session/patches/patch-lxqt-session_src_procreaper.cpp:1.1 --- /dev/null Fri Nov 19 14:17:44 2021 +++ pkgsrc/x11/lxqt-session/patches/patch-lxqt-session_src_procreaper.cpp Fri Nov 19 14:17:44 2021 @@ -0,0 +1,57 @@ +$NetBSD: patch-lxqt-session_src_procreaper.cpp,v 1.1 2021/11/19 14:17:44 gutteridge Exp $ + +Add NetBSD support, and make this at least possibly compile elsewhere, +as POSIX kill() is expected universally. +https://github.com/lxqt/lxqt-session/pull/403 + +--- lxqt-session/src/procreaper.cpp.orig 2021-11-05 10:14:38.000000000 +0000 ++++ lxqt-session/src/procreaper.cpp +@@ -34,11 +34,15 @@ + #include + #include + #include +-#include ++#elif defined(Q_OS_NETBSD) ++#include ++#include ++#include + #endif + #include + #include + #include ++#include + #include + + ProcReaper::ProcReaper() +@@ -128,6 +132,31 @@ void ProcReaper::stop(const std::set