From patchwork Wed Nov 17 10:16:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34565 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 EDCF327BBE4; Wed, 17 Nov 2021 10:18:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 65FF127BBE1 for ; Wed, 17 Nov 2021 10:18:25 +0000 (GMT) Received: from localhost ([::1]:49242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnI1I-0004Ft-Ht for patchwork@mira.cbaines.net; Wed, 17 Nov 2021 05:18:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnI0w-0004FZ-C7 for guix-patches@gnu.org; Wed, 17 Nov 2021 05:18:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnI0w-0000ON-3c for guix-patches@gnu.org; Wed, 17 Nov 2021 05:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnI0v-0000Bx-N0 for guix-patches@gnu.org; Wed, 17 Nov 2021 05:18:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44400] [PATCH v2 1/4] gnu: Add phoc. References: <20201102221301.23038-1-jonathan.brielmaier@web.de> In-Reply-To: <20201102221301.23038-1-jonathan.brielmaier@web.de> Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Nov 2021 10:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "44400@debbugs.gnu.org" <44400@debbugs.gnu.org> Received: via spool by 44400-submit@debbugs.gnu.org id=B44400.1637144225608 (code B ref 44400); Wed, 17 Nov 2021 10:18:01 +0000 Received: (at 44400) by debbugs.gnu.org; 17 Nov 2021 10:17:05 +0000 Received: from localhost ([127.0.0.1]:60231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnHzv-00009K-QT for submit@debbugs.gnu.org; Wed, 17 Nov 2021 05:17:05 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:54556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnHzr-00008x-KM for 44400@debbugs.gnu.org; Wed, 17 Nov 2021 05:16:58 -0500 Date: Wed, 17 Nov 2021 10:16:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637144204; bh=Q3D9TGkg7YtXIRXp7SM2nmfp7l7HVu8Fvq2FDF+NDds=; h=Date:To:From:Reply-To:Subject:From; b=KuwAZ/Td94Q8EEn3nayTughzX6xEZLudyVfwE08NhAmAC+nDoI0exywE97Buul1yq SqM0eJoDsLh1Wh65P9u/QFDdThwFTXVv/8db2blPYuCH58TMQB1Zns+aeRaw2MHLzg FmgqmYPv4lZ4XIXRzGLKdflu8GT5o8leVR8wK5AA= Message-ID: 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (phoc): New variable. --- 2.33.0 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 28d4432334..185931d244 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2021 Trevor Hass ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Mathieu Othacehe +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -1154,6 +1155,82 @@ (define-public mm-common (home-page "https://gitlab.gnome.org/GNOME/mm-common") (license license:gpl2+))) +(define-public phoc + (package + (name "phoc") + (version "0.9.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/Phosh/phoc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18nwjbyjxq11ppfdky3bnfh9pr23fjl2543jwva0iz1n6c8mkpd9")))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; requires server connection + #:meson ,meson-next + #:phases + (modify-phases %standard-phases + ; source of wlroots required in subprojects/wlroots folder + (add-after 'unpack 'get-wlroots + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "wlroots-librem5-source") + "subprojects/wlroots") + #t)) + (add-after 'get-wlroots 'patch-paths + (lambda _ + (substitute* "src/server.c" + (("/bin/sh") (which "sh"))) + (substitute* "tests/test-run.c" + (("/bin/true") (which "true")) + (("/bin/false") (which "false"))) + #t)) + ;; Those check a running phoc server against some screenshots in the repo. + ;; They differ only by the mouse cursor (shadow vs. no shadow). + (add-before 'patch-paths 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + (("'layer-shell',") "") + (("'xdg-shell',") "") + (("'phosh'") "")) + #t)) + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + #t))))) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("glib:bin" ,glib "bin") + ("gnome-desktop" ,gnome-desktop) + ("libinput" ,libinput) + ("libxkbcommon" ,libxkbcommon) + ("pkg-config" ,pkg-config) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("wlroots-librem5-source" ; patched version for Librem 5 + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://source.puri.sm/Librem5/wlroots.git") + (commit "5413b1ec61c6e3390929db595c0ec92f92ea2594"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "02q70244sfs2jzl8mxsvd51rrv59jxllyss821xgg0cmq49rgq5w")))) + ("xorg-server" ,xorg-server-for-tests))) + (propagated-inputs + `(("mutter" ,mutter))) + (synopsis "Wayland compositor for mobile phones") + (description "Phoc is a wayland compositor for mobile phones based on + wlroots.") + (home-page "https://gitlab.gnome.org/World/Phosh/phoc") + (license license:gpl3+))) + (define-public phodav (package (name "phodav")