From patchwork Sun Nov 28 10:46:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34847 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 7817927BBEA; Sun, 28 Nov 2021 10:47:19 +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 DCCF427BBE9 for ; Sun, 28 Nov 2021 10:47:18 +0000 (GMT) Received: from localhost ([::1]:57336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrHiI-0002TW-2L for patchwork@mira.cbaines.net; Sun, 28 Nov 2021 05:47:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrHi2-0002TL-A2 for guix-patches@gnu.org; Sun, 28 Nov 2021 05:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrHi2-000302-1P for guix-patches@gnu.org; Sun, 28 Nov 2021 05:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrHi1-0004pM-Pc for guix-patches@gnu.org; Sun, 28 Nov 2021 05:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44400] [PATCH v2 4/4] WIP: gnu: Add phosh. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Nov 2021 10:47: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: Jonathan Brielmaier Cc: "44400@debbugs.gnu.org" <44400@debbugs.gnu.org> Received: via spool by 44400-submit@debbugs.gnu.org id=B44400.163809638918464 (code B ref 44400); Sun, 28 Nov 2021 10:47:01 +0000 Received: (at 44400) by debbugs.gnu.org; 28 Nov 2021 10:46:29 +0000 Received: from localhost ([127.0.0.1]:35023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrHhU-0004ni-9e for submit@debbugs.gnu.org; Sun, 28 Nov 2021 05:46:28 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:21779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrHhR-0004nH-Uj for 44400@debbugs.gnu.org; Sun, 28 Nov 2021 05:46:27 -0500 Date: Sun, 28 Nov 2021 10:46:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1638096374; bh=iYlFKf+t5guc7wY1EWCm0JT/jn7ehIc7EjiU//NZJM8=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=EKBKfv+wlRDvZgLpTXYQZDietzyfvaq1XyOP2W0WiQ8euI7ZEfokn0BUkfFzFNEHc 3i6ACVbsWD9xDPkTtYAF63hnMvymauvPQc0rO687JEDU8RvtDvpoLpzDfaT5c5okVa rulsoGQqKPL28h4otikAAk4x976iwtIqfNyLFMfY= Message-ID: In-Reply-To: References: <20201102221301.23038-1-jonathan.brielmaier@web.de> 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 Hi Johnatan, I've managed to substitute the systemd dependency for elogind. So the phosh package now builds. However, there is some error regarding the glib schema. I haven't worked that much with glib so that's the next thing on my list. I'm posting the error in case you know how to fix that and you'll find the patch attached as well. $ /gnu/store/z5dfz6hf9wb5jbndrkzhlc1yzgdqjjak-phosh-0.14.0/libexec/phosh (phosh:8740): phosh-keyboard-events-WARNING **: 13:40:53.719: Skipping grab manager due to missing phosh_private protocol extension (phosh:8740): GLib-GIO-ERROR **: 13:40:53.722: Settings schema 'sm.puri.phosh' is not installed Trace/breakpoint trap cylon2p0@rocinante ~/guix/gnu/packages$ /gnu/store/z5dfz6hf9wb5jbndrkzhlc1yzgdqjjak-phosh-0.14.0/libexec/phosh (phosh:10766): phosh-keyboard-events-WARNING **: 15:23:33.151: Skipping grab manager due to missing phosh_private protocol extension (phosh:10766): GLib-GIO-ERROR **: 15:23:33.154: Settings schema 'sm.puri.phosh' is not installed ---- Petr From 9aefa3e4a808d0e49040ea16ebd3660e75133121 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 17 Nov 2021 11:14:15 +0100 Subject: [PATCH v3] WIP: gnu: Add phosh. * gnu/packages/gnome.scm (phosh): New variable. diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9348cf356e..a0d4e90927 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,102 @@ (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"))) + ;; we use elogind instead of systemd + (add-after 'unpack 'patch-systemd + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("libsystemd") "libelogind")) + (substitute* "src/meson.build" + (("libsystemd_dep") "libelogind_dep")) + (substitute* "src/util.c" + (("systemd/sd-login.h") "elogind/sd-login.h")) + (substitute* "src/main.c" + (("systemd/sd-daemon.h") "elogind/sd-daemon.h")))) + (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 + `(("elogind" ,elogind) + ("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") -- 2.33.0