From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id OKSDO1A0dGcKggAAqHPOHw:P1 (envelope-from ) for ; Tue, 31 Dec 2024 18:13:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id OKSDO1A0dGcKggAAqHPOHw (envelope-from ) for ; Tue, 31 Dec 2024 19:13:37 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=EbMSYOQa; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=dD25YA4n; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735668816; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Cy5t6vGrGCZBTEQKgmeEHQaA5ybmzx95dGK2PsJvXMA=; b=fCQ9nn/7z9ydK5DmoE8lHgCHNUrfXwZfiPlK54xIZy3Z0gGQrFrYqnuDeriXHRyRCR05m1 9hnw7NGQbvS/s3mh9xPcJI5rbn6k6e+mAjm78Ndt/vzCXW6ZjOq0bT6RxMef2zqBkKZYAx I3eGbLZDS/mAxJjVVFJCbqc3bZbgAbTK2GCzUEKtGDrvRaoyIImINq0YztcpRkn9MbVR09 F0DxKzVXdanFhSkxX2q29G0FysZhTv2yMb1S44eX1zIgKlNJifOaVL+a/FUK04ZcdIRgS5 4nuNQGWTj2uW7UJwpMSlSGZgdYFVVEqJAEh6YPNl30xL3+0Wr/cUo9zqZLgg1A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=EbMSYOQa; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=dD25YA4n; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735668816; a=rsa-sha256; cv=none; b=uPjJryVfaIgYa97arizhUnJAFd/97iMgH60K/ddzFZ0F8F4ZNAAoovOFqFQ+IfvsO4feuS gJCuYL/rFckYrhfsCv2EHT2XN/1owNPLZHb/C3tkG3HNhUjN1tTed48QVwAo1LNfiAHQ48 jk/8Qk8aksfdQQdsObB8Df0bBXJgEJXpxS0YHOBTpwwsMb7dT7JXvwA0kf0+aUJSs9iQ9e 1MFVS3oW/HQrusIA7IxLg7oGmEXb2RBYbVJ1vn6xy0xGVd7mmkKYr4SQlQUryE1FhBzONQ KxzUThDoFSJsKdj45771RU5Bd5FrA7W13jOIUjaZ0oCgT0G+MoeBo/XlqWYo8w== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0A16480678 for ; Tue, 31 Dec 2024 19:13:36 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSgjo-0002KQ-Rx; Tue, 31 Dec 2024 13:13:04 -0500 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 1tSgjm-0002Jo-Os for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tSgjm-0004x6-G5 for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Cy5t6vGrGCZBTEQKgmeEHQaA5ybmzx95dGK2PsJvXMA=; b=EbMSYOQa33tVGEgb9cyut9NveTyTy8bRr8tg8U2TXmPTbZJ7ksVkg54a8xOpXKpvelBZ50JWM8jl8GvkAaoIZpW+V6awN8kf7RMx8Z/5D4csjnEhvqFpnEk8/XM4kVEoxcNo9zSMQPpSs/3Gc9W3BVw74Wa8cd7UBYUV4WcZrX/bVbnhN93CjAJA/vx/9JDtqnycf3cHUaLm7Z4g72mMJsl+y0Do5QhDdV46p+RwKovPM9ZW/h2vWFnFZelrhDzv5/3F4tGdPeyUIGJZRNGIOxZlur9czHdv28PCn8PB+vIqP4aLhedmFxZWsCLCgNo0KaoLnmjJHMkX0HbFFca6vA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSgjm-0000WG-At for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v2 2/3] gnu: Add corectrl. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Dec 2024 18:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75159 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75159@debbugs.gnu.org Cc: Ashvith Shetty Received: via spool by 75159-submit@debbugs.gnu.org id=B75159.17356687461928 (code B ref 75159); Tue, 31 Dec 2024 18:13:02 +0000 Received: (at 75159) by debbugs.gnu.org; 31 Dec 2024 18:12:26 +0000 Received: from localhost ([127.0.0.1]:36734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSgjB-0000V0-A6 for submit@debbugs.gnu.org; Tue, 31 Dec 2024 13:12:25 -0500 Received: from mail-pl1-f169.google.com ([209.85.214.169]:58721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSgj8-0000Um-Su for 75159@debbugs.gnu.org; Tue, 31 Dec 2024 13:12:24 -0500 Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2165448243fso163625025ad.1 for <75159@debbugs.gnu.org>; Tue, 31 Dec 2024 10:12:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735668676; x=1736273476; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cy5t6vGrGCZBTEQKgmeEHQaA5ybmzx95dGK2PsJvXMA=; b=dD25YA4nyep5Y52S9rfQsCBWMGBBqD5EsFoI7q1QSBjl8bSecOP0UF2M/kV7miKP3W tYADwntgi9VY64eh7aCEzfchGReH1gWAeRTTIMnUqvt54Q+z3JhTolM0LfNFD5gBW6Ms SU0Tgh0RDpOVNkS2LILNlCxenbh4gO8ZfZuzU328366qDSXvuCROCCOlwpJA3arh2BrS fxDAfJZ4IIHpBqiJsEQYCuF301lSWMgbOwc5RxaEUCTctQ9K0Hog9hNOcy10cgD/Ljls qHEx01aSWUPbJXahOPhx1beG0xDcJ1D+VXi/fGUf2R7DESBw3CYKhdx7XA32UGAUrzNj cWOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735668676; x=1736273476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cy5t6vGrGCZBTEQKgmeEHQaA5ybmzx95dGK2PsJvXMA=; b=Toz194joNkEXWhqz8MdaDbv1M7ynzgWXY6Md8c24051u3QM7cE7syQtGrC8m75Jh7q MYwlNMgGf3Vt13tZIp48nK988wYedxNGcIJ5PpNKa0TxV6g2UwrkChzhpVKg4ppgLgC+ 2tMGNTmzr1Hxfv/zBbVPzNhWaeoXYxE+CsoQMSpKMyuok5lT+akxuRVRHU6ExdFe0fTl cLm/JktJKq5qQIjkJJfGL5o3mEwO1zmQjuoAe0GLqNkvh7B4ApgHBlESrz6zzOox/XiJ y3cIKZcGipgl1nS/iCKeETBMxvnIQ8n5fCxkcLxemCY8gK0f2t/H8zW/j6fY9/ktC7Nd i6ew== X-Gm-Message-State: AOJu0Yw/2EmV6e/siCGbZ2h7k9vypT3lzwr2NcLoHuaQ25lTYIKKxZKp eFUy5QYcPS2haNAc6ktJ5GUjhlCvKBtPfSyLO+gAvK4pjC28WTPetzECcMYW X-Gm-Gg: ASbGncuQsa1ZWUw7JA84SQuscsoDuCVa0zKM9AfXzLJY0azqHylB1oXlDYo8ZgrgEkM qg9mvEesIpX52BpT166A9ouWizTqo9u3DDxDiOvgPw11y9dGqod5NISJa5j8751yHmhfcwk+WTv 23vjeRvHgrKVWEx6NXp/Q8dmrcNOh/516UDe21hNMWuonNb8sDfl4z2aDwHHGAVPeB3XTZs8NQ+ s1SMKojmt5I3xF3e1PCqsxqfl/FQuYr217zAmuQlPKBFJnloTGaAE5qu/IeDzM6H+NAuLmWmwo9 aSKnVg== X-Google-Smtp-Source: AGHT+IHD6RR8J3nEwD+PQlhda4sryaKTpGe5e8yGMHylI32scv8GHjswWb1DnRHkzSXuEb8mnP57kw== X-Received: by 2002:a17:903:11c5:b0:216:69ca:770b with SMTP id d9443c01a7336-219e6e8bb28mr642304135ad.12.1735668676555; Tue, 31 Dec 2024 10:11:16 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:a636:550a:44c0:5ef0:37c9]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-219dc9cde0dsm197634165ad.140.2024.12.31.10.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2024 10:11:16 -0800 (PST) From: Ashvith Shetty Date: Tue, 31 Dec 2024 23:39:48 +0530 Message-ID: <20241231181027.28121-4-ashvithshetty10@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241231181027.28121-2-ashvithshetty10@gmail.com> References: <20241231181027.28121-2-ashvithshetty10@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 0A16480678 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -1.29 X-Spam-Score: -1.29 X-TUID: 8vq1WcqONBew From: Ashvith Shetty * gnu/packages/admin.scm (corectrl): New variable. * gnu/packages/patches/corectrl-polkit-install-dir.patch: New file. * gnu/local.mk (dist_patch_DATA): Add reference to it. Change-Id: I7b0f85c917eb58d7518d7ee7c5b22ef2debde7d9 --- gnu/local.mk | 2 + gnu/packages/admin.scm | 73 +++++++++++++++++++ .../patches/corectrl-polkit-install-dir.patch | 21 ++++++ 3 files changed, 96 insertions(+) create mode 100644 gnu/packages/patches/corectrl-polkit-install-dir.patch diff --git a/gnu/local.mk b/gnu/local.mk index 02a6fa616e..799a1ce591 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -69,6 +69,7 @@ # Copyright © 2024 Fabio Natali # Copyright © 2024 Noé Lopez # Copyright © 2024 Runciter +# Copyright © 2024 Ashvith Shetty # # This file is part of GNU Guix. # @@ -1121,6 +1122,7 @@ dist_patch_DATA = \ %D%/packages/patches/converseen-hide-non-free-pointers.patch \ %D%/packages/patches/cool-retro-term-wctype.patch \ %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \ + %D%/packages/patches/corectrl-polkit-install-dir.patch \ %D%/packages/patches/corefx-mono-5.4.0-patches.patch \ %D%/packages/patches/corefx-mono-pre-5.8.0-patches.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index dce93e4f3a..3759b53d52 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -70,6 +70,7 @@ ;;; Copyright © 2024 Vinicius Monego ;;; Copyright © 2024 nathan ;;; Copyright © 2024 Nikita Domnitskii +;;; Copyright © 2024 Ashvith Shetty ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,6 +138,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -157,10 +159,12 @@ (define-module (gnu packages admin) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages m4) #:use-module (gnu packages mail) #:use-module (gnu packages man) + #:use-module (gnu packages maths) #:use-module (gnu packages markup) #:use-module (gnu packages mcrypt) #:use-module (gnu packages mpi) @@ -195,6 +199,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages vulkan) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -6484,3 +6489,71 @@ (define-public sshguard services. It aggregates system logs and blocks repeat offenders using one of several firewall backends.") (license license:isc))) + +(define-public corectrl + (package + (name "corectrl") + (version "1.4.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/corectrl/corectrl") + (commit (string-append "v" version)))) + (sha256 + (base32 "0qpc04xxzv4jbqqlraqriipix4ph7bm1hfiry807jjp668i9n25d")) + (file-name (git-file-name name version)) + (patches (search-patches "corectrl-polkit-install-dir.patch")))) + (build-system qt-build-system) + (arguments + (list + #:qtbase qtbase-5 + #:configure-flags #~(list "-DINSTALL_DBUS_FILES_IN_PREFIX=true" + (string-append "-DPOLKIT_POLICY_INSTALL_DIR=" + #$output + "/share/polkit-1/actions") + (string-append "-DWITH_PCI_IDS_PATH=" + #$(this-package-input "hwdata") + "/share/hwdata/pci.ids")) + #:phases #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/bin/corectrl") + (list "PATH" + 'prefix + (map (lambda (binary) + (dirname (search-input-file inputs + (string-append + "bin/" + binary)))) + '("glxinfo" "lscpu" "vulkaninfo"))))))))) + ;; Text formatting only supported since C++20, which is available in gcc-13. + ;; https://en.cppreference.com/w/cpp/compiler_support#cpp_lib_format_201907L + (native-inputs (list pkg-config gcc-13)) + (inputs (list dbus + botan + catch2-3 + hwdata + mesa-utils + polkit + procps + pugixml + qtcharts-5 + qtdeclarative-5 + qtquickcontrols2-5 + qtsvg-5 + qttools-5 + quazip + spdlog + trompeloeil + units + util-linux + vulkan-tools + zlib)) + (home-page "https://gitlab.com/corectrl/corectrl") + (synopsis "Profile based system control utility") + (description + "CoreCtrl is a Free and Open Source GNU/Linux application that allows +you to control with ease your computer hardware using application profiles. +It aims to be flexible, comfortable and accessible to regular users.") + (license (list license:gpl3)))) diff --git a/gnu/packages/patches/corectrl-polkit-install-dir.patch b/gnu/packages/patches/corectrl-polkit-install-dir.patch new file mode 100644 index 0000000000..586e096cf4 --- /dev/null +++ b/gnu/packages/patches/corectrl-polkit-install-dir.patch @@ -0,0 +1,21 @@ +diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt +index c262086..523ea97 100644 +--- a/src/helper/CMakeLists.txt ++++ b/src/helper/CMakeLists.txt +@@ -26,15 +26,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1") + + # Find polkit + pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) +-execute_process( +- COMMAND pkg-config --variable=policydir polkit-gobject-1 +- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT +- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR +- OUTPUT_STRIP_TRAILING_WHITESPACE +-) +-if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0") +- message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config") +-endif() ++option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory") + + list(APPEND HELPER_COMPILE_DEFINITIONS + SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE -- 2.46.0