From patchwork Sun Jan 15 02:32:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46126 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 0A17127BBED; Sun, 15 Jan 2023 02:34:14 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7E48C27BBE9 for ; Sun, 15 Jan 2023 02:34:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGsqR-0001Xc-H7; Sat, 14 Jan 2023 21:34:03 -0500 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 1pGsqQ-0001XS-AP for guix-patches@gnu.org; Sat, 14 Jan 2023 21:34:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGsqQ-000498-0K for guix-patches@gnu.org; Sat, 14 Jan 2023 21:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGsqP-00013m-RI for guix-patches@gnu.org; Sat, 14 Jan 2023 21:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH staging] gnu: shared-mime-info: Update to 2.2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jan 2023 02:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16737499863996 (code B ref -1); Sun, 15 Jan 2023 02:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jan 2023 02:33:06 +0000 Received: from localhost ([127.0.0.1]:55869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGspV-00012N-Ea for submit@debbugs.gnu.org; Sat, 14 Jan 2023 21:33:05 -0500 Received: from lists.gnu.org ([209.51.188.17]:48836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGspQ-00011u-04 for submit@debbugs.gnu.org; Sat, 14 Jan 2023 21:33:03 -0500 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 1pGspP-0001SW-OH for guix-patches@gnu.org; Sat, 14 Jan 2023 21:32:59 -0500 Received: from smtpmciv7.myservices.hosting ([185.26.106.202]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGspN-0003uP-Q8 for guix-patches@gnu.org; Sat, 14 Jan 2023 21:32:59 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv7.myservices.hosting (Postfix) with ESMTP id 79F2720C83 for ; Sun, 15 Jan 2023 03:32:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 20DCE80096; Sun, 15 Jan 2023 03:32:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id uQmkfT4LLPZu; Sun, 15 Jan 2023 03:32:53 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id CBCA180093; Sun, 15 Jan 2023 03:32:52 +0100 (CET) From: Bruno Victal Date: Sun, 15 Jan 2023 02:32:50 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.106.202; envelope-from=mirai@makinata.eu; helo=smtpmciv7.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (shared-mime-info): Update to 2.2. [source]: Switch to git source. [build-system]: Switch to meson. [arguments]: Enable parallel builds. Patch source for docbook-xml. [native-inputs]: Switch to new style. Add python, perl, xmlto, docbook-xml-4.1.2 and docbook-xsl. --- gnu/packages/gnome.scm | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) base-commit: d9bcd1a8d6300b79f5884e48b2cefff05de8dce4 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 09b8056cc9..aedd1df17f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2022 Rene Saavedra ;;; Copyright © 2022 Alexandros Theodotou ;;; Copyright © 2022 Arjan Adriaanse +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -2920,26 +2921,38 @@ (define-public tango-icon-theme (define-public shared-mime-info (package (name "shared-mime-info") - (version "1.15") + (version "2.2") (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" - "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version - ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/xdg/shared-mime-info.git") + ;; XXX: needs to fetch submodule 'xdgmime' which is not independent + (recursive? #t) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) + "04dfnnflspprxg7qia3whz1754lfvgi4ihvmihg379936zy5xd22")))) (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) + (list + #:phases + #~(modify-phases %standard-phases + ;; FIXME: xdgmime presence is required for building but + ;; it can also be built to provide additional tests. + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + ;; FIXME: xmlto fails to find docbook DTDs because + ;; there's no xmlcatalog available for docbook-4.1.2. + ;; Modify the man XML otherwise xmlto tries to access the network + (substitute* "data/shared-mime-info-spec.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append #$docbook-xml "/xml/dtd/docbook/")))))))) + (build-system meson-build-system) (inputs (list glib libxml2)) (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) + (list gettext-minimal itstool pkg-config python perl xmlto + docbook-xml-4.1.2 docbook-xsl)) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description