From patchwork Wed Sep 6 10:24:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Clarke X-Patchwork-Id: 53596 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 C023A27BBE9; Wed, 6 Sep 2023 16:22:44 +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=-0.2 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED, URIBL_DBL_SPAM autolearn=no 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 B496D27BBE2 for ; Wed, 6 Sep 2023 16:22:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qduMF-0003RT-It; Wed, 06 Sep 2023 11:22:19 -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 1qdt0z-0006Ov-Kx for guix-patches@gnu.org; Wed, 06 Sep 2023 09:56:18 -0400 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 1qdt0k-00066f-JH for guix-patches@gnu.org; Wed, 06 Sep 2023 09:56:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdt0k-0002VN-Ja for guix-patches@gnu.org; Wed, 06 Sep 2023 09:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65783] [PATCH] Added webapp-manager and python-gobject Resent-From: James Clarke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 13:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65783@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16940085519068 (code B ref -1); Wed, 06 Sep 2023 13:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Sep 2023 13:55:51 +0000 Received: from localhost ([127.0.0.1]:34649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdt0X-0002LL-Jz for submit@debbugs.gnu.org; Wed, 06 Sep 2023 09:55:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdpmt-0002ej-7t for submit@debbugs.gnu.org; Wed, 06 Sep 2023 06:29:32 -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 1qdpmm-0006qR-Mq for guix-patches@gnu.org; Wed, 06 Sep 2023 06:29:24 -0400 Received: from [92.27.80.169] (helo=portal.jamesdavidclarke.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qdpmj-0003Fg-Dd for guix-patches@gnu.org; Wed, 06 Sep 2023 06:29:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamesdavidclarke.com; s=mail; t=1693995850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=dibGVcaCYmqSvJ20oN5Px3ZOD2JM9TtFyUtQVTINQGA=; b=CNK4Hr09TpkqdBZ1iiju6gpaKnw9GfTvZTTO19VusjUUbI1TTSEsCOmzW210XPfgWZdbn0 2w/pUtBgneCY5r2i3py+UQF9cVXbJ9TCJqcKCn4YNUnQnoQfXVfTi66n3lK5/qOwOUkuQZ 8xSmoATtS79bTJaBLQ/5k54kgzpszfU= Message-ID: <4e080abd-7977-bf79-f9d4-5ac3c739a933@jamesdavidclarke.com> Date: Wed, 6 Sep 2023 11:24:10 +0100 MIME-Version: 1.0 Content-Language: en-US From: James Clarke X-Host-Lookup-Failed: Reverse DNS lookup failed for 92.27.80.169 (failed) Received-SPF: pass client-ip=92.27.80.169; envelope-from=james@jamesdavidclarke.com; helo=portal.jamesdavidclarke.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_DBL_SPAM=2.5 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 06 Sep 2023 09:55:42 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 06 Sep 2023 11:22:18 -0400 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 Here is a patch which will add webapp-manager and python-gobject to guix. I have already tested it and linted it, but you may want to test it yourself. From 0a043e6c227a63ceb9cb983aab0ab035a70729fe Mon Sep 17 00:00:00 2001 From: James Clarke Date: Wed, 6 Sep 2023 11:16:14 +0100 Subject: [PATCH] Added webapp-manager and python-gobject --- gnu/packages/linuxmint.scm | 77 +++++++++++++++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 28 ++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 gnu/packages/linuxmint.scm diff --git a/gnu/packages/linuxmint.scm b/gnu/packages/linuxmint.scm new file mode 100644 index 0000000000..5abe4ef94d --- /dev/null +++ b/gnu/packages/linuxmint.scm @@ -0,0 +1,77 @@ +;;; Copyright © 2023 James David Clarke +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + + +(define-module (gnu packages linuxmint) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages gnome) + #:use-module (gnu packages cinnamon) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages package-management) + #:use-module (guix git-download)) + + +(define-public webapp-manager + (package + (name "webapp-manager") + (version "1.3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmint/webapp-manager") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 (base32 "1jayc805m716mm0p0bnjisb8clvqar87j65p4pv7ayybqirvkhga")))) + + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-after 'unpack 'prepare + (lambda _ + (substitute* "usr/lib/webapp-manager/webapp-manager.py" + (("common-licenses/GPL") "licenses/common/GPL/license.txt") + (("__DEB_VERSION__") ,version)) + #t)) + (replace 'build (lambda _ (zero? (system* "make")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "etc" (string-append out "/etc")) + (copy-recursively "usr" (string-append out "/usr")))))))) + (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-configobj" ,python-configobj) + ("python-gobject" ,python-gobject) + ("python-pillow" ,python-pillow) + ("python-setproctitle" ,python-setproctitle) + ("python-tldextract" ,python-tldextract) + ("dconf" ,dconf) + ("libxapp" ,libxapp))) + (home-page "https://github.com/linuxmint/webapp-manager") + (synopsis "Run websites as if they were apps") + (description "WebApp Manager allows you to run websites as if they were apps.") + (license license:gpl3+))) + + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a950de3b46..8933ff628a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -141,6 +141,7 @@ ;;; Copyright © 2023 Ontje Lünsdorf ;;; Copyright © 2023 Parnikkapore ;;; Copyright © 2023 Foundation Devices, Inc. +;;; Copyright © 2023 James David Clarke ;;; ;;; This file is part of GNU Guix. ;;; @@ -278,6 +279,33 @@ (define-module (gnu packages python-xyz) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) + +(define-public python-gobject + (package + (name "python-gobject") + (version "3.44.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "PyGObject" version)) + (sha256 + (base32 "10sxglfwrv377wcjs03410h4hsclg5lgdlwfswdb7s4i1jcbwpv6")))) + (build-system pyproject-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection) + ("python-pytest" ,python-pytest) + ("python-pycairo" ,python-pycairo) + ("gtk" ,gtk) + ("xvfb-run" ,xvfb-run))) + (propagated-inputs + `(("python-pycairo" ,python-pycairo))) + (arguments + `(#:tests? #f)) ;; Skips test phase as GIMarshallingTests is missing. + (home-page "https://pygobject.readthedocs.io/") + (synopsis "Python bindings for GObject Introspection") + (description "PyGObject provides Python bindings for the GObject Introspection.") + (license license:lgpl2.0))) (define-public python-xmldiff (package -- 2.41.0