From patchwork Thu Apr 27 13:26:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 49569 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 286F327BBF4; Thu, 27 Apr 2023 14:28:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6BF4327BBF0 for ; Thu, 27 Apr 2023 14:28:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps1fO-0002el-Ik; Thu, 27 Apr 2023 09:28:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps1fN-0002c9-Ci for guix-patches@gnu.org; Thu, 27 Apr 2023 09:28:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ps1fN-0004NV-40 for guix-patches@gnu.org; Thu, 27 Apr 2023 09:28:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps1fM-0000jJ-VB for guix-patches@gnu.org; Thu, 27 Apr 2023 09:28:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63113] [PATCH 16/27] gnu: lxqt-session: Update to 1.3.0. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 13:28:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63113 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63113@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 63113-submit@debbugs.gnu.org id=B63113.16826020572531 (code B ref 63113); Thu, 27 Apr 2023 13:28:08 +0000 Received: (at 63113) by debbugs.gnu.org; 27 Apr 2023 13:27:37 +0000 Received: from localhost ([127.0.0.1]:57867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps1eq-0000eR-3F for submit@debbugs.gnu.org; Thu, 27 Apr 2023 09:27:37 -0400 Received: from mail.envs.net ([5.199.136.28]:47450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps1ej-0000de-J6 for 63113@debbugs.gnu.org; Thu, 27 Apr 2023 09:27:30 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 14FBC38A07EB; Thu, 27 Apr 2023 13:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1682602049; bh=XsFs3KcGUfLwCG+xr0oO7nfFLqIFVoh1dGfxdo9n41M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O3FciLNOO1yViwMmrbBTIwxU23BzMDasJ30PLY4b9ohnzHkAHQi0tVhKpGv5JGPqN dTLTlXvIMbLqAEelHodhcQVC2cgYaV4h/fldpqGS9Z4QiuGZhcUAFlaxhsbvqXig2K ghkbzdNxw1reOABL5SGpHEfigUayNHyY3v+Iwbf8dk7XFOYwMkeZ3nn0i9BlgwaSNW MsJdPoqV/ejGSiDwbavRnUQyepmWwecTCTUWTxwx814VP9Bi0lpXY0JIxqRCrx86Tl miwrfTKX34PziKctcpe1WPTc8DDUuaFBiWvywPGrdMKtj7q5q3rXYpClShhiidAilW 6p4/a4wVc2sxa9X2A+lL5V9ZTCUlvrZjH5TB+BXPGXKnIVrCwfHjMNLxCVhO112RnK S/e4HBkZiXBwUk6GxfItpTSH1RIa2mdDwKPgaha4umKvjwTATiwCsidvDUqojWb8qG O9X2SyoVDgwlm35DC2eJQCpOLOYawQOsPAvi86aWANiPNu0lUw3m5BrbjdegddylY7 5OZR9JOJZIJ8elblZexAjLtYEl+0Ic2lB1vmmQwFyiq3GYo5ez1XZ8Lgy/1ojcK7S2 cjJpDXnBQnKLIKodhpZMqswlUa8d8DbRjZcqUrmomK8q24SQJDXIiki3FnTGxddGhu Ur5L5jajumYh2qi+1dhy8fUs= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 4eziuO6pNJoG; Thu, 27 Apr 2023 13:27:25 +0000 (UTC) Received: from localhost (unknown [36.170.44.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Thu, 27 Apr 2023 13:27:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 453d95e6; Thu, 27 Apr 2023 13:26:50 +0000 (UTC) Date: Thu, 27 Apr 2023 21:26:28 +0800 Message-Id: <20230427132639.22164-17-iyzsong@envs.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230427132639.22164-1-iyzsong@envs.net> References: <20230427132639.22164-1-iyzsong@envs.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * gnu/packages/lxqt.scm (lxqt-session): Update to 1.3.0. [patches]: Remove. * gnu/packages/patches/lxqt-session-procps-4.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/lxqt.scm | 5 +- .../patches/lxqt-session-procps-4.patch | 82 ------------------- 3 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 gnu/packages/patches/lxqt-session-procps-4.patch diff --git a/gnu/local.mk b/gnu/local.mk index c0a5c721fc..c153c38651 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1531,7 +1531,6 @@ dist_patch_DATA = \ %D%/packages/patches/lua-5.4-liblua-so.patch \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/lvm2-static-link.patch \ - %D%/packages/patches/lxqt-session-procps-4.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mars-install.patch \ diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index b02aa45510..c771b205b8 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -668,15 +668,14 @@ (define-public lxqt-runner (define-public lxqt-session (package (name "lxqt-session") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0rjw3rw6kpaa3csrga005qg5bxmdxfgrnn1qngs2nrny35v97ckl")) - (patches (search-patches "lxqt-session-procps-4.patch")))) + (base32 "0xa5nqiq9mxwfynnw91i4c2cgpmpapl4nxys084nbs7yd88kbm2l")))) (build-system cmake-build-system) (inputs (list eudev diff --git a/gnu/packages/patches/lxqt-session-procps-4.patch b/gnu/packages/patches/lxqt-session-procps-4.patch deleted file mode 100644 index d10e310723..0000000000 --- a/gnu/packages/patches/lxqt-session-procps-4.patch +++ /dev/null @@ -1,82 +0,0 @@ -From d1db1c791195f3c0cf148e2be8bd46c5a51ca535 Mon Sep 17 00:00:00 2001 -From: Palo Kisa -Date: Tue, 7 Mar 2023 14:21:40 +0100 -Subject: [PATCH 978/978] reaper: Build/Run on systems with procps-ng >= 4.0.0 - (#456) - -On Linux, make it possible to use libproc2 or libprocps whichever is -available. ---- - CMakeLists.txt | 6 +++++- - lxqt-session/src/procreaper.cpp | 24 +++++++++++++++++++++++- - 2 files changed, 28 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3c5e0d..f208600 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,7 +35,11 @@ find_package(X11 REQUIRED) - message(STATUS "Building with Qt${Qt5Core_VERSION}") - find_package(PkgConfig REQUIRED) - if (CMAKE_SYSTEM_NAME STREQUAL "Linux") -- pkg_search_module(PROCPS REQUIRED libprocps) -+ pkg_search_module(PROCPS REQUIRED libproc2 libprocps) -+ message(STATUS "Using PROCPS -> ${PROCPS_MODULE_NAME} v${PROCPS_VERSION}") -+ if (PROCPS_VERSION VERSION_GREATER_EQUAL 4.0.0) -+ add_definitions("-DUSING_LIBPROC2") -+ endif() - endif() - - # Please don't move, must be after lxqt -diff --git a/lxqt-session/src/procreaper.cpp b/lxqt-session/src/procreaper.cpp -index 2acd030..1ea4bdc 100644 ---- a/lxqt-session/src/procreaper.cpp -+++ b/lxqt-session/src/procreaper.cpp -@@ -29,7 +29,11 @@ - #include "log.h" - #if defined(Q_OS_LINUX) - #include --#include -+# if defined(USING_LIBPROC2) -+# include -+# else -+# include -+# endif - #elif defined(Q_OS_FREEBSD) - #include - #include -@@ -109,6 +113,23 @@ void ProcReaper::stop(const std::set & excludedPids) - const pid_t my_pid = ::getpid(); - std::vector children; - #if defined(Q_OS_LINUX) -+# if defined(USING_LIBPROC2) -+ constexpr pids_item items[] = { PIDS_ID_PPID, PIDS_ID_TGID }; -+ enum rel_items { rel_ppid, rel_tgid }; -+ pids_info * info = nullptr; -+ procps_pids_new(&info, const_cast(items), sizeof(items) / sizeof(pids_item)); -+ pids_stack * stack = nullptr; -+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) -+ { -+ const int ppid = PIDS_VAL(rel_ppid, s_int, stack, info); -+ if (ppid == my_pid) -+ { -+ const int tgid = PIDS_VAL(rel_tgid, s_int, stack, info); -+ children.push_back(tgid); -+ } -+ } -+ procps_pids_unref(&info); -+# else - PROCTAB * proc_dir = ::openproc(PROC_FILLSTAT); - while (proc_t * proc = ::readproc(proc_dir, nullptr)) - { -@@ -119,6 +140,7 @@ void ProcReaper::stop(const std::set & excludedPids) - ::freeproc(proc); - } - ::closeproc(proc_dir); -+# endif - #elif defined(Q_OS_FREEBSD) - int cnt = 0; - if (kinfo_proc *proc_info = kinfo_getallproc(&cnt)) --- -2.39.2 -