From patchwork Mon Nov 2 22:28:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 24965 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 9BF2827BBF3; Mon, 2 Nov 2020 22:29:30 +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_H4,RCVD_IN_MSPIKE_WL, 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 E677427BBF2 for ; Mon, 2 Nov 2020 22:29:29 +0000 (GMT) Received: from localhost ([::1]:38946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZiKP-0004TZ-0a for patchwork@mira.cbaines.net; Mon, 02 Nov 2020 17:29:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZiJx-0004TN-UU for guix-patches@gnu.org; Mon, 02 Nov 2020 17:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kZiJx-0003Il-LR for guix-patches@gnu.org; Mon, 02 Nov 2020 17:29:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kZiJx-0007El-I6 for guix-patches@gnu.org; Mon, 02 Nov 2020 17:29:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44400] [PATCH 1/2] WIP: gnu: Add phoc. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Nov 2020 22:29: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 Cc: Jonathan Brielmaier Received: via spool by 44400-submit@debbugs.gnu.org id=B44400.160435612427787 (code B ref 44400); Mon, 02 Nov 2020 22:29:01 +0000 Received: (at 44400) by debbugs.gnu.org; 2 Nov 2020 22:28:44 +0000 Received: from localhost ([127.0.0.1]:42834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZiJg-0007E5-EB for submit@debbugs.gnu.org; Mon, 02 Nov 2020 17:28:44 -0500 Received: from mout.web.de ([212.227.15.3]:43375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZiJd-0007Dl-T7 for 44400@debbugs.gnu.org; Mon, 02 Nov 2020 17:28:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1604356115; bh=W2GLegdwJ0qdRTexO1KGAOdENl9ldyOdcXGlW9vnBxU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=hpCYGu4g9lwa2sjAc9LiTks5vX2f3WFWOL9QCrdKMOJJ9FlAO37T4ciXJOzJD7ZJ1 afY4wvWEx3ifd5ez2Rkj4XAwVfqrwiYkhjd7TutOKFtQZQZqCmnmsxWVZ7k6Qfuisa eIAz9PSB9jp3v3kVvyiF5prif6m/SKFb+hYLVpiE= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from 3700X.fritz.box ([5.146.192.20]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MKuOP-1kuxA62BTh-00LJUb; Mon, 02 Nov 2020 23:28:35 +0100 From: Jonathan Brielmaier Date: Mon, 2 Nov 2020 23:28:26 +0100 Message-Id: <20201102222827.23533-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201102221301.23038-1-jonathan.brielmaier@web.de> References: <20201102221301.23038-1-jonathan.brielmaier@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Cfq93Ca2EJ6oyVAUyIprXoLnmOxEojY0XnLTcX8QKK/Ni8uWdN4 z7xKJrCwXvI/C+XuQmN9oKjb9xgdi23OZnyhG6XLbAFzbsCwt4FK10l+o8OSW4OTmWdJgAV g0rpSwkmejctOGihDdIAXq0bnhURU4NLQPzMmJRopUCsOTrXwW4Yb9eVEzg6B4K0fH6CtXH kiDC0NI9Biqp/sVV7K5vg== X-UI-Out-Filterresults: notjunk:1;V03:K0:ms8XpKgta6g=:XVeOGZHh8F87A6ME1NL8VG SqHjhkD88/mh8ipMd3abFmnLPoMSpR8AEGqZEpt9ewZOEgwII7qPesyHfxd4DB1wlQTvid0P6 kiTMGDaUX/cy8VR1sOgVyCzXSv9LwMbpjLuKXSJY8Nh1ZXf5zona5Yx5YEN7s368Ew4BKWRWr wYaGU858GCA/7I5EANuNF0W+AxOpEGHnoMTinLn9NiYxRlQUKcsUCsHLspb87cNSV5S3NSd+4 CrwuV3fUCJ4btSov55JIjKvZMneaf6vOX9wHZxtJIAe4+RtNuIXXV68pf+PY+ZvxeynL/tRCp RBCHK7VCqebhMIqcPlt/oLdJpitFKjkqMs1y3STbBKl4WmuW5rFrZ+6QiC6IwebSgQ6PwzgRG ovV8HIXkUV+GJjAOJ6igNP4yEg3RmNEZn2h45q0GoC2yavEC+FFjRFrnTdD75cdaSBgJle1Sv BIkWfbcCL8p3Vkgc1Mu69wE5x0QUSrZPviKzPrv4Xxg+4a828eu8wDnRYS6crQivSTj65K5gW wg+Jpq3tgs8d1L0WrrRnwTMjWRASuZPU0w2PG5KH6ZqWnY+CTKGBKCZYuk4FBbwzXK2mt71kc PPD3LTcCYMmxr6qeHExMktFdJhpBxX+KeLSe5zL3IdcGM9jnmJKAvKv7kv6CtmBl7wyMJDgRg +u7gUtus3xbt0hqfCUXgm+Nzgq+lK+OD/isiC5oos4MMQdl2cjLLBLRhbeW3hEKY1TU5Ow0Rd FwhOwv6JHbyzIIHkz/3v/Wd5zqH/DRD+edOqkfBX5NHj7930IcvE7cdhJrpQwV4ZhhdL/p+Vz hihrV1AAYHaK1IUKVE6OuL9yTNTfC4Z+QLdLP3/Zf3bJDBoqv4g/y+ndA5JuQvZK0oi+02XHt zcO27LLAVh49r6oKxHms4tStIUjTKXFCEXlAe4a6o= 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (phoc): New variable. --- gnu/packages/gnome.scm | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) -- 2.29.2 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cd7bc0ceba..af5ea09e55 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12034,3 +12034,76 @@ for the GNOME 3.x platform with many features. It aims to be a very complete editing environment for translation issues within the GNU gettext/GNOME desktop world.") (license license:gpl3+))) + +(define-public phoc + (package + (name "phoc") + (version "0.4.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://source.puri.sm/Librem5/phoc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08nqlmbklyjiirqdv56cs94rjs0bjwzjcccmbgzmjdbxxpklqy9k")))) + (build-system meson-build-system) + (arguments + `(#: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 "7723a09a226d812aa51d1439c2b5e8e21238d45c"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0k7662x40ssc0zvvz1qpwcwl98ndfpv2363hg9lsff5y0p4gk653")))) + ("xorg-server" ,xorg-server-for-tests))) + (propagated-inputs + `(("mutter" ,mutter))) + (synopsis "wlroots based phone compositor") + (description "Phoc is a...") + (home-page "https://source.puri.sm/Librem5/phoc") + (license license:gpl3))) ; TODO or gpl3+?