From patchwork Sat Dec 24 07:30:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wamm K. D" X-Patchwork-Id: 45561 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 E852827BBEB; Sat, 24 Dec 2022 07:41:35 +0000 (GMT) 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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 4302D27BBE9 for ; Sat, 24 Dec 2022 07:41:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8z9X-000739-Ei; Sat, 24 Dec 2022 02:41:07 -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 1p8z9T-00072v-O2 for guix-patches@gnu.org; Sat, 24 Dec 2022 02:41:03 -0500 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 1p8z9S-0005qC-FC for guix-patches@gnu.org; Sat, 24 Dec 2022 02:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8z9S-0002lD-3v for guix-patches@gnu.org; Sat, 24 Dec 2022 02:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60294] [PATCH] gnu: Add libxapp. Resent-From: "Wamm K. D" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Dec 2022 07:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60294@debbugs.gnu.org Cc: "Wamm K. D" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167186764410593 (code B ref -1); Sat, 24 Dec 2022 07:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Dec 2022 07:40:44 +0000 Received: from localhost ([127.0.0.1]:41466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8z9A-0002kn-0r for submit@debbugs.gnu.org; Sat, 24 Dec 2022 02:40:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:60468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8z97-0002kh-IV for submit@debbugs.gnu.org; Sat, 24 Dec 2022 02:40:42 -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 1p8z95-00072F-Et for guix-patches@gnu.org; Sat, 24 Dec 2022 02:40:39 -0500 Received: from mail-mw2nam12acsn20806.outbound.protection.outlook.com ([2a01:111:f400:fe5a::806] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8z93-0005l1-L0 for guix-patches@gnu.org; Sat, 24 Dec 2022 02:40:39 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GZpZvO7JqaspUXic9YpI4+YsUg1oRRedKn8xMj4TmKUbk8S/JBCkOXAFh+B1vJlxk719gcM0IBiuTjJFdHhj5AHYrqK+5lWN/9bjChMeB2lmb7ni72hpKtxRvJZP990odnnFKW9+ddznnF/kkzT6uy0ksAJgNYHEIu3ZrhO/hbspiONP7VuswCfxCIjap2lRBXceIhoam32G862dhmT2jZWDLOjoJIbms4JQ/XwXt0/RZqfd2hYTirqlJNV/6FFu5ARYG38uadtEtTmAH1M0OgQUM6Pj+BfoxFfzi7/vm0JbP1Za/aQvYPfLKTS74s0KdzEQkxg1UsaFwtyQzO5a9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pQm6lAW8VCp+0zBOCIr3vSPxkwzFBPzIe4DsoNScacc=; b=g+u/vYVTlcgDLt4pU3M1WPvzEh5VfTLtjN1TX2zazaDUjkH6j/9wBv9NkeVE47EPpXOT8TvIHRLjNDjiLLiXemdQwpCTihO0CpMHqK+6kDov71vqlQstoxe4KfV3UOAxHgyiA2cuBuNxUosiK6H2Ndl53wJjv3G9YaIHvv34sidpxYxZk/FRqRrwukCWe95WN3Dlm4nvyqeWc8SpSS7W7/iBM6DSeqhCu2tBRay2wN1As6cFbv0v/xpmNf3dVrNOrUv65jjEANs9jaGO9zQgWuAmxcIKXNqmXH1aw9W21tE9w2Y4hGJKxe0B0UyzvEMSkxAXoD4bNQZo+Mo0IU7cnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pQm6lAW8VCp+0zBOCIr3vSPxkwzFBPzIe4DsoNScacc=; b=lgIloCZr+ystn8XDiAaFpN4ZuY5Kp2/nMtaX/5vy2IbOtdYqC1naLV3nsaH2/ds4tabC4tL2DsCdkn8NaP04shThN4aJe4xOaA6gRnd5y1yYKUJGcRmjjzaQxOKL9CuiZlBms1z6ndvTNO9sBf+5ZUppL4sH6Hy645V+r+sGxHgmlzoNB5R9bzn0mJiaeWoSWXu465A6Mu1VNviFYt74oZgq27Ybl/RU5yODT3dzFlLXO/+jD3hYiJ9tS/UhOgYdRaw+6EL1Cu3K2y1FXbQNjwCaU+WrYRD6AswRdUUc3R5GIZgQmqr+yb+sSVS2prLchgZqYpRz7hVYjPErLvVUrQ== Received: from BY5PR07MB7029.namprd07.prod.outlook.com (2603:10b6:a03:1f0::20) by BL3PR07MB8988.namprd07.prod.outlook.com (2603:10b6:208:343::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.12; Sat, 24 Dec 2022 07:35:31 +0000 Received: from BY5PR07MB7029.namprd07.prod.outlook.com ([fe80::a280:d6f3:a7d0:204f]) by BY5PR07MB7029.namprd07.prod.outlook.com ([fe80::a280:d6f3:a7d0:204f%4]) with mapi id 15.20.5924.016; Sat, 24 Dec 2022 07:35:31 +0000 From: "Wamm K. D" Date: Sat, 24 Dec 2022 01:30:10 -0600 Message-ID: X-Mailer: git-send-email 2.38.1 X-TMN: [iv6lkzItaqjkCxq07qu3C5Htzzjx+s4X] X-ClientProxiedBy: CH0PR03CA0407.namprd03.prod.outlook.com (2603:10b6:610:11b::34) To BY5PR07MB7029.namprd07.prod.outlook.com (2603:10b6:a03:1f0::20) X-Microsoft-Original-Message-ID: <20221224073009.7737-1-jaft.r@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR07MB7029:EE_|BL3PR07MB8988:EE_ X-MS-Office365-Filtering-Correlation-Id: c3d7bb56-f20d-483e-6514-08dae5816fc3 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKzz+dRX1ATEfExO6ouexUYZsJGibX+JZ/nKoxvBR6Kzu9EMc3t8Xy3XtxmUyt+NnUhh6YIrHxqzV/kednxPMiOlAQ3veE6kqokMXjrqDiFqeL6q8vgc5YQmmV3QqgJmhkNPTYhRHDBHGbCWNnevrnF7kSSWVuYIXve4KLhc2hB/JSNVYgbUbnHzS2fs+BghrlF8hr40QEt70Vd1MKP7xkrYzVPUWNDAePjUE38GSoS9d2Q79yd9OvQsRJZna77opDq7JvfcFdo1ZtBFGxtqF8F4TEqvnK/jp/WHMoWcEB0rFczkssxuwo6oe8kYW22mJhdfBHZ2x4jwU9BTsMdXamycCXEEowqVmSAUIxoSgId6gFWmZW6PjJpnxxiJSnaVz8VUXb68SJjzY9HNgiEE0cldY4ylp7cUxx9CkPCaGdZiQIqXVvjJafk+v4CpS4k6DqB7XoS3WwDw/fBVt5Ej2aQlCGORVdyJV8SRqbLTu4aX1Ln2ejLiz6S46rPF3oY4/yQ6eRHhBT9gqogniIRLrm8hL/ckss479WZfUEJiyujJBybMexSS1iKxyfAn1pTqSFQN0yDBokdLZLqpIobcjJVDaSS5M3qotJKggbd5vgrQULQc6dGDg0rzgDxW22yLReJlCKkqNtCxep5TOlDRTRy9SwSO68zpbfwUgq0Vj29Bwc7JXPFljDELc1IIVsaHujlu6R36qVnvvuofGaCG+kKbGKTyj8cNHRQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tBjJ2Py8vzpoRRi1WOr6Xm/fZBPpVy5ma/NmvZlwpGD0qHxNjZuIII1AvGgu146WiXcJh4l+7Sq74jw5U3ufqRiam1YHnbShU5fiPtrpaFKWTNIweTRaGp80ELW1cCBsRTcI+twnQRokV5rgGVL833dFbTr0iwNvktS0Hm1gI8rzZheFdPxplVPPQ8mID8XyWEoC4qpLo62yYwiGs7Xns6HfbaDKe1ZtVuFaTwWpemxAgks3ZSMI9kEkziIz1tw7tRL0FF0oCurEckgeYJT4XDxD1w5bf8dQxkPz1PoKtqvGJmkHrM4mcSdXy5axLRyXP8nl2pgw76z4649HJgvSlOhrjJf3emRWkM5Ty5jWL9FWeAvGldz4mgQk/OvohRSXDXOwZGxUswN74OIPKEUUjFyEsNZpHYY3LKdBFK2hHW1BzaTU51S1RsZLHej0P3I6b4pkQO+77hgG8Zpyqn9FXst5lTu/6k+oHguN1VW47i8v0ErAi5pGG8OIkN0Eecanod98oYpCorbpHLUmnl0a7Z6R2MK+LJDe26owaZFfU8EPlYVxOmiUdhdspads3PxhvLTdC5tMgwrntYjX0K4/ATOGV1F/TWXluHGEuGAvvSSa1BOl3DyFSLJ6qhmLBpZqcn7UjacpPJx0SfrU9bKaqA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H3O9UxWB4+xzLYZ//YPp+n54xf8jH6wv8FRWxabyCdDksyzo/RtTAgJvAKepKMBOvgDCbK2qv/fGB0xo5NW/30XIPuxS0lO8NO6dPZrZwAh624fWuuOxpfkKCgIDr+qyl8PTX9XEvJ21gQtYkOVJOooeW4X5iH7H9GEnxzzDHYW3rZgIukD81cCAITOZvN5OeV5m7St0fudEqsNpQDc56OE/Qe5AIgRUEOD559X2+TnyM/vFHM5jYjK519RjfVb+Y+5KrvdEUfHxiWtoKJm4yz1dYbIWC2NKKsIWCwNAPfWUhzXkaofozPVsAyT6+jJHi7//kIMmg71A5yQ+B6TzdVxzYeqoryF+Texi0Bj/9tSIfXcL92eFOV8X1lt/crk5F/EVcPjqQiQWpbt7BDSuumbgkMyGZB2L/LCLaHPcczEtBKMGbXAreteUfgK0tqZmyx5cIkEWX9w6mlwtK0IC8O2wDf6CwkVldPnkbpj8LpMacK9Kve/OUxbGbl753vq9iAJRKFIdEK0lgoZMPFw5Uz7O5CH4p0aEtXKYw2uEDcxBj72YBvo14GZVk09RGkXihoQPgugcW40EAzwLu5YRklNDMW5eoljtjRp5WnU/NCGlEka+YrNT39jcG4ren/PLxxcAPuM7OkZyEu7J3QkhOlRGSk+FWlh5twND8/2RfYNPOKaXYFDsXZcSv3wiTmWbSzduBzXJai+BBo0PpIiOxjdQGEF8N+HNX5rPmA+Og43p0VYOUuGIzRMh3wJb5F99BIBmLNeC4eRiXLkzTxjMoSHIVfHmrN9KznaaCjkNSUMgcjcL+hE8uFdFRvZu2siqH+Bq4Z5EPvS2l18eUEHemMZV/+HxuapC4iHwg3KIiq/w9tDTawSDA16fEQM7ITwNobo1vUbIgf5sgX6fTM30qfSIa8rC27u1SrSMOYMD3IAdDNCoYB4a6KTPUxVeSIbCPnEQ9NH8702U/0WNJeJCFljtBcGT4I2losrqDsiNsPIgUEennhzhUCq8EfUz6NelCGf5GPHSECpZaTfplBSWWZPttFHHdzsPSNrjv8Y4GHFW5hhZSQE1sBleT/AD7ZUzjXj2XRcEzgUebS2xNz6EhUHArEHYr7DbJj/IRHS1F/uLQlk2YpwTUU5D3hAKBtqtW18QW3DFtVESYMFMWTtvDN7H/uoI7PO+csrZSLSXDNW2r7vy5tILfDm0OwKTU/3uGwVxEJQ7a41rdSiM+6JbVM8eIV5Ev31uUuIjkVSecyagNAJK/F2UYWaaQ7nAitb0C3WMqKWszP6U/We5UQkWSQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3d7bb56-f20d-483e-6514-08dae5816fc3 X-MS-Exchange-CrossTenant-AuthSource: BY5PR07MB7029.namprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2022 07:35:31.7620 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR07MB8988 Received-SPF: pass client-ip=2a01:111:f400:fe5a::806; envelope-from=jaft.r@outlook.com; helo=NAM12-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cinnamon.scm (libxapp): New variable. --- I wasn't sure where to put this as, while definitely used by Cinnamon, I think this is used by Mate, as well (and possibly XFCE?). I don't know if a mint.scm file might make any sense as it's quite literally under the Linux Mint repo. account? If it would be better to place this elsewhere, just let me know and I'll adjust. gnu/packages/cinnamon.scm | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index fe33e797e4..c1f258c18d 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -26,6 +26,7 @@ (define-module (gnu packages cinnamon) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -37,6 +38,77 @@ (define-module (gnu packages cinnamon) #:use-module (gnu packages python) #:use-module (gnu packages xorg)) +(define-public libxapp + (package + (name "libxapp") + (version "2.4.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmint/xapp/") + (commit version))) + (sha256 + (base32 + "0cy9g0zqcbx9zscc9qavqmghfyfb8244cg299llv1ha8n6mpxl3s")))) + (build-system meson-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-gtk-module-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "libxapp/meson.build" + (("gtk3_dep\\.get_pkgconfig_variable[(]'libdir'[)]") + (string-append "'" (assoc-ref outputs "out") "/lib'"))) + + (substitute* "pygobject/meson.build" + (("get_option[(]'py-overrides-dir'[)]") + (string-append "'" + (assoc-ref outputs "out") + "/lib/python" + #$(version-major+minor (package-version python)) + "/site-packages/gi/overrides'"))) + + (substitute* "scripts/pastebin" + (("'nc'") (string-append "'" + (assoc-ref inputs "netcat") + "/bin/nc'"))) + + (substitute* "scripts/upload-system-info" + (("'inxi'") (string-append "'" + (assoc-ref inputs "inxi-minimal") + "/bin/inxi'")) + (("'/usr/bin/pastebin'") (string-append "'" + (assoc-ref outputs "out") + "/bin/pastebin'")) + (("'xdg-open'") (string-append "'" + (assoc-ref inputs "xdg-utils") + "/bin/xdg-open'")))))))) + (inputs + (list dbus + glib ; for gio + gtk+ + inxi-minimal ; used by upload-system-info + libdbusmenu + libgnomekbd + netcat ; used by pastebin + xdg-utils ; used by upload-system-info + )) + (native-inputs + (list gettext-minimal + `(,glib "bin") ; for glib-mkenums + gobject-introspection + pkg-config + python + python-pygobject + vala)) + (home-page "https://github.com/linuxmint/xapp") + (synopsis "Cross-desktop libraries and common resources for X-apps") + (description + "The components which are common to multiple GTK desktop environments +(Cinnamon, MATE and Xfce) and required to implement cross-DE solutions.") + (license license:lgpl3))) + (define-public cinnamon-desktop (package (name "cinnamon-desktop")