From patchwork Sun Feb 28 22:37:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 27355 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 D92BC27BC4C; Sun, 28 Feb 2021 22:39:32 +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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 1092E27BC4E for ; Sun, 28 Feb 2021 22:39:32 +0000 (GMT) Received: from localhost ([::1]:54654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGUip-00005e-0x for patchwork@mira.cbaines.net; Sun, 28 Feb 2021 17:39:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGUiQ-0008VB-06 for guix-patches@gnu.org; Sun, 28 Feb 2021 17:39:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGUiP-0004Hx-Me for guix-patches@gnu.org; Sun, 28 Feb 2021 17:39:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lGUiP-0002O3-KV for guix-patches@gnu.org; Sun, 28 Feb 2021 17:39:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44492] [PATCH v2 28/52] gnu: Add rust-pangocairo-0.10. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Feb 2021 22:39:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo To: 44492@debbugs.gnu.org Received: via spool by 44492-submit@debbugs.gnu.org id=B44492.16145519189080 (code B ref 44492); Sun, 28 Feb 2021 22:39:05 +0000 Received: (at 44492) by debbugs.gnu.org; 28 Feb 2021 22:38:38 +0000 Received: from localhost ([127.0.0.1]:47440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGUhx-0002MH-NY for submit@debbugs.gnu.org; Sun, 28 Feb 2021 17:38:38 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:47475) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGUhp-0002Lo-Mh for 44492@debbugs.gnu.org; Sun, 28 Feb 2021 17:38:30 -0500 Received: from localhost.localdomain (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4Dpdb70PPSz1LBRw for <44492@debbugs.gnu.org>; Sun, 28 Feb 2021 23:38:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4Dpdb70PPSz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1614551907; bh=G0x5vbwhfWAYOJWNOKEi+z1wPRTZgYyIfAluYANsdEc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=H5VRJlX+WpShceRRuksECOd9HWYeuCe0bh6OFp6ybsQ/uuynhseJ1DfRwSej1fsst zwkDdioSxI8NCf7d0Fkooq8Utz+yVIKkwzO44XV/XfOdPGRXYJiHktHLqpAhLCaEbw CoLaFbHMy4ayraggy57EsjwBmFi6mcpQs9qYbKUo= From: Leo Prikler Date: Sun, 28 Feb 2021 23:37:48 +0100 Message-Id: <20210228223749.12444-9-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.30.1 In-Reply-To: <87sg5lhemw.fsf@nicolasgoaziou.fr> References: <87sg5lhemw.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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/crates-gtk.scm (rust-pangocairo-0.10): New variable. --- gnu/packages/crates-gtk.scm | 61 ++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 42bfadb54b..d187b098c7 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1738,8 +1738,61 @@ converts raw links to http links and strips unwanted tags.") (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-pangocairo-0.10 + (package + (name "rust-pangocairo") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10z8hlc82984nwvy5pnyh95ls9s5r1qrlkpn14zh4pjsl1ksxx80")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.9) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.10) + ("rust-glib" ,rust-glib-0.10) + ("rust-glib-sys" ,rust-glib-sys-0.10) + ("rust-gobject-sys" ,rust-gobject-sys-0.10) + ("rust-gtk-rs-lgpl-docs" + ,rust-gtk-rs-lgpl-docs-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.9) + ("rust-pango-sys" ,rust-pango-sys-0.10) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.11)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'fix-version-requirements + (lambda* (#:key inputs vendor-dir #:allow-other-keys) + (substitute* + (map + (lambda (dir) (string-append dir "/Cargo.toml")) + (find-files vendor-dir "system-deps.*" #:directories? #t)) + (("0.0.10") ,(package-version rust-version-compare-0.0))) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("glib" ,glib) + ("pango" ,pango))) + (home-page "http://gtk-rs.org/") + (synopsis "Rust bindings for the PangoCairo library") + (description + "Rust bindings for the PangoCairo library.") + (license license:expat))) + (define-public rust-pangocairo-0.9 (package + (inherit rust-pangocairo-0.10) (name "rust-pangocairo") (version "0.9.0") (source @@ -1751,7 +1804,6 @@ converts raw links to http links and strips unwanted tags.") (sha256 (base32 "0bap3h78hdqdyln58349qjjbcv45m8a0a16c4n9fprdj1my0gldx")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -1768,12 +1820,7 @@ converts raw links to http links and strips unwanted tags.") #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (inputs - `(("gtk+" ,gtk+))) - (home-page "http://gtk-rs.org/") - (synopsis "Rust bindings for the PangoCairo library") - (description - "Rust bindings for the PangoCairo library.") - (license license:expat))) + `(("gtk+" ,gtk+))))) (define-public rust-pangocairo-0.8 (package