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+? From patchwork Mon Nov 2 22:28:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 24966 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 3217927BBF3; Mon, 2 Nov 2020 22:29:33 +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 7FC2A27BBF2 for ; Mon, 2 Nov 2020 22:29:32 +0000 (GMT) Received: from localhost ([::1]:38974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZiKR-0004Uk-NS for patchwork@mira.cbaines.net; Mon, 02 Nov 2020 17:29:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZiJy-0004TO-GD for guix-patches@gnu.org; Mon, 02 Nov 2020 17:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kZiJy-0003Ip-4Y for guix-patches@gnu.org; Mon, 02 Nov 2020 17:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kZiJy-0007Es-1r for guix-patches@gnu.org; Mon, 02 Nov 2020 17:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44400] [PATCH 2/2] WIP: gnu: Add phosh. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Nov 2020 22:29:02 +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.160435612527793 (code B ref 44400); Mon, 02 Nov 2020 22:29:02 +0000 Received: (at 44400) by debbugs.gnu.org; 2 Nov 2020 22:28:45 +0000 Received: from localhost ([127.0.0.1]:42836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZiJg-0007E8-OX for submit@debbugs.gnu.org; Mon, 02 Nov 2020 17:28:45 -0500 Received: from mout.web.de ([212.227.15.4]:37783) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZiJf-0007Dn-27 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=1604356117; bh=4dmHlulu9TvUwGI+D6fIuhPCzLfeCTazzfgqVoBxvgo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=WPUuqSHbpfVfSblAevBekIPe0nspp6XhUbliYIL39ubwW8Ivru6C3VNTp49+Gah71 wbqpAaXthmrT/iIxIUJjvpngqbfeBx3cZoVHFVAj43U2nQitqP3onIyLWbjZtwlJjk o4wWFIJQh9yyJp72QQoNzTP79UxlSCPcdZixlcQw= 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 1Meler-1k1l8j3qeT-00aeY9; Mon, 02 Nov 2020 23:28:36 +0100 From: Jonathan Brielmaier Date: Mon, 2 Nov 2020 23:28:27 +0100 Message-Id: <20201102222827.23533-2-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201102222827.23533-1-jonathan.brielmaier@web.de> References: <20201102221301.23038-1-jonathan.brielmaier@web.de> <20201102222827.23533-1-jonathan.brielmaier@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:aHKIxg3vmWIT/wMkWDi1tDIzGwzK9T53bVtdFBjTkZ6dByAT4Xj 6YnVsNCqH+Xtzi+kGZdQ4UC0gX2AoevM70jqvOAykArL6d6x6PRnb3Uft2XcPRxbVeYfUBj x42rglr8LtjYWOhs8X8SZxUHr2LEibQiIG2BSDvnJ6ws49AOz0YRF8KP6ao65tXmk/5++gj URblfaFVFCvBdwwYy75jg== X-UI-Out-Filterresults: notjunk:1;V03:K0:sQLG41dd8dI=:MfcsvyZ09ldFifiLp7qCb7 LOEA3scaJsxu4tO7WYU4iwGhc3BVLjFwVvvMrjDQgw4rg0R9K6Chho4PTaY6xvd2YrKKGI/Na E5NN4rbg7NRYrleYBLfrnYqBxF2ce2ghpQTUHcrvLorIuDFBh2FITAc+nKGa3G8/aKga59xsO lT4uLqsThOLDPTfqo1A98HFVtqAd/7vRpKYcO58PHlTq8D8CmnZWHij5Qn2pGJUT+MwkRajNW Asvph3M700riBjU9is5AzRjWUIk7D72YZglXtXVXhYoq2Gm0Iwgt6J/3EuYuHZHWLxvZttiS7 FqDbmh1DhHj/Kh8kw0VzeCQxAh3WIHG3Tf7mZr55nUg4iEuYU6ZtVvu3/m2QNtom+CIEQPPIQ mtm/HGU/C+KkBG/mXtFxBHX7jz7TvbEJLiV0fvGbUKPUw07RRuCve1hx/gpFSZRpPREZYu4Rf N+H1flI2YR+PjA4pgde2HEZIxY1kTNp0Cw8Q611CHbxp9QLnNCujVJTCzYpkzUGJi8cJXlUIi EhSpKMWkqJ1Pj1HV8mGnONDBjnc35fcvG59pjWz6MhGnb2Mm7RKSLfCey2cJ4KNmNixkUqobO JtXu6vd0LWMQGnplhonjN1U23JZ31bXdCEZ3xIgWwA803u2j5MQi9hbKG2PI/7oVT8s5R4H8D YcL6PwuC1zBDIyz99ySK5AQN7YavdoGgFLdYBNBz3RvoNSACxhVvqyXnJytOV6lazbiYJGGUU tDBbk+Y0GiLU3ksYTBTPkaUQ8yP9zSJLHup4nysjruTGPa4tHv+IdJnfmWewtBoGZa1bATHe9 iIkPrgkT4Mjub3CuULAPssGi+nYsfe+UmxIB7wVfg6IvFOAbj+HPi3iUCZbBy45x/FNMGTZQa eSO+Z5p+Iv5p6cVlw0qiIjNSPowcpMjeMrzudrxwM= 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 (phosh): New variable. --- gnu/packages/gnome.scm | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) -- 2.29.2 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index af5ea09e55..df70d07be7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12107,3 +12107,69 @@ world.") (description "Phoc is a...") (home-page "https://source.puri.sm/Librem5/phoc") (license license:gpl3))) ; TODO or gpl3+? + +(define-public phosh + (package + (name "phosh") + (version "0.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://source.puri.sm/Librem5/phosh.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vcgkkim6mwsdffyz37pnp7ax2f4z7272ikdkv03vg3j3h3ypnch")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'get-libgnome-volume-control + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "libgnome-volume-control-source") + "subprojects/gvc"))) + (add-before 'configure 'fix-phoc-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "data/phosh.in" + (("@bindir@") (string-append (assoc-ref inputs "phoc") "/bin"))))) + (delete 'check) ; TODO: needs a running wayland compositor + ))) + (build-system meson-build-system) + (native-inputs + `(("gcr" ,gcr) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gnome-desktop" ,gnome-desktop) + ("gtk+:bin" ,gtk+ "bin") + ("libgnome-volume-control-source" ; needs to be present in subprojects/gvc folder + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/libgnome-volume-control.git") + (commit "ec5cf3e0de6715803e64b65abb059e2155b3d6de"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0azq1xy50s1bg28xf97g16657490ng00amc4cw7vvdgminq82rq5")))) + ("libsecret" ,libsecret) + ("linux-pam" ,linux-pam) + ("network-manager" ,network-manager) + ("pkg-config" ,pkg-config) + ("polkit" ,polkit) + ("upower" ,upower))) + (inputs + `(("feedbackd" ,feedbackd) + ("libhandy" ,libhandy) + ("pulseaudio" ,pulseaudio))) + (propagated-inputs + ;; "missing" schema files + ;; org.gnome.DejaDup.File org.guido-berhoerster.code.package-update-indicator org.blueberry + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ;org.gnome.desktop.wm.keybindings + ("gnome-session" ,gnome-session) + ("mutter" ,mutter) ;org.gnome.mutter.keybindings + ("network-manager-applet" ,network-manager-applet) ;org.gnome.nm-applet + ("phoc" ,phoc))) ;sm.puri.phoc + (synopsis "Wayland shell for GNOME on mobile devices") + (description "Phosh is a pure Wayland prototype intended for mobile devices.") + (home-page "https://source.puri.sm/Librem5/phosh") + (license license:gpl3+))) From patchwork Wed Nov 17 10:18:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34567 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 300DA27BBE3; Wed, 17 Nov 2021 10:19:10 +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 D52A127BBE1 for ; Wed, 17 Nov 2021 10:19:09 +0000 (GMT) Received: from localhost ([::1]:49758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnI21-0004eF-1b for patchwork@mira.cbaines.net; Wed, 17 Nov 2021 05:19:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnI1u-0004cd-Qh for guix-patches@gnu.org; Wed, 17 Nov 2021 05:19:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnI1u-0000cz-Ig for guix-patches@gnu.org; Wed, 17 Nov 2021 05:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnI1u-0000EU-FR for guix-patches@gnu.org; Wed, 17 Nov 2021 05:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44400] [PATCH v2 3/4] gnu: Add callaudiod. 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:19:02 +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.1637144310834 (code B ref 44400); Wed, 17 Nov 2021 10:19:02 +0000 Received: (at 44400) by debbugs.gnu.org; 17 Nov 2021 10:18:30 +0000 Received: from localhost ([127.0.0.1]:60243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnI1O-0000DO-0N for submit@debbugs.gnu.org; Wed, 17 Nov 2021 05:18:30 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:32205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnI1M-0000D5-NI for 44400@debbugs.gnu.org; Wed, 17 Nov 2021 05:18:29 -0500 Date: Wed, 17 Nov 2021 10:18:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637144302; bh=sFPbZpv+hhGRrZ7vCbVVyVubQELA8pnSw7Um0qQ3f38=; h=Date:To:From:Reply-To:Subject:From; b=kU/1y6Ctm8U+szrcNLaTRDeU8GBUoGbBgo0OcZq52LLCsFPybM3k99irLqIUJxkAi 9r3g46+tgN4p/GdhjY0AvKXg+1kmpP3aFK2q6gzMmz7HHhuOj7SIH8BBpm+38ARGB+ cSnSM+fvJNd5WKsho1TkEnJchdV8Ks0HV9rwIR6w= 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/audio.scm (callaudiod): New variable. --- 2.33.0 diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4b1a602804..1ec0854285 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -1026,6 +1027,33 @@ (define-public calf ;; The plugins are released under LGPLv2.1+ (license (list license:lgpl2.1+ license:gpl2+)))) +(define-public callaudiod + (package + (name "callaudiod") + (version "0.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mobian1/callaudiod") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04pn6f9p2n0qsy7cbchmnqlmjfvn908vdryc4y38srnj3xiq212l")))) + (build-system meson-build-system) + (native-inputs `(("alsa-lib" ,alsa-lib) + ("glib" ,glib) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config) + ("pulseaudio" ,pulseaudio))) + (inputs `(("alsa-utils" ,alsa-utils) + ("pulseaudio" ,pulseaudio))) + (synopsis "Call audio routing daemon") + (description "This package provides a daemon for dealing with audio routing +during phone calls. It provides a D-Bus interface.") + (home-page "https://gitlab.com/mobian1/callaudiod") + (license license:gpl3+))) + (define-public caps-plugins-lv2 (package (name "caps-plugins-lv2") From patchwork Wed Nov 17 10:19:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34568 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 924B227BBE3; Wed, 17 Nov 2021 10:20:35 +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 15E5E27BBE1 for ; Wed, 17 Nov 2021 10:20:35 +0000 (GMT) Received: from localhost ([::1]:51788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnI3O-000647-A0 for patchwork@mira.cbaines.net; Wed, 17 Nov 2021 05:20:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnI2s-000616-O2 for guix-patches@gnu.org; Wed, 17 Nov 2021 05:20:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48703) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnI2s-0000k3-Dg for guix-patches@gnu.org; Wed, 17 Nov 2021 05:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnI2s-0000Gx-9L for guix-patches@gnu.org; Wed, 17 Nov 2021 05:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44400] [PATCH v2 4/4] WIP: gnu: Add phosh. 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:20:02 +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.1637144368982 (code B ref 44400); Wed, 17 Nov 2021 10:20:02 +0000 Received: (at 44400) by debbugs.gnu.org; 17 Nov 2021 10:19:28 +0000 Received: from localhost ([127.0.0.1]:60249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnI2K-0000Fl-Cf for submit@debbugs.gnu.org; Wed, 17 Nov 2021 05:19:28 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:34746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnI2I-0000FU-MB for 44400@debbugs.gnu.org; Wed, 17 Nov 2021 05:19:27 -0500 Date: Wed, 17 Nov 2021 10:19:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637144355; bh=uOEISYr4LzEMAGAWdnQ+7RGSL3w4lkN7k0J2fHui2GI=; h=Date:To:From:Reply-To:Subject:From; b=m7vnaCGzUtuKLj/m6MhmbTnnVSGGEMXXWfM9X8S50oDZhj47pFjf8wQfMzAVZIpFz mL22PyMZGdipvXFurxcE47KvyU/VUA1BWUlHBvNbzcXDTCphEZaWRglEgsKQQlm5DY hvf3E+5yZmL/bdd7yoC0ib/4aPx+d71bTmrS48Zc= 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 (phosh): New variable. --- 2.33.0 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9348cf356e..7d9fcce229 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -83,6 +83,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages admin) #:use-module (gnu packages aidc) #:use-module (gnu packages aspell) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages backup) @@ -1278,6 +1279,96 @@ (define-public phodav (home-page "https://wiki.gnome.org/phodav") (license license:lgpl2.1+))) +(define-public phosh + (package + (name "phosh") + (version "0.14.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/Phosh/phosh") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fhp2jmwjzzxd66b4figc2wdpzdjycpq3cf4lx3z04dzl9vmw65a")))) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-next + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'get-libgnome-volume-control + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "libgnome-volume-control-source") + "subprojects/gvc"))) + (add-after 'unpack 'get-libcall-ui + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "libcall-ui") + "subprojects/libcall-ui"))) + (add-after 'unpack 'patch-systemd + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("libsystemd_dep") "#libsystemd_dep")) + (substitute* "src/meson.build" + (("libsystemd_dep") "#libsystemd_dep")))) + (add-before 'configure 'fix-phoc-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "data/phosh.in" + (("@bindir@") (string-append (assoc-ref inputs "phoc") "/bin"))))) + (delete 'check) ; TODO: needs a running wayland compositor + ))) + (native-inputs + `(("gcr" ,gcr) + ("gettext" ,gettext-minimal) + ("git" ,git) + ("glib:bin" ,glib "bin") + ("gnome-desktop" ,gnome-desktop) + ("gtk+:bin" ,gtk+ "bin") + ("libgnome-volume-control-source" ; needs to be present in subprojects/gvc folder + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/libgnome-volume-control.git") + (commit "ae1a34aafce7026b8c0f65a43c9192d756fe1057"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0a4qh5pgyjki904qf7qmvqz2ksxb0p8xhgl2aixfbhixn0pw6saw")))) + ("libcall-ui" ; needs to be present in subprojects/libcall-ui folder + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/Phosh/libcall-ui") + (commit "465f6add090b623fb80c6c5cbb9ab2880ff531a4"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1as857npl2yra4zh4bfph9wvhvjck53i2qp3zzbv3mbpi36nscfr")))) + ("callaudiod" ,callaudiod) + ("libsecret" ,libsecret) + ("linux-pam" ,linux-pam) + ("network-manager" ,network-manager) + ("pkg-config" ,pkg-config) + ("polkit" ,polkit) + ("upower" ,upower))) + (inputs + `(("feedbackd" ,feedbackd) + ("libhandy" ,libhandy) + ("libgudev" ,libgudev) + ("pulseaudio" ,pulseaudio))) + (propagated-inputs + ;; "missing" schema files + ;; org.gnome.DejaDup.File org.guido-berhoerster.code.package-update-indicator org.blueberry + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ;org.gnome.desktop.wm.keybindings + ("gnome-session" ,gnome-session) + ("mutter" ,mutter) ;org.gnome.mutter.keybindings + ("network-manager-applet" ,network-manager-applet) ;org.gnome.nm-applet + ("phoc" ,phoc))) ;sm.puri.phoc + (synopsis "Wayland shell for GNOME on mobile devices") + (description "Phosh is a pure Wayland prototype intended for mobile devices.") + (home-page "https://gitlab.gnome.org/World/Phosh/phosh") + (license license:gpl3+))) + (define-public gnome-color-manager (package (name "gnome-color-manager")