From patchwork Sat May 4 11:35:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 64041 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 2B88A27BBE9; Sat, 4 May 2024 12:39:47 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 15F9227BBE2 for ; Sat, 4 May 2024 12:39:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3Djq-0004qv-JO; Sat, 04 May 2024 07:39:34 -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 1s3Dj9-0004Sg-6v for guix-patches@gnu.org; Sat, 04 May 2024 07:38:51 -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 1s3Dj8-0006dM-DI for guix-patches@gnu.org; Sat, 04 May 2024 07:38:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s3DjT-0004cs-VM; Sat, 04 May 2024 07:39:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69257] [PATCH rust-team v3 75/75] gnu: Add fractal. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sat, 04 May 2024 11:39:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69257 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69257@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus Received: via spool by 69257-submit@debbugs.gnu.org id=B69257.171482270717592 (code B ref 69257); Sat, 04 May 2024 11:39:11 +0000 Received: (at 69257) by debbugs.gnu.org; 4 May 2024 11:38:27 +0000 Received: from localhost ([127.0.0.1]:53105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s3Dil-0004Zb-4v for submit@debbugs.gnu.org; Sat, 04 May 2024 07:38:27 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52289 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s3DiI-0004OB-Qv for 69257@debbugs.gnu.org; Sat, 04 May 2024 07:37:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1714822652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CClD8w8qP/iWcjb/nnAA/Muo9jYNp/vr4cRzmfkC5hg=; b=X7cbOUYVIswL2AOWHmA+ASPghv/DA65Mc0STMnIfzsMyQoaM8pfbO9lk4hynF5umXDQwpz 29rXE3ilQ6N5usCb1gzPdHvfPw0qVlfPnwDz7wHyMmk9EyLYYEAjUN1WVxHJpC2vBza3Li Zn//FAuqSFktysB6up090/jmOsVDiWh6GjHBRbHczbD0VLBbMneSygKNNCIIqDEmp9ibJT FLkF+ApbXFltni98yeYoBPNGbAealrEMt7lQT67tWPnVYesLG7EJvUqXc2H9/hHra2+E5o 3/7n5qqiPFeAAGmIhjQYTjUexKvWBzd04dxxNnBxb+KEU49Atxx1RUw30hD5Kg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4b9f0d6c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <69257@debbugs.gnu.org>; Sat, 4 May 2024 11:37:32 +0000 (UTC) Date: Sat, 4 May 2024 13:35:47 +0200 Message-ID: <5a98b7a98d87debeac04ba8442fdf630a4d23aa4.1714820131.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/packages/gnome.scm (fractal): Add variable. --- gnu/packages/gnome.scm | 144 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 42f758f8d8..c445dbb8ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -78,6 +78,7 @@ ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Zhu Zihao ;;; Copyright © 2024 Dariqq +;;; Copyright © 2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -356,6 +357,149 @@ (define-public brasero features to enable users to create their discs easily and quickly.") (license license:gpl2+))) +(define-public fractal + (package + (name "fractal") + (version "6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/fractal") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q6r4y11jrirfhb8lw1r0bnvwzr4dpkhdi2mdig6gnbcjvcwc65m")) + (modules '((guix build utils))) + (snippet '(begin + (substitute* "Cargo.toml" + ;; Use the version used by Matrix SDK. + (("qrcode = \"0.12\"") "qrcode = \"0.13\"") + ;; Use vendored matrix-sdk. + ((".*(git|rev) =.*") "") + (("\\[dependencies.matrix-sdk\\]" all) + (string-append all "\nversion = \"0.7.1\"")) + (("\\[dependencies.matrix-sdk-ui\\]" all) + (string-append all "\nversion = \"0.7.0\""))) + ;; Adjust to ashpd 0.6.2 API change. + (substitute* "src/system_settings/linux.rs" + (("with_args") "with_args::") + (("ClockFormat::try_from.*") "setting {")))))) + (build-system cargo-build-system) + (arguments + `(#:install-source? #f + #:modules ((guix build cargo-build-system) + ((guix build meson-build-system) #:prefix meson:) + (guix build utils)) + #:imported-modules ((guix build cargo-build-system) + (guix build cargo-utils) + (guix build json) + ,@%meson-build-system-modules) + #:cargo-inputs + (("rust-ashpd" ,rust-ashpd-0.6) + ("rust-djb-hash" ,rust-djb-hash-0.1) + ("rust-eyeball-im" ,rust-eyeball-im-0.4) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-geo-uri" ,rust-geo-uri-0.2) + ("rust-gettext-rs" ,rust-gettext-rs-0.7) + ("rust-gstreamer" ,rust-gstreamer-0.21) + ("rust-gstreamer-base" ,rust-gstreamer-base-0.21) + ("rust-gst-plugin-gtk4" ,rust-gst-plugin-gtk4-0.11) + ("rust-gstreamer-pbutils" ,rust-gstreamer-pbutils-0.21) + ("rust-gstreamer-play" ,rust-gstreamer-play-0.21) + ("rust-gstreamer-video" ,rust-gstreamer-video-0.21) + ("rust-gtk" ,rust-gtk4-0.7) + ("rust-html-escape" ,rust-html-escape-0.2) + ("rust-html2pango" ,rust-html2pango-0.6) + ("rust-html5gum" ,rust-html5gum-0.5) + ("rust-image" ,rust-image-0.24) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-libadwaita" ,rust-libadwaita-0.5) + ("rust-libshumate" ,rust-libshumate-0.4) + ("rust-matrix-sdk" ,rust-matrix-sdk-0.7) + ("rust-matrix-sdk-ui" ,rust-matrix-sdk-ui-0.7) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-oo7" ,rust-oo7-0.2) + ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9) + ("rust-qrcode" ,rust-qrcode-0.13) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-rmp-serde" ,rust-rmp-serde-1) + ("rust-rqrr" ,rust-rqrr-0.6) + ("rust-ruma" ,rust-ruma-0.9) + ("rust-secular" ,rust-secular-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sourceview5" ,rust-sourceview5-0.7) + ("rust-strum" ,rust-strum-0.25) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) + ("rust-url" ,rust-url-2)) + #:phases + (modify-phases %standard-phases + (add-before 'build 'configure-meson + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (apply (assoc-ref meson:%standard-phases 'configure) + #:build-type "debugoptimized" + #:configure-flags '() + args) + (install-file "../source/.cargo/config" "cargo-home") + (copy-recursively "../source/guix-vendor" "guix-vendor"))) + ;; Build and install desktop, GSettings, and GResource files. + (replace 'build + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (apply (assoc-ref meson:%standard-phases 'build) args))) + ;; TODO: also try cargo test with --manifest specified. + (replace 'check + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (apply (assoc-ref meson:%standard-phases 'check) + #:test-options '() + args))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (apply (assoc-ref meson:%standard-phases 'install) args))) + (add-after 'install 'glib-or-gtk-wrap + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (apply (assoc-ref meson:%standard-phases 'glib-or-gtk-wrap) + #:inputs inputs + #:outputs outputs + args)))))) + (native-inputs (list meson ninja pkg-config)) + (inputs + (list cairo + clang + desktop-file-utils + gdk-pixbuf + gettext-minimal + glib + (list glib "bin") + graphene + gsettings-desktop-schemas + gst-plugins-bad-minimal + gst-plugins-base + gstreamer + gtk + (list gtk "bin") + gtksourceview + libadwaita + libshumate + openssl + pango + pipewire + xdg-desktop-portal)) + (home-page "https://gitlab.gnome.org/World/fractal") + (synopsis "Matrix messaging app for GNOME written in Rust") + (description + "Fractal is a Matrix messaging app for GNOME written in Rust. Its +interface is optimized for collaboration in large groups, such as free +software projects, and will fit all screens, big or small.") + (license license:gpl3+))) + ;;; Minimal variant, used to break a cycle with Inkscape. (define-public libcloudproviders-minimal (package