From unknown Tue Sep 09 00:44:19 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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(-) 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 base-commit: d9bcd1a8d6300b79f5884e48b2cefff05de8dce4 -- 2.38.1 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH staging] gnu: shared-mime-info: Update to 2.2. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 00:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 60826@debbugs.gnu.org Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.16794463619269 (code B ref 60826); Wed, 22 Mar 2023 00:53:01 +0000 Received: (at 60826) by debbugs.gnu.org; 22 Mar 2023 00:52:41 +0000 Received: from localhost ([127.0.0.1]:32955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pemiX-0002PP-5Z for submit@debbugs.gnu.org; Tue, 21 Mar 2023 20:52:41 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:44870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pemiW-0002PD-8s for 60826@debbugs.gnu.org; Tue, 21 Mar 2023 20:52:40 -0400 Received: by mail-qv1-f48.google.com with SMTP id 59so5375575qva.11 for <60826@debbugs.gnu.org>; Tue, 21 Mar 2023 17:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679446354; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=S2YjJFXEZWKrPCwH0U4R5g68WS+VuBc0cbOkcrtXMiw=; b=nUuM8N9SxE7/AbA3hC5kfANZ8Cyuw6cm6qcTr+Rl/IH9YleySXPTtZ17anhsCiCj0Q GSBRz3sagEJaZCFBIcyCIrah3z6sgnr0WMURhXO4TOaSTSAFH+B9RwfWaJwyyK4Gdz3n mY/NLO/a10V9qznh2pOnBhEpPuHD4CVOvAMrG0Qu5U1QQdAZDsdyGiGyWpq0Kvs2qVOV rkQe7O+vnsBaWcxBJ3ihj4Y5lrcJS3WUGQ9qpC81YexRqcVhaecNNSrG98+dMphwzySR Kh6uNfU/yRzVNb/Q9OHE/iH3+s3rrekw6cjmtPdfhoGlTHxySRFiV6+HFBtkHGdl7AcI 5bnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679446354; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=S2YjJFXEZWKrPCwH0U4R5g68WS+VuBc0cbOkcrtXMiw=; b=WRolZr6iDRd/ziZtfhRWEefW1ajB3g/DyuSh6vsHD2GUnssbTZaQxVgEhH25FoyRSW WaxLOrW6MKrF9Wu5vwLozmmJx6LdQI07m5J/l629vhhLuOCX2c34eCUbFdvsqa8QOlSp xc/OG5ssG1ucxAa1Ldjy9PVkZvufmWnDQGeKKiTsLqdGlvlcgzPswj1zDRVb8RmNtX3z dJNAtrsVxXhGGgxIUVc+fnGp08NbL/bRhFia0FtkMOeJjH8vJqhq0ZGavGTWXB94/6kJ x/FkF1aaNkoZEKMfkEMAlqW/cfvz/g0oIhZdMx+LUq/97HIU5QGTPq8pc/TK1PIOp+Hs E2IA== X-Gm-Message-State: AO0yUKWODGstCFhBWZGKuyzHzk9SKFb9OLeiDFzgf+vUkTb/e0SLk7yq EgV1GAySfaZwn8tpuONaeT0MKNi7dBTxvg== X-Google-Smtp-Source: AK7set8HZY3cHmygTaZEA5nv+xMk/a4KuiBOLB9LP2JvZ9NWl5WPTFSLG0BwozCbmwdv6wxp+XoJwA== X-Received: by 2002:a05:6214:4002:b0:5ac:d877:43c1 with SMTP id kd2-20020a056214400200b005acd87743c1mr2792234qvb.40.1679446354235; Tue, 21 Mar 2023 17:52:34 -0700 (PDT) Received: from hurd (dsl-10-130-195.b2b2c.ca. [72.10.130.195]) by smtp.gmail.com with ESMTPSA id r20-20020a37a814000000b00746ae84ea6csm153661qke.3.2023.03.21.17.52.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 17:52:33 -0700 (PDT) From: Maxim Cournoyer References: Date: Tue, 21 Mar 2023 20:52:32 -0400 In-Reply-To: (Bruno Victal's message of "Sun, 15 Jan 2023 02:32:50 +0000") Message-ID: <87pm91li9b.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Bruno Victal writes: > * 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(-) > > 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 =C2=A9 2022 Rene Saavedra > ;;; Copyright =C2=A9 2022 Alexandros Theodotou > ;;; Copyright =C2=A9 2022 Arjan Adriaanse > +;;; Copyright =C2=A9 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 n= ot independent What do you mean by "not independent"; do you mean that it's been patched/customized by this project? > + (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. Sorry, but I don't understand; could you try rephrase that comment? :-) > + (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 The last sentence of the comment misses a period. > + (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-in= fo") > (synopsis "Database of common MIME types") > (description --=20 Thanks, Maxim From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH v2] gnu: shared-mime-info: Update to 2.2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jun 2023 01:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168696519110923 (code B ref 60826); Sat, 17 Jun 2023 01:27:02 +0000 Received: (at 60826) by debbugs.gnu.org; 17 Jun 2023 01:26:31 +0000 Received: from localhost ([127.0.0.1]:50630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAKhy-0002q7-5Q for submit@debbugs.gnu.org; Fri, 16 Jun 2023 21:26:30 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:39146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAKhu-0002pv-WB for 60826@debbugs.gnu.org; Fri, 16 Jun 2023 21:26:28 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 7BF0D20F1B; Sat, 17 Jun 2023 03:26:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id B042880097; Sat, 17 Jun 2023 03:26:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id kUhSkZHxq45t; Sat, 17 Jun 2023 03:26:24 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id EA9DA80060; Sat, 17 Jun 2023 03:26:23 +0200 (CEST) From: Bruno Victal Date: Sat, 17 Jun 2023 02:26:23 +0100 Message-Id: <3e142d3b4f560ec3dc55d3356d6ede44a727916b.1686964927.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (shared-mime-info): Update to 2.2. [source]: Switch to git source. Patch xdgmime location. [build-system]: Switch to meson. [arguments]: Enable parallel builds. Do not patch test files. [native-inputs]: Switch to new style. Add python, xmlto, docbook-xml-4.1.2 and docbook-xsl. (xdgmime): New variable. --- Notable changes since v1: * Rebased against gnome-team. (this package should probably be relocated to freedesktop.scm instead) * Refactored package definition. (the testsuite now works!) * Removed nonsense comments present in v1. (leftovers from squashing?) gnu/packages/gnome.scm | 92 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6db2d6569e..58d0e25c1d 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 ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Dominik Delgado Steuter @@ -2913,29 +2914,94 @@ (define-public tango-icon-theme guidelines.") (license license:public-domain))) +;; Private package used by shared-mime-info. +(define xdgmime + ;; No public release, match commit to the one used in the + ;; shared-mime-info release. + (let ((commit "de283fc430460b9b3a7e61432a6d273cd64cb102") + (revision "1")) + (package + (name "xdgmime") + ;; set version to 0.0 and change commit instead + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/xdg/xdgmime.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m9k7nfxgchb9j0xh9cwsldz6564qisqdkvlhgkcgc0grd4nfbn9")) + (modules '((guix build utils))) + (snippet + #~(substitute* "src/Makefile" + (("all: (.+)$" all targets) + (format #f "~a +install: ~a +~/install -Dm755 -t $(DESTDIR)/bin $^~%" all targets)))))) + (arguments + (list + #:tests? #f ; no tests + #:make-flags #~(list (string-append "DESTDIR=" #$output) + #$(string-append "CC=" (cc-for-target))) + #:phases + #~(modify-phases %standard-phases + ;; Package uses a hand-crafted Makefile. + (delete 'configure) + ;; Use the patched install rule in src/Makefile. + (add-before 'install 'change-directory + (lambda _ + (chdir "src")))))) + (build-system gnu-build-system) + (home-page "https://gitlab.freedesktop.org/xdg/xdgmime/") + (synopsis "Module that parses the freedesktop.org MIME spec") + (description "This module is used for shared-mime-info package tests.") + (license (list license:lgpl2.1+ license:artistic2.0))))) + (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") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) + "04dfnnflspprxg7qia3whz1754lfvgi4ihvmihg379936zy5xd22")) + (modules '((guix build utils))) + ;; Override the suffix assumed by meson.build. + (snippet + #~(substitute* "meson.build" + (("^(xdgmime = get_option\\('xdgmime-path'\\)) / 'src'" + _ stem) + stem))))) (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) + (list + #:configure-flags + #~(list (string-append "-Dxdgmime-path=" + #$(this-package-native-input "xdgmime") + "/bin")) + #:phases + #~(modify-phases %standard-phases + ;; Don't patch shebangs for the test files. + (replace 'patch-source-shebangs + (lambda* (#:key source #:allow-other-keys) + (let ((pred (lambda (file stat) + (and (eq? 'regular (stat:type stat)) + (not (string-prefix? "./tests/mime-detection" + file)))))) + (for-each patch-shebang + (find-files "." pred #:stat lstat)))))))) + (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 xmlto + docbook-xml-4.1.2 docbook-xsl xdgmime)) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description base-commit: 909788c0aebd8098084c009afa98d1209c9ec869 -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH v2] gnu: shared-mime-info: Update to 2.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jun 2023 04:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal , 60826@debbugs.gnu.org Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.16869772569544 (code B ref 60826); Sat, 17 Jun 2023 04:48:01 +0000 Received: (at 60826) by debbugs.gnu.org; 17 Jun 2023 04:47:36 +0000 Received: from localhost ([127.0.0.1]:50704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qANqZ-0002Tq-5B for submit@debbugs.gnu.org; Sat, 17 Jun 2023 00:47:35 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:48332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qANq0-0002SH-9H for 60826@debbugs.gnu.org; Sat, 17 Jun 2023 00:47:33 -0400 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-51a2de3385fso1998969a12.0 for <60826@debbugs.gnu.org>; Fri, 16 Jun 2023 21:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686977211; x=1689569211; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=mCkzlIJ4hEi7dETyKEYrMw8klvooOJLnmElSP2XtG1A=; b=mRBoIi1XB6ErF1dVwejznSpNp9oyJ5J5kChYXpGLLJRVATWVIoi9V8y2uRA8ixN/Qm IYaJyf2l3N+AmuMRFAPQhlRHQrK14qStmEUAsIpmNfclFRIHF5Eqdc9GmJZ99kNgaYCa egUJjLkaPhMort+6bu0p9AYAChc40A8WCO8qM/+PtAIqAImac6oIZije+grtN+Lq1om7 /FbUGD2yN3O05D+YJSFJMxD+pZ7AKSr546/Qds5K4Ge2UH75tm1HVyCsiFI5+CfeDFjc 6tWKgHXTYStXp9QD/Ia/MzdDY4YidQMuByADZbnIp1eyWhKIUt5Eh4189cQkPnSimZEN fZbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686977211; x=1689569211; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=mCkzlIJ4hEi7dETyKEYrMw8klvooOJLnmElSP2XtG1A=; b=KVGJf8L2cAytpuq0OrejHptLQHl5jX51gLfMA2w0gr8/D3QFEMGssopDFX08IMcjnJ 9HWPJ0Sh4KaqBdAbM4GO6RhjExpZdCE9Uq8cKb28O5tW7OqI4nMKCdk2EEsJdmDRq37k jg/v0bUhLehvXEdrn7kGPZG6WYcRzhbY12sKmOyKiphRs+xtd1zihFzC2kC7ZXotWLv2 lCLYcS+3uTsWaUIRbY58AqkrjmBX/lfK8HR+LpCK2Ii6rX0O/e2hljs+nex+XwTa5wUz LYuZmazMiscslnBHfQLl01x/z5C+XY9Ga2jOzdSRWmVVuLBhNtehKm78e/dwlb+p+yva wVbA== X-Gm-Message-State: AC+VfDwEKZDSo5G//jdvz0k+cO8L065Tq8ZjuO0n7TC2ZrwNmxOszgkK 7tvQyIAuqJYXHlF8YwrMbG+Ra8xb8Np2Zjcb X-Google-Smtp-Source: ACHHUZ4ZzbZx4LPln3zIkbudfLSIM8xAzfMutCpEb0TWKVf/EObu2Y8FylCrVClXQ+hqHWmPBgFJJQ== X-Received: by 2002:a2e:850c:0:b0:2b4:5cad:f24b with SMTP id j12-20020a2e850c000000b002b45cadf24bmr2147414lji.21.1686976804744; Fri, 16 Jun 2023 21:40:04 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id c16-20020a7bc010000000b003f7f60203ffsm3835665wmb.25.2023.06.16.21.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jun 2023 21:40:04 -0700 (PDT) Message-ID: <193e5926c0c9bef5f29e04b6e5cebf87539c87a2.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 17 Jun 2023 06:40:03 +0200 In-Reply-To: <3e142d3b4f560ec3dc55d3356d6ede44a727916b.1686964927.git.mirai@makinata.eu> References: <3e142d3b4f560ec3dc55d3356d6ede44a727916b.1686964927.git.mirai@makinata.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU2Ftc3RhZywgZGVtIDE3LjA2LjIwMjMgdW0gMDI6MjYgKzAxMDAgc2NocmllYiBCcnVubyBW aWN0YWw6Cj4gKiBnbnUvcGFja2FnZXMvZ25vbWUuc2NtIChzaGFyZWQtbWltZS1pbmZvKTogVXBk YXRlIHRvIDIuMi4KPiBbc291cmNlXTogU3dpdGNoIHRvIGdpdCBzb3VyY2UuIFBhdGNoIHhkZ21p bWUgbG9jYXRpb24uCj4gW2J1aWxkLXN5c3RlbV06IFN3aXRjaCB0byBtZXNvbi4KPiBbYXJndW1l bnRzXTogRW5hYmxlIHBhcmFsbGVsIGJ1aWxkcy4gRG8gbm90IHBhdGNoIHRlc3QgZmlsZXMuCj4g W25hdGl2ZS1pbnB1dHNdOiBTd2l0Y2ggdG8gbmV3IHN0eWxlLiBBZGQgcHl0aG9uLCB4bWx0bywK PiBkb2Nib29rLXhtbC00LjEuMiBhbmQgZG9jYm9vay14c2wuCj4gKHhkZ21pbWUpOiBOZXcgdmFy aWFibGUuClRoaXMgdmFyaWFibGUgc2hvdWxkIGJlIGFkZGVkIGluIGEgcGF0Y2ggMS8zLgoKPiAt LS0KPiBOb3RhYmxlIGNoYW5nZXMgc2luY2UgdjE6Cj4gKiBSZWJhc2VkIGFnYWluc3QgZ25vbWUt dGVhbS4KPiDCoCAodGhpcyBwYWNrYWdlIHNob3VsZCBwcm9iYWJseSBiZSByZWxvY2F0ZWQgdG8g ZnJlZWRlc2t0b3Auc2NtCj4gaW5zdGVhZCkKQ2FuIHlvdSBkbyB0aGlzIHJlbG9jYXRpb24gaW4g YSBwYXRjaCAzLzM/ICBXZSBvdWdodCB0byBoYXZlIHRoZQpyZXNvdXJjZXMgdG8gZG8gdGhpcyBj aGFuZ2Ugb24gdGhlIGdub21lLXRlYW0gYnJhbmNoLgoKPiAqIFJlZmFjdG9yZWQgcGFja2FnZSBk ZWZpbml0aW9uLiAodGhlIHRlc3RzdWl0ZSBub3cgd29ya3MhKQo+ICogUmVtb3ZlZCBub25zZW5z ZSBjb21tZW50cyBwcmVzZW50IGluIHYxLiAobGVmdG92ZXJzIGZyb20KPiBzcXVhc2hpbmc/KQo+ IAo+IMKgZ251L3BhY2thZ2VzL2dub21lLnNjbSB8IDkyICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0KPiAtLQo+IMKgMSBmaWxlIGNoYW5nZWQsIDc5IGluc2VydGlvbnMo KyksIDEzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ25vbWUu c2NtIGIvZ251L3BhY2thZ2VzL2dub21lLnNjbQo+IGluZGV4IDZkYjJkNjU2OWUuLjU4ZDBlMjVj MWQgMTAwNjQ0Cj4gLS0tIGEvZ251L3BhY2thZ2VzL2dub21lLnNjbQo+ICsrKyBiL2dudS9wYWNr YWdlcy9nbm9tZS5zY20KPiBAQCAtNzMsNiArNzMsNyBAQAo+IMKgOzs7IENvcHlyaWdodCDCqSAy MDIyIFJlbmUgU2FhdmVkcmEgPG5hbnV1aUBwcm90b25tYWlsLmNvbT4KPiDCoDs7OyBDb3B5cmln aHQgwqkgMjAyMiBBbGV4YW5kcm9zIFRoZW9kb3RvdSA8YWxleEB6cnl0aG0ub3JnPgo+IMKgOzs7 IENvcHlyaWdodCDCqSAyMDIyIEFyamFuIEFkcmlhYW5zZSA8YXJqYW5AYWRyaWFhbi5zZT4KPiAr Ozs7IENvcHlyaWdodCDCqSAyMDIzIEJydW5vIFZpY3RhbCA8bWlyYWlAbWFraW5hdGEuZXU+Cj4g wqA7OzsgQ29weXJpZ2h0IMKpIDIwMjMgS2FlbHluIFRha2F0YSA8a2FlbHluLmFsZXhpQHByb3Rv bm1haWwuY29tPgo+IMKgOzs7IENvcHlyaWdodCDCqSAyMDIzIEp1bGlhbmEgU2ltcyA8anVsaUBp bmNhbmEub3JnPgo+IMKgOzs7IENvcHlyaWdodCDCqSAyMDIzIERvbWluaWsgRGVsZ2FkbyBTdGV1 dGVyIDxkQGRlbGdhZG8ubnJ3Pgo+IEBAIC0yOTEzLDI5ICsyOTE0LDk0IEBAIChkZWZpbmUtcHVi bGljIHRhbmdvLWljb24tdGhlbWUKPiDCoGd1aWRlbGluZXMuIikKPiDCoMKgwqDCoCAobGljZW5z ZSBsaWNlbnNlOnB1YmxpYy1kb21haW4pKSkKPiDCoAo+ICs7OyBQcml2YXRlIHBhY2thZ2UgdXNl ZCBieSBzaGFyZWQtbWltZS1pbmZvLgo+ICsoZGVmaW5lIHhkZ21pbWUKPiArwqAgOzsgTm8gcHVi bGljIHJlbGVhc2UsIG1hdGNoIGNvbW1pdCB0byB0aGUgb25lIHVzZWQgaW4gdGhlCj4gK8KgIDs7 IHNoYXJlZC1taW1lLWluZm8gcmVsZWFzZS4KPiArwqAgKGxldCAoKGNvbW1pdCAiZGUyODNmYzQz MDQ2MGI5YjNhN2U2MTQzMmE2ZDI3M2NkNjRjYjEwMiIpCj4gK8KgwqDCoMKgwqDCoMKgIChyZXZp c2lvbiAiMSIpKQo+ICvCoMKgwqAgKHBhY2thZ2UKPiArwqDCoMKgwqDCoCAobmFtZSAieGRnbWlt ZSIpCj4gK8KgwqDCoMKgwqAgOzsgc2V0IHZlcnNpb24gdG8gMC4wIGFuZCBjaGFuZ2UgY29tbWl0 IGluc3RlYWQKPiArwqDCoMKgwqDCoCAodmVyc2lvbiAoZ2l0LXZlcnNpb24gIjAuMCIgcmV2aXNp b24gY29tbWl0KSkKPiArwqDCoMKgwqDCoCAoc291cmNlIChvcmlnaW4KPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChtZXRob2QgZ2l0LWZldGNoKQo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKHVyaSAoZ2l0LXJlZmVyZW5jZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHVybAo+ICJodHRwczovL2dpdGxhYi5mcmVlZGVza3Rv cC5vcmcveGRnL3hkZ21pbWUuZ2l0IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChjb21taXQgY29tbWl0KSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2hhMjU2Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChiYXNlMzIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oAo+ICIwbTlrN25meGdjaGI5ajB4aDljd3NsZHo2NTY0cWlzcWRrdmxoZ2tjZ2MwZ3JkNG5mYm45 IikpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobW9kdWxlcyAnKChndWl4IGJ1 aWxkIHV0aWxzKSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc25pcHBldAo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAjfihzdWJzdGl0dXRlKiAic3JjL01h a2VmaWxlIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoImFs bDogKC4rKSQiIGFsbCB0YXJnZXRzKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKGZvcm1hdCAjZiAifmEKPiAraW5zdGFsbDogfmEKPiArfi9pbnN0YWxsIC1E bTc1NSAtdCAkKERFU1RESVIpL2JpbiAkXn4lIiBhbGwgdGFyZ2V0cykpKSkpKQpXaHkgbm90IGp1 c3QgdXNlIGEgY3VzdG9tIGluc3RhbGwgcGhhc2U/Cj4gK8KgwqDCoMKgwqAgKGFyZ3VtZW50cwo+ ICvCoMKgwqDCoMKgwqAgKGxpc3QKPiArwqDCoMKgwqDCoMKgwqAgIzp0ZXN0cz8gI2bCoCA7IG5v IHRlc3RzCj4gK8KgwqDCoMKgwqDCoMKgICM6bWFrZS1mbGFncyAjfihsaXN0IChzdHJpbmctYXBw ZW5kICJERVNURElSPSIgIyRvdXRwdXQpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICMkKHN0cmluZy1hcHBlbmQgIkNDPSIgKGNjLWZv ci0KPiB0YXJnZXQpKSkKPiArwqDCoMKgwqDCoMKgwqAgIzpwaGFzZXMKPiArwqDCoMKgwqDCoMKg wqAgI34obW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqAgOzsgUGFja2FnZSB1c2VzIGEgaGFuZC1jcmFmdGVkIE1ha2VmaWxlLgo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChkZWxldGUgJ2NvbmZpZ3VyZSkKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCA7OyBVc2UgdGhlIHBhdGNoZWQgaW5zdGFsbCBydWxlIGluIHNyYy9NYWtlZmlsZS4KPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWJlZm9yZSAnaW5zdGFsbCAnY2hhbmdlLWRpcmVj dG9yeQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIF8KPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjaGRpciAic3JjIikpKSkpKQo+ICvCoMKgwqDCoMKgIChi dWlsZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKPiArwqDCoMKgwqDCoCAoaG9tZS1wYWdlICJo dHRwczovL2dpdGxhYi5mcmVlZGVza3RvcC5vcmcveGRnL3hkZ21pbWUvIikKPiArwqDCoMKgwqDC oCAoc3lub3BzaXMgIk1vZHVsZSB0aGF0IHBhcnNlcyB0aGUgZnJlZWRlc2t0b3Aub3JnIE1JTUUg c3BlYyIpCj4gK8KgwqDCoMKgwqAgKGRlc2NyaXB0aW9uICJUaGlzIG1vZHVsZSBpcyB1c2VkIGZv ciBzaGFyZWQtbWltZS1pbmZvIHBhY2thZ2UKPiB0ZXN0cy4iKQo+ICvCoMKgwqDCoMKgIChsaWNl bnNlIChsaXN0IGxpY2Vuc2U6bGdwbDIuMSsgbGljZW5zZTphcnRpc3RpYzIuMCkpKSkpCj4gKwo+ IMKgKGRlZmluZS1wdWJsaWMgc2hhcmVkLW1pbWUtaW5mbwo+IMKgwqAgKHBhY2thZ2UKPiDCoMKg wqDCoCAobmFtZSAic2hhcmVkLW1pbWUtaW5mbyIpCj4gLcKgwqDCoCAodmVyc2lvbiAiMS4xNSIp Cj4gK8KgwqDCoCAodmVyc2lvbiAiMi4yIikKPiDCoMKgwqDCoCAoc291cmNlIChvcmlnaW4KPiAt wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtZXRob2QgdXJsLWZldGNoKQo+IC3CoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKHVyaSAoc3RyaW5nLWFwcGVuZAo+IC3CoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAKPiAiaHR0cHM6Ly9naXRsYWIuZnJlZWRlc2t0b3Aub3JnL3hkZy9z aGFyZWQtbWltZS1pbmZvL3VwbG9hZHMvIgo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgImIyN2ViODhlNDE1NWQ4ZmNjYjhiYjNjZDEyMDI1ZDViL3NoYXJlZC1taW1lLQo+ IGluZm8tIiB2ZXJzaW9uCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAi LnRhci54eiIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG1ldGhvZCBnaXQtZmV0Y2gp Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodXJpIChnaXQtcmVmZXJlbmNlCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodXJsCj4gImh0dHBzOi8vZ2l0bGFiLmZy ZWVkZXNrdG9wLm9yZy94ZGcvc2hhcmVkLW1pbWUtaW5mby5naXQiKQo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbW1pdCB2ZXJzaW9uKSkpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCj4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHNoYTI1Ngo+IMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKGJhc2UzMgo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgCj4gIjE0NnZ5 bmo3OHdjd2RxMG1zNTJqem0xcjRtNmR6aTFyaHloM2g0eHliNmJ3OGNrdjEwcGwiKSkpKQo+IC3C oMKgwqAgKGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgCj4gIjA0ZGZubmZsc3BwcnhnN3FpYTN3aHoxNzU0bGZ2Z2k0aWh2bWloZzM3 OTkzNnp5NXhkMjIiKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtb2R1bGVzICcoKGd1 aXggYnVpbGQgdXRpbHMpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IE92ZXJyaWRl IHRoZSBzdWZmaXggYXNzdW1lZCBieSBtZXNvbi5idWlsZC4KPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChzbmlwcGV0Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICN+KHN1YnN0aXR1 dGUqICJtZXNvbi5idWlsZCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo KCJeKHhkZ21pbWUgPSBnZXRfb3B0aW9uXFwoJ3hkZ21pbWUtcGF0aCdcXCkpIC8KPiAnc3JjJyIK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgXyBzdGVtKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgc3RlbSkpKSkpCkdpdmVuIHRoYXQgeW91 IGFsc28gaGF2ZSB0byBmaXggc3R1ZmYgaW4gYSBwaGFzZSwgSSB0aGluayBpdCdkIGJlCmJldHRl ciB0byB1c2UgYSBwYXRjaCB0aGF0IGFsbG93cyB1c2VycyB0byBzcGVjaWZ5IGFuIHhkZ21pbWUt YmluLiAKV0RZVD8KPiDCoMKgwqDCoCAoYXJndW1lbnRzCj4gLcKgwqDCoMKgIDs7IFRoZSBidWls ZCBzeXN0ZW0gYXBwZWFycyBub3QgdG8gYmUgcGFyYWxsZWwtc2FmZS4KPiAtwqDCoMKgwqAgJygj OnBhcmFsbGVsLWJ1aWxkPyAjZikpCj4gK8KgwqDCoMKgIChsaXN0Cj4gK8KgwqDCoMKgwqAgIzpj b25maWd1cmUtZmxhZ3MKPiArwqDCoMKgwqDCoCAjfihsaXN0IChzdHJpbmctYXBwZW5kICItRHhk Z21pbWUtcGF0aD0iCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgICMkKHRoaXMtcGFja2FnZS1uYXRpdmUtaW5wdXQgInhkZ21pbWUiKQo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAiL2JpbiIpKQo+ICvCoMKgwqDCoMKgICM6cGhhc2VzCj4gK8KgwqDCoMKgwqAgI34obW9kaWZ5 LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoCA7OyBEb24ndCBw YXRjaCBzaGViYW5ncyBmb3IgdGhlIHRlc3QgZmlsZXMuCj4gK8KgwqDCoMKgwqDCoMKgwqDCoCAo cmVwbGFjZSAncGF0Y2gtc291cmNlLXNoZWJhbmdzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGxhbWJkYSogKCM6a2V5IHNvdXJjZSAjOmFsbG93LW90aGVyLWtleXMpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChsZXQgKChwcmVkIChsYW1iZGEgKGZpbGUgc3RhdCkKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChhbmQgKGVx PyAncmVndWxhciAoc3RhdDp0eXBlIHN0YXQpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChub3QgKHN0cmluZy1wcmVm aXg/ICIuL3Rlc3RzL21pbWUtCj4gZGV0ZWN0aW9uIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGZpbGUpKSkpKSkKPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChmb3ItZWFjaCBwYXRjaC1zaGViYW5nCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmaW5kLWZpbGVzICIuIiBwcmVk ICM6c3RhdCBsc3RhdCkpKSkpKSkpCj4gK8KgwqDCoCAoYnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxk LXN5c3RlbSkKQnVpbGQtc3lzdGVtIG5vcm1hbGx5IGdvZXMgYmVmb3JlIGFyZ3VtZW50cy4KPiDC oMKgwqDCoCAoaW5wdXRzCj4gwqDCoMKgwqDCoCAobGlzdCBnbGliIGxpYnhtbDIpKQo+IMKgwqDC oMKgIChuYXRpdmUtaW5wdXRzCj4gLcKgwqDCoMKgIGAoKCJnZXR0ZXh0IiAsZ2V0dGV4dC1taW5p bWFsKQo+IC3CoMKgwqDCoMKgwqAgKCJpdHN0b29sIiAsaXRzdG9vbCkKPiAtwqDCoMKgwqDCoMKg ICgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpKSkKPiArwqDCoMKgwqAgKGxpc3QgZ2V0dGV4dC1t aW5pbWFsIGl0c3Rvb2wgcGtnLWNvbmZpZyBweXRob24geG1sdG8KPiArwqDCoMKgwqDCoMKgwqDC oMKgwqAgZG9jYm9vay14bWwtNC4xLjIgZG9jYm9vay14c2wgeGRnbWltZSkpCj4gwqDCoMKgwqAg KGhvbWUtcGFnZQo+ICJodHRwczovL3d3dy5mcmVlZGVza3RvcC5vcmcvd2lraS9Tb2Z0d2FyZS9z aGFyZWQtbWltZS1pbmZvIikKPiDCoMKgwqDCoCAoc3lub3BzaXMgIkRhdGFiYXNlIG9mIGNvbW1v biBNSU1FIHR5cGVzIikKPiDCoMKgwqDCoCAoZGVzY3JpcHRpb24KPiAKPiBiYXNlLWNvbW1pdDog OTA5Nzg4YzBhZWJkODA5ODA4NGMwMDlhZmE5OGQxMjA5YzllYzg2OQpDaGVlcnMK From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v3 1/5] gnu: shared-mime-info: Move to (gnu packages freedesktop). Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Jun 2023 22:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168721244321980 (code B ref 60826); Mon, 19 Jun 2023 22:08:02 +0000 Received: (at 60826) by debbugs.gnu.org; 19 Jun 2023 22:07:23 +0000 Received: from localhost ([127.0.0.1]:57474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBN1u-0005iS-S9 for submit@debbugs.gnu.org; Mon, 19 Jun 2023 18:07:23 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:50486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBN1t-0005iK-B3 for 60826@debbugs.gnu.org; Mon, 19 Jun 2023 18:07:22 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 0022720CC5; Tue, 20 Jun 2023 00:07:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 53A0E8009D; Tue, 20 Jun 2023 00:07:18 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id k2_jgQ0oRJoj; Tue, 20 Jun 2023 00:07:17 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 761E780098; Tue, 20 Jun 2023 00:07:17 +0200 (CEST) From: Bruno Victal Date: Mon, 19 Jun 2023 23:07:04 +0100 Message-Id: <98f418fb7aece7fe76e8d1ab86fffdd604a2fcde.1687212109.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (shared-mime-info): Move to … * gnu/packages/freedesktop.scm: … here. * gnu/packages/gnuzilla.scm: Use (gnu packages freedesktop). * gnu/packages/kde-games.scm: Ditto. * gnu/packages/kde-multimedia.scm: Ditto. * gnu/packages/kde-pim.scm: Ditto. * gnu/packages/kde-utils.scm: Ditto. * gnu/packages/maths.scm: Ditto. * gnu/packages/mp3.scm: Ditto. * gnu/packages/ruby.scm: Ditto. * guix/profiles.scm (xdg-mime-database): Adjust to new location. --- Notable changes since v2: * Relocated shared-mime-info to (gnu packages freedesktop). * Prefer .patch over substitution*. * Adds a 'doc' output for shared-mime-info. * Adds a %gnu-default-modules variable. Important Notes: * gdk-pixbuf fails to build with an updated shared-mime-info, this needs to be investigated & fixed. gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 33 --------------------------------- gnu/packages/gnuzilla.scm | 1 + gnu/packages/kde-games.scm | 2 +- gnu/packages/kde-multimedia.scm | 1 + gnu/packages/kde-pim.scm | 1 + gnu/packages/kde-utils.scm | 1 + gnu/packages/maths.scm | 1 + gnu/packages/mp3.scm | 1 + gnu/packages/ruby.scm | 1 + guix/profiles.scm | 2 +- 11 files changed, 42 insertions(+), 35 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6385741d89..bd3df9ee68 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -465,6 +465,39 @@ (define-public maliit-keyboard display servers. It supports many different languages and emoji.") (license license:gpl3+))) +(define-public shared-mime-info + (package + (name "shared-mime-info") + (version "1.15") + (source (origin + (method url-fetch) + (uri (string-append + "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" + "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version + ".tar.xz")) + (sha256 + (base32 + "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) + (build-system gnu-build-system) + (arguments + ;; The build system appears not to be parallel-safe. + '(#:parallel-build? #f)) + (inputs + (list glib libxml2)) + (native-inputs + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config))) + (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") + (synopsis "Database of common MIME types") + (description + "The shared-mime-info package contains the core database of common types +and the update-mime-database command used to extend it. It requires glib2 to +be installed for building the update command. Additionally, it uses intltool +for translations, though this is only a dependency for the maintainers. This +database is translated at Transifex.") + (license license:gpl2+))) + (define-public xdg-utils (package (name "xdg-utils") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6db2d6569e..ebabd1a84e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2913,39 +2913,6 @@ (define-public tango-icon-theme guidelines.") (license license:public-domain))) -(define-public shared-mime-info - (package - (name "shared-mime-info") - (version "1.15") - (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" - "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version - ".tar.xz")) - (sha256 - (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) - (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) - (inputs - (list glib libxml2)) - (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) - (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") - (synopsis "Database of common MIME types") - (description - "The shared-mime-info package contains the core database of common types -and the update-mime-database command used to extend it. It requires glib2 to -be installed for building the update command. Additionally, it uses intltool -for translations, though this is only a dependency for the maintainers. This -database is translated at Transifex.") - (license license:gpl2+))) - (define-public system-config-printer (package (name "system-config-printer") diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e40d2b8922..4608d3d7ae 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -63,6 +63,7 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages databases) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 9be889f6aa..73fb88c4cb 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -30,7 +30,7 @@ (define-module (gnu packages kde-games) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages gl) - #:use-module ((gnu packages gnome) #:select (shared-mime-info)) + #:use-module ((gnu packages freedesktop) #:select (shared-mime-info)) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages perl) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index e3de6db432..6460345c47 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -35,6 +35,7 @@ (define-module (gnu packages kde-multimedia) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) #:use-module (gnu packages docbook) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 6f3cbf2999..dc0533d24b 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -34,6 +34,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 5774fa9910..35ad20f541 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -35,6 +35,7 @@ (define-module (gnu packages kde-utils) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cups) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) ; dbus for tests #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f89e70c0bb..8f1b88ef6b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -122,6 +122,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 7ede16f4bb..85f45d3271 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -40,6 +40,7 @@ (define-module (gnu packages mp3) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnome) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index eb84367d15..44bea787a6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -60,6 +60,7 @@ (define-module (gnu packages ruby) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages rails) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) diff --git a/guix/profiles.scm b/guix/profiles.scm index 6467e464c8..2e2466ccbc 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1562,7 +1562,7 @@ (define (xdg-mime-database manifest) "Return a derivation that builds the @file{mime.cache} database from manifest entries. It's used to query the MIME type of a given file." (define shared-mime-info ; lazy reference - (module-ref (resolve-interface '(gnu packages gnome)) 'shared-mime-info)) + (module-ref (resolve-interface '(gnu packages freedesktop)) 'shared-mime-info)) (mlet %store-monad ((glib (manifest-lookup-package manifest "glib"))) (define build base-commit: 909788c0aebd8098084c009afa98d1209c9ec869 -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v3 2/5] build: gnu: Export a %gnu-default-modules variable. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Jun 2023 22:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168721245622006 (code B ref 60826); Mon, 19 Jun 2023 22:08:02 +0000 Received: (at 60826) by debbugs.gnu.org; 19 Jun 2023 22:07:36 +0000 Received: from localhost ([127.0.0.1]:57477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBN28-0005is-IB for submit@debbugs.gnu.org; Mon, 19 Jun 2023 18:07:36 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:44806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBN26-0005ij-FG for 60826@debbugs.gnu.org; Mon, 19 Jun 2023 18:07:34 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 3E32720D81; Tue, 20 Jun 2023 00:07:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 8FD318009D; Tue, 20 Jun 2023 00:07:32 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 5pRMI1LnRS76; Tue, 20 Jun 2023 00:07:32 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id EF76580098; Tue, 20 Jun 2023 00:07:31 +0200 (CEST) From: Bruno Victal Date: Mon, 19 Jun 2023 23:07:05 +0100 Message-Id: <788ffede0cb9cdab9d7b7573de321dfd554caa0b.1687212109.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This makes tweaking the #:module argument less reliant on the programmers astral wisdom to divine the right module imports. * guix/build-system/gnu.scm (%default-modules): Rename to … (%gnu-default-modules): … this and export it as well. --- guix/build-system/gnu.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 3308302472..448a2b2a44 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -28,6 +28,7 @@ (define-module (guix build-system gnu) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (%gnu-build-system-modules + %gnu-default-modules %strip-flags %strip-directories gnu-build @@ -55,7 +56,7 @@ (define %gnu-build-system-modules (guix build gremlin) (guix elf))) -(define %default-modules +(define %gnu-default-modules ;; Modules in scope in the build-side environment. '((guix build gnu-build-system) (guix build utils))) @@ -237,7 +238,7 @@ (define* (dist-package p source #:key (phases '%dist-phases)) (arguments ;; Use the right phases and modules. (substitute-keyword-arguments (package-arguments p) - ((#:modules modules %default-modules) + ((#:modules modules %gnu-default-modules) `((guix build gnu-dist) ,@modules)) ((#:imported-modules modules %gnu-build-system-modules) @@ -360,7 +361,7 @@ (define* (gnu-build name inputs (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %gnu-build-system-modules) - (modules %default-modules) + (modules %gnu-default-modules) (substitutable? #t) allowed-references disallowed-references) @@ -500,7 +501,7 @@ (define* (gnu-cross-build name (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %gnu-build-system-modules) - (modules %default-modules) + (modules %gnu-default-modules) (substitutable? #t) allowed-references disallowed-references) -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v3 3/5] gnu: Add xdgmime. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Jun 2023 22:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168721246622030 (code B ref 60826); Mon, 19 Jun 2023 22:08:03 +0000 Received: (at 60826) by debbugs.gnu.org; 19 Jun 2023 22:07:46 +0000 Received: from localhost ([127.0.0.1]:57480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBN2H-0005jF-T0 for submit@debbugs.gnu.org; Mon, 19 Jun 2023 18:07:46 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:49562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBN2F-0005j6-R1 for 60826@debbugs.gnu.org; Mon, 19 Jun 2023 18:07:44 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id E9A6C20684; Tue, 20 Jun 2023 00:07:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4A14E800A0; Tue, 20 Jun 2023 00:07:42 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 3Jp7ud08au82; Tue, 20 Jun 2023 00:07:41 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 9AE1C8009F; Tue, 20 Jun 2023 00:07:41 +0200 (CEST) From: Bruno Victal Date: Mon, 19 Jun 2023 23:07:06 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This package is only used for testing shared-mime-info, and thus not exported. * gnu/packages/freedesktop.scm (xdgmime): New variable. --- gnu/packages/freedesktop.scm | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index bd3df9ee68..a7e2aef6d1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Alex Devaure +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -465,6 +466,51 @@ (define-public maliit-keyboard display servers. It supports many different languages and emoji.") (license license:gpl3+))) +;; Private package used by shared-mime-info. +(define xdgmime + ;; No public release, match commit to the one used in the + ;; shared-mime-info release. + (let ((commit "de283fc430460b9b3a7e61432a6d273cd64cb102") + (revision "1")) + (package + (name "xdgmime") + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/xdg/xdgmime.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m9k7nfxgchb9j0xh9cwsldz6564qisqdkvlhgkcgc0grd4nfbn9")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no tests + #:make-flags #~(list (string-append "DESTDIR=" #$output) + #$(string-append "CC=" (cc-for-target))) + #:imported-modules `((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules `(,@%gnu-default-modules + ((guix build copy-build-system) #:prefix copy:)) + #:phases + #~(modify-phases %standard-phases + ;; Package uses a hand-crafted Makefile. + (delete 'configure) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("src" "bin/" #:include ("print-mime-data" + "test-mime-data" + "test-mime"))) + args)))))) + (home-page "https://gitlab.freedesktop.org/xdg/xdgmime/") + (synopsis "Module that parses the freedesktop.org MIME spec") + (description "This module is used for shared-mime-info package tests.") + (license (list license:lgpl2.1+ license:artistic2.0))))) + (define-public shared-mime-info (package (name "shared-mime-info") -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v3 4/5] gnu: shared-mime-info: Update to 2.2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Jun 2023 22:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168721247622057 (code B ref 60826); Mon, 19 Jun 2023 22:08:03 +0000 Received: (at 60826) by debbugs.gnu.org; 19 Jun 2023 22:07:56 +0000 Received: from localhost ([127.0.0.1]:57483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBN2S-0005jh-9M for submit@debbugs.gnu.org; Mon, 19 Jun 2023 18:07:56 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:53796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBN2P-0005jW-SV for 60826@debbugs.gnu.org; Mon, 19 Jun 2023 18:07:55 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 03BED20C3F; Tue, 20 Jun 2023 00:07:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6D0FD800A0; Tue, 20 Jun 2023 00:07:49 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id czgTSjfdmdDo; Tue, 20 Jun 2023 00:07:48 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6BE488009F; Tue, 20 Jun 2023 00:07:48 +0200 (CEST) From: Bruno Victal Date: Mon, 19 Jun 2023 23:07:07 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (shared-mime-info): Update to 2.2. [source]: Switch to git source. [build-system]: Switch to meson-build-system. [arguments]: Enable parallel builds. Do not patch test files. [native-inputs]: Switch to new style. Add python, xdgmime. Remove itstool. * gnu/packages/patches/shared-mime-info-xdgmime-path.patch: New file. * gnu/packages/freedesktop.scm: Register it. --- gnu/local.mk | 2 + gnu/packages/freedesktop.scm | 41 +++++++++++++------ .../shared-mime-info-xdgmime-path.patch | 22 ++++++++++ 3 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/shared-mime-info-xdgmime-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4d0e34cf09..50d47234c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -58,6 +58,7 @@ # Copyright © 2022 jgart # Copyright © 2023 Zheng Junjie <873216071@qq.com> # Copyright © 2023 Ivana Drazovic +# Copyright © 2023 Bruno Victal # # This file is part of GNU Guix. # @@ -1911,6 +1912,7 @@ dist_patch_DATA = \ %D%/packages/patches/libsequoia-remove-store.patch \ %D%/packages/patches/serf-python3.patch \ %D%/packages/patches/shakespeare-spl-fix-grammar.patch \ + %D%/packages/patches/shared-mime-info-xdgmime-path.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a7e2aef6d1..50321fd9a7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -511,29 +511,44 @@ (define xdgmime (description "This module is used for shared-mime-info package tests.") (license (list license:lgpl2.1+ license:artistic2.0))))) +;; Note: when updating shared-mime-info, don't forget to update xdgmime's commit +;; to the one used in the release. (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") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) + "04dfnnflspprxg7qia3whz1754lfvgi4ihvmihg379936zy5xd22")) + (patches (search-patches "shared-mime-info-xdgmime-path.patch")))) + (build-system meson-build-system) (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) + (list + #:configure-flags + #~(list (string-append "-Dxdgmime-path=" + #$(this-package-native-input "xdgmime") + "/bin")) + #:phases + #~(modify-phases %standard-phases + ;; Don't patch shebangs for the test files. + (replace 'patch-source-shebangs + (lambda _ + (let ((pred (lambda (file stat) + (and (eq? 'regular (stat:type stat)) + (not (string-prefix? "./tests/mime-detection" + file)))))) + (for-each patch-shebang + (find-files "." pred #:stat lstat)))))))) (inputs (list glib libxml2)) (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) + (list gettext-minimal pkg-config python xdgmime)) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description diff --git a/gnu/packages/patches/shared-mime-info-xdgmime-path.patch b/gnu/packages/patches/shared-mime-info-xdgmime-path.patch new file mode 100644 index 0000000000..27c578f3fa --- /dev/null +++ b/gnu/packages/patches/shared-mime-info-xdgmime-path.patch @@ -0,0 +1,22 @@ +Adapted from . + +diff --git a/meson.build b/meson.build +index 3c75424..7058562 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,11 +26,11 @@ xmlto = find_program('xmlto', required: false) + ############################################################################### + # Find xdgmime + +-xdgmime = get_option('xdgmime-path') / 'src' ++xdgmime = get_option('xdgmime-path') + +-xdgmime_print_mime_data = find_program(xdgmime/'print-mime-data', required: false) +-xdgmime_test_mime_data = find_program(xdgmime/'test-mime-data', required: false) +-xdgmime_test_mime = find_program(xdgmime/'test-mime', required: false) ++xdgmime_print_mime_data = find_program('print-mime-data', xdgmime/'print-mime-data', required: false) ++xdgmime_test_mime_data = find_program('test-mime-data', xdgmime/'test-mime-data', required: false) ++xdgmime_test_mime = find_program('test-mime', xdgmime/'test-mime', required: false) + xdgmime_found = ( + xdgmime_print_mime_data.found() and + xdgmime_test_mime_data.found() and -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v3 5/5] gnu: shared-mime-info: Add doc output. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Jun 2023 22:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168721302322944 (code B ref 60826); Mon, 19 Jun 2023 22:18:01 +0000 Received: (at 60826) by debbugs.gnu.org; 19 Jun 2023 22:17:03 +0000 Received: from localhost ([127.0.0.1]:57491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBNBG-0005xz-K3 for submit@debbugs.gnu.org; Mon, 19 Jun 2023 18:17:02 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:55506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBNBE-0005xX-Lq for 60826@debbugs.gnu.org; Mon, 19 Jun 2023 18:17:01 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 9CF0220C93; Tue, 20 Jun 2023 00:16:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 56977800A0; Tue, 20 Jun 2023 00:07:54 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id P9FKx4163sku; Tue, 20 Jun 2023 00:07:54 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B4D4A8009F; Tue, 20 Jun 2023 00:07:53 +0200 (CEST) From: Bruno Victal Date: Mon, 19 Jun 2023 23:07:08 +0100 Message-Id: <829b145fbb0b44493fd83e828c1776e682d4d369.1687212109.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/freedesktop.scm (shared-mime-info) [arguments]<#:phases>: Add 'install-doc phase. [outputs]: Add 'doc' output. [native-inputs]: Add docbook-xml-4.1.2, docbook-xsl and xmlto. --- gnu/packages/freedesktop.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 50321fd9a7..9f0447d89b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -544,11 +544,24 @@ (define-public shared-mime-info (not (string-prefix? "./tests/mime-detection" file)))))) (for-each patch-shebang - (find-files "." pred #:stat lstat)))))))) + (find-files "." pred #:stat lstat))))) + ;; The docs have no install rule. + (add-after 'install 'install-doc + (lambda* (#:key source #:allow-other-keys) + (let ((dest (string-append #$output:doc "/share/doc"))) + (with-directory-excursion "data/shared-mime-info-spec-html" + (install-file "shared-mime-info-spec.html" + (string-append dest "/html"))) + (install-file (string-append source + "/data/shared-mime-info-spec.xml") + dest))))))) (inputs (list glib libxml2)) (native-inputs - (list gettext-minimal pkg-config python xdgmime)) + (list gettext-minimal pkg-config python xdgmime + ;; For 'doc' output. + docbook-xml-4.1.2 docbook-xsl xmlto)) + (outputs (list "out" "doc")) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v3 2/5] build: gnu: Export a %gnu-default-modules variable. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jun 2023 04:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal , 60826@debbugs.gnu.org Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168723473129731 (code B ref 60826); Tue, 20 Jun 2023 04:19:01 +0000 Received: (at 60826) by debbugs.gnu.org; 20 Jun 2023 04:18:51 +0000 Received: from localhost ([127.0.0.1]:57715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBSpP-0007jS-Hc for submit@debbugs.gnu.org; Tue, 20 Jun 2023 00:18:51 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:62943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBSpN-0007jG-QR for 60826@debbugs.gnu.org; Tue, 20 Jun 2023 00:18:50 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-9881b9d8cbdso486206066b.1 for <60826@debbugs.gnu.org>; Mon, 19 Jun 2023 21:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687234724; x=1689826724; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=K4GXNWaPof6sHhEg4n5I/x+jNXdRWC08tpEzntt5DXI=; b=Z9wG6lWv18jkk5XdTyoF/OePBpPQk5HufzcdOGBb300ouTBXP775IW0tulUsBKrngS uTSwqXq9E3qp9YZNJdUI4GC8ZNqWCbExF1Vf7w5fHw4n8uoHL1l3qg7ITa15Kf9fY+xD ewu4Rq3aDCKd1hECkLHzSaFUF5ymHb1GFDID3N1VmMd0zMY+hoEuPZSFQhshHqGo5pij J1vDMjRfN99sMx3SNe+mgrNZTziO9c4xGsel/Q2r/iJQWq6UzX3pswxfSr+68sc2CrAt u2b+kTRhOsEisDnfgwkAF1xZU5BhSafyvQTE1SAY58MgAHSxg5lvKDt8pdGcu/ak/Mjs Vwvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687234724; x=1689826724; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=K4GXNWaPof6sHhEg4n5I/x+jNXdRWC08tpEzntt5DXI=; b=LwehJa6JvfuK/FeZctOHOhmR1BDEhxLngWYW3t0iKF8h8B9QiEeNun0naj7NLslweo FfUrVIdxTDkNH+pe9psmZtYsnVhPQLQ/fKV2RVtzSn87VmEJjhnt4AIXD/hv1kqJ1fSa 8tJv2KgQylXahqkSgCQBTR2EUz9W6k190wFudik3unhG9W/XVbUwl+JENo3KMf8ZJbmQ 4uNMeAPUoHvRqwCYimBBJJre8f+31h3x2TLp60VS+dhyStzzfMx2IcS/0g0Ah3U7HCS+ COWXxtGc0MKbpAGNN7v5SYysilsRryjDQPvTGq4ZbkTKFQlD8iF0iDW+18cXLN/6rwOW vmmQ== X-Gm-Message-State: AC+VfDwQxYxLOVrJiLXpVjf15z5J2leXc4iBnJPabCQ2LgR9zGGZLFCn aU8GO67JQsV6IfexlSBq2ahCEDj1gtDkPmYi X-Google-Smtp-Source: ACHHUZ5E6UOIYNbs9dJ6UsaU6Jm3/Gc5x2SngJDcITobtEcawaMUTraWtvUVG5r6S7ciLQQaYjZIDA== X-Received: by 2002:a17:907:7f23:b0:988:8786:f569 with SMTP id qf35-20020a1709077f2300b009888786f569mr4332668ejc.2.1687234723827; Mon, 19 Jun 2023 21:18:43 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a22-20020a1709063a5600b00988e699d07fsm587796ejf.112.2023.06.19.21.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 21:18:43 -0700 (PDT) Message-ID: <1fdc6634bb6687a25a08f99e0c2b8fbda44c1563.camel@gmail.com> From: Liliana Marie Prikler Date: Tue, 20 Jun 2023 06:18:42 +0200 In-Reply-To: <788ffede0cb9cdab9d7b7573de321dfd554caa0b.1687212109.git.mirai@makinata.eu> References: <788ffede0cb9cdab9d7b7573de321dfd554caa0b.1687212109.git.mirai@makinata.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 19.06.2023 um 23:07 +0100 schrieb Bruno Victal: > This makes tweaking the #:module argument less reliant on the > programmers astral wisdom to divine the right module imports. >=20 > * guix/build-system/gnu.scm (%default-modules): Rename to =E2=80=A6 > (%gnu-default-modules): =E2=80=A6 this and export it as well. > --- Uhm, is this required? I see it used in xdgmime, but I'd very much like to do without it. Cheers From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v3 2/5] build: gnu: Export a %gnu-default-modules variable. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jun 2023 07:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 60826@debbugs.gnu.org Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168724437613983 (code B ref 60826); Tue, 20 Jun 2023 07:00:02 +0000 Received: (at 60826) by debbugs.gnu.org; 20 Jun 2023 06:59:36 +0000 Received: from localhost ([127.0.0.1]:57856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBVKy-0003dT-0l for submit@debbugs.gnu.org; Tue, 20 Jun 2023 02:59:36 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:59278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBVKw-0003dL-5V for 60826@debbugs.gnu.org; Tue, 20 Jun 2023 02:59:34 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 5A78720E5A; Tue, 20 Jun 2023 08:59:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C25C5800A0; Tue, 20 Jun 2023 08:59:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Cps_EdX0l-Kl; Tue, 20 Jun 2023 08:59:27 +0200 (CEST) Received: from [192.168.1.116] (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 4B44F8009F; Tue, 20 Jun 2023 08:59:27 +0200 (CEST) Message-ID: <600640a9-751f-5193-aceb-469b11269d4d@makinata.eu> Date: Tue, 20 Jun 2023 07:59:22 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US References: <788ffede0cb9cdab9d7b7573de321dfd554caa0b.1687212109.git.mirai@makinata.eu> <1fdc6634bb6687a25a08f99e0c2b8fbda44c1563.camel@gmail.com> From: Bruno Victal In-Reply-To: <1fdc6634bb6687a25a08f99e0c2b8fbda44c1563.camel@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) Hi Liliana, On 2023-06-20 05:18, Liliana Marie Prikler wrote: > Am Montag, dem 19.06.2023 um 23:07 +0100 schrieb Bruno Victal: >> This makes tweaking the #:module argument less reliant on the >> programmers astral wisdom to divine the right module imports. >> >> * guix/build-system/gnu.scm (%default-modules): Rename to … >> (%gnu-default-modules): … this and export it as well. >> --- > Uhm, is this required? I see it used in xdgmime, but I'd very much > like to do without it. As indicated in the commit message, its purpose is to make things easier. (I've taken inspiration from elm-build-system here) I think the most compelling arguments to this approach is that in some packages you see things like: --8<---------------cut here---------------start------------->8--- gnu/packages/boost.scm- (list gnu/packages/boost.scm: #:imported-modules `((guix build python-build-system) gnu/packages/boost.scm- ,@%gnu-build-system-modules) gnu/packages/boost.scm: #:modules `(((guix build python-build-system) #:select (python-version)) gnu/packages/boost.scm- ,@%gnu-build-system-modules) gnu/packages/boost.scm- #:tests? #f gnu/packages/boost.scm- #:configure-flags --8<---------------cut here---------------end--------------->8--- Which is most likely a mistake since the actual #:module should be about %default-modules which is a subset of %gnu-build-system-modules. (albeit one with seemingly little impact) The divination comment stems from the following reasoning: “How can I know what gnu-build-system actually imports if not by guessing/cargo-culting or peering at the private %default-modules?“ (at that point, why not export it as well?) I'd argue it's a nice addition though strictly speaking its not fundamental for this patch-series and can be left out, by manually expanding the %gnu-default-modules value in the xdgmime arguments. -- Furthermore, I consider that nonfree software must be eradicated. Cheers, Bruno. From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v3 2/5] build: gnu: Export a %gnu-default-modules variable. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jun 2023 16:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 60826@debbugs.gnu.org Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.16872802009156 (code B ref 60826); Tue, 20 Jun 2023 16:57:02 +0000 Received: (at 60826) by debbugs.gnu.org; 20 Jun 2023 16:56:40 +0000 Received: from localhost ([127.0.0.1]:59684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBeel-0002Nc-O2 for submit@debbugs.gnu.org; Tue, 20 Jun 2023 12:56:39 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:51627) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBeej-0002NM-Rg for 60826@debbugs.gnu.org; Tue, 20 Jun 2023 12:56:38 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-987341238aeso592916566b.3 for <60826@debbugs.gnu.org>; Tue, 20 Jun 2023 09:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687280192; x=1689872192; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=whDtEApzbYEEuCmrCITwZ+N4jE3/xI/63/MhrfoxcDg=; b=bFiWmO3aVb3cjhAi+2d8boEj2mdI624s5M2tNrPWHquo4OCLtl75IBEWUgrPjKxO0U aP7QtDqcLqoVpsYKdHCz1HigmjWh0NDesSe6Qd8tPKIL/TB+W8dXpslUYJRJDUJVZDay 5+kQRGAuDtBWhYxACcYPClkY1hXZszN/unKevFyLgF9UOfH7PPp7n1hK3he4nWRZI5uz OnUHcW8USicGELcjGsyOqQbMLIsui5RB6bxV0AoeNZN6NY6tvk6XMXcilLh2sfVlGhaw 5TCf1Q7oZhcVvELhFStnj7PvNqAzIErvcsqA5cPRfLmdjWV989Qy2YScRISZw9S/gzuc 3yVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687280192; x=1689872192; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=whDtEApzbYEEuCmrCITwZ+N4jE3/xI/63/MhrfoxcDg=; b=gEfeOs72gfQdJIwCWxgDilj6GCp2NQYkozUtMSfrp2Kx5hDTvpyvI/uNj8bG6DOfF/ 2TqBNNGTgNNd0RKQ7Hu62L3E2ZbhbTmBYtiEz6gfhBYbSoAsocjFD/wnlEFg7Z9OBtVH 4O/SRlZBFzRjsasCJNdsy7wcMhndQy4mx7+Loluh//zJtScE/5HgPs+r9YPI3WV60ysS 4WZev9wb/7TN1Dl73l+gpFpk3f8Hv6imjE+elWsbF+13ea6MFDWqnCUxIXdkRZ7GI/f0 t+iNsiR38f2rNsd7sYSbmZlh54H28+21LSuiAsFYZhd8zXwVDVL8J8rTKUdDry6mok5C mZ8w== X-Gm-Message-State: AC+VfDy2GZK3guXBP6fwPCVtHd9ydzkyuhXwPfIVXAo/a/U/ohsm+iDQ /VZWNDWA5MYXLHJpZEx9yWuRQJR0mLprSqsA X-Google-Smtp-Source: ACHHUZ59QlN+/mQpf2hsTAPUj/Dh+dPBKZa0yla2f58erI77QkpEYkP++CYBo9AyEk9XJRebz4enRg== X-Received: by 2002:a17:906:9b88:b0:988:8fed:8ae9 with SMTP id dd8-20020a1709069b8800b009888fed8ae9mr6212751ejc.37.1687280191583; Tue, 20 Jun 2023 09:56:31 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u17-20020a170906125100b00988b4113d5asm1698917eja.24.2023.06.20.09.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 09:56:31 -0700 (PDT) Message-ID: <39ab29b8289022f38a797f2def3c3cd3a6b0ae2c.camel@gmail.com> From: Liliana Marie Prikler Date: Tue, 20 Jun 2023 18:56:30 +0200 In-Reply-To: <600640a9-751f-5193-aceb-469b11269d4d@makinata.eu> References: <788ffede0cb9cdab9d7b7573de321dfd554caa0b.1687212109.git.mirai@makinata.eu> <1fdc6634bb6687a25a08f99e0c2b8fbda44c1563.camel@gmail.com> <600640a9-751f-5193-aceb-469b11269d4d@makinata.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 20.06.2023 um 07:59 +0100 schrieb Bruno Victal: > The divination comment stems from the following reasoning: > =E2=80=9CHow can I know what gnu-build-system actually imports if not by > guessing/cargo-culting or peering at the private %default-modules?=E2=80= =9C > (at that point, why not export it as well?) >=20 > I'd argue it's a nice addition though strictly speaking its not > fundamental for this patch-series and can be left out, by manually > expanding the %gnu-default-modules value in the xdgmime arguments. The point is you shouldn't need to "divine" anything. It doesn't take much guesswork to find that the things you need for gnu-build-system belong to either (guix build gnu-build-system) or (guix build utils) =E2=80= =93 the latter being a module you ought to already be familiar with when mixing phases, the former being named after the build system. =C2=A0 %elm-default-modules OTOH requires four modules which aren't obvious to the uninitiated or even slightly more initiated Guix hacker. Cheers From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v4 1/4] gnu: shared-mime-info: Move to (gnu packages freedesktop). Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 19:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168746241323272 (code B ref 60826); Thu, 22 Jun 2023 19:34:01 +0000 Received: (at 60826) by debbugs.gnu.org; 22 Jun 2023 19:33:33 +0000 Received: from localhost ([127.0.0.1]:36810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3g-00063H-TU for submit@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:33 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:51618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3f-000631-Cr for 60826@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id BFD15202D2; Thu, 22 Jun 2023 21:33:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 151E2800A9; Thu, 22 Jun 2023 21:33:23 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 3bQoXAUMcxvs; Thu, 22 Jun 2023 21:33:22 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 3B07B8009D; Thu, 22 Jun 2023 21:33:22 +0200 (CEST) From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:17 +0100 Message-Id: <98f418fb7aece7fe76e8d1ab86fffdd604a2fcde.1687462396.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (shared-mime-info): Move to … * gnu/packages/freedesktop.scm: … here. * gnu/packages/gnuzilla.scm: Use (gnu packages freedesktop). * gnu/packages/kde-games.scm: Ditto. * gnu/packages/kde-multimedia.scm: Ditto. * gnu/packages/kde-pim.scm: Ditto. * gnu/packages/kde-utils.scm: Ditto. * gnu/packages/maths.scm: Ditto. * gnu/packages/mp3.scm: Ditto. * gnu/packages/ruby.scm: Ditto. * guix/profiles.scm (xdg-mime-database): Adjust to new location. --- gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 33 --------------------------------- gnu/packages/gnuzilla.scm | 1 + gnu/packages/kde-games.scm | 2 +- gnu/packages/kde-multimedia.scm | 1 + gnu/packages/kde-pim.scm | 1 + gnu/packages/kde-utils.scm | 1 + gnu/packages/maths.scm | 1 + gnu/packages/mp3.scm | 1 + gnu/packages/ruby.scm | 1 + guix/profiles.scm | 2 +- 11 files changed, 42 insertions(+), 35 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6385741d89..bd3df9ee68 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -465,6 +465,39 @@ (define-public maliit-keyboard display servers. It supports many different languages and emoji.") (license license:gpl3+))) +(define-public shared-mime-info + (package + (name "shared-mime-info") + (version "1.15") + (source (origin + (method url-fetch) + (uri (string-append + "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" + "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version + ".tar.xz")) + (sha256 + (base32 + "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) + (build-system gnu-build-system) + (arguments + ;; The build system appears not to be parallel-safe. + '(#:parallel-build? #f)) + (inputs + (list glib libxml2)) + (native-inputs + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config))) + (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") + (synopsis "Database of common MIME types") + (description + "The shared-mime-info package contains the core database of common types +and the update-mime-database command used to extend it. It requires glib2 to +be installed for building the update command. Additionally, it uses intltool +for translations, though this is only a dependency for the maintainers. This +database is translated at Transifex.") + (license license:gpl2+))) + (define-public xdg-utils (package (name "xdg-utils") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6db2d6569e..ebabd1a84e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2913,39 +2913,6 @@ (define-public tango-icon-theme guidelines.") (license license:public-domain))) -(define-public shared-mime-info - (package - (name "shared-mime-info") - (version "1.15") - (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" - "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version - ".tar.xz")) - (sha256 - (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) - (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) - (inputs - (list glib libxml2)) - (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) - (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") - (synopsis "Database of common MIME types") - (description - "The shared-mime-info package contains the core database of common types -and the update-mime-database command used to extend it. It requires glib2 to -be installed for building the update command. Additionally, it uses intltool -for translations, though this is only a dependency for the maintainers. This -database is translated at Transifex.") - (license license:gpl2+))) - (define-public system-config-printer (package (name "system-config-printer") diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e40d2b8922..4608d3d7ae 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -63,6 +63,7 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages databases) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 9be889f6aa..73fb88c4cb 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -30,7 +30,7 @@ (define-module (gnu packages kde-games) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages gl) - #:use-module ((gnu packages gnome) #:select (shared-mime-info)) + #:use-module ((gnu packages freedesktop) #:select (shared-mime-info)) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages perl) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index e3de6db432..6460345c47 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -35,6 +35,7 @@ (define-module (gnu packages kde-multimedia) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) #:use-module (gnu packages docbook) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 6f3cbf2999..dc0533d24b 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -34,6 +34,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 5774fa9910..35ad20f541 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -35,6 +35,7 @@ (define-module (gnu packages kde-utils) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cups) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) ; dbus for tests #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f89e70c0bb..8f1b88ef6b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -122,6 +122,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 7ede16f4bb..85f45d3271 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -40,6 +40,7 @@ (define-module (gnu packages mp3) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnome) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index eb84367d15..44bea787a6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -60,6 +60,7 @@ (define-module (gnu packages ruby) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages rails) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) diff --git a/guix/profiles.scm b/guix/profiles.scm index 6467e464c8..2e2466ccbc 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1562,7 +1562,7 @@ (define (xdg-mime-database manifest) "Return a derivation that builds the @file{mime.cache} database from manifest entries. It's used to query the MIME type of a given file." (define shared-mime-info ; lazy reference - (module-ref (resolve-interface '(gnu packages gnome)) 'shared-mime-info)) + (module-ref (resolve-interface '(gnu packages freedesktop)) 'shared-mime-info)) (mlet %store-monad ((glib (manifest-lookup-package manifest "glib"))) (define build base-commit: 909788c0aebd8098084c009afa98d1209c9ec869 -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v4 2/4] gnu: Add xdgmime. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 19:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168746241823283 (code B ref 60826); Thu, 22 Jun 2023 19:34:02 +0000 Received: (at 60826) by debbugs.gnu.org; 22 Jun 2023 19:33:38 +0000 Received: from localhost ([127.0.0.1]:36812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3l-00063S-JM for submit@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:37 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:58026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3f-000633-VU for 60826@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id D37D020511; Thu, 22 Jun 2023 21:33:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 1D81C800AA; Thu, 22 Jun 2023 21:33:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id KWdlpzC0rv1R; Thu, 22 Jun 2023 21:33:29 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6CF478009D; Thu, 22 Jun 2023 21:33:29 +0200 (CEST) From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:18 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This package is only used for testing shared-mime-info, and thus not exported. * gnu/packages/freedesktop.scm (xdgmime): New variable. --- gnu/packages/freedesktop.scm | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index bd3df9ee68..b6b9f5d4ee 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Alex Devaure +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -465,6 +466,52 @@ (define-public maliit-keyboard display servers. It supports many different languages and emoji.") (license license:gpl3+))) +;; Private package used by shared-mime-info. +(define xdgmime + ;; No public release, match commit to the one used in the + ;; shared-mime-info release. + (let ((commit "de283fc430460b9b3a7e61432a6d273cd64cb102") + (revision "1")) + (package + (name "xdgmime") + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/xdg/xdgmime.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m9k7nfxgchb9j0xh9cwsldz6564qisqdkvlhgkcgc0grd4nfbn9")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no tests + #:make-flags #~(list (string-append "DESTDIR=" #$output) + #$(string-append "CC=" (cc-for-target))) + #:imported-modules `((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules `((guix build gnu-build-system) + ((guix build copy-build-system) #:prefix copy:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + ;; Package uses a hand-crafted Makefile. + (delete 'configure) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("src" "bin/" #:include ("print-mime-data" + "test-mime-data" + "test-mime"))) + args)))))) + (home-page "https://gitlab.freedesktop.org/xdg/xdgmime/") + (synopsis "Module that parses the freedesktop.org MIME spec") + (description "This module is used for shared-mime-info package tests.") + (license (list license:lgpl2.1+ license:artistic2.0))))) + (define-public shared-mime-info (package (name "shared-mime-info") -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v4 3/4] gnu: shared-mime-info: Update to 2.2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 19:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168746242223301 (code B ref 60826); Thu, 22 Jun 2023 19:34:02 +0000 Received: (at 60826) by debbugs.gnu.org; 22 Jun 2023 19:33:42 +0000 Received: from localhost ([127.0.0.1]:36815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3p-00063k-Up for submit@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:42 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:54766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3n-00063a-BB for 60826@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:40 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 62CF120CBD; Thu, 22 Jun 2023 21:33:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C8CD1800AB; Thu, 22 Jun 2023 21:33:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id t_paWuBBz00n; Thu, 22 Jun 2023 21:33:36 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B193A800AA; Thu, 22 Jun 2023 21:33:36 +0200 (CEST) From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:19 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (shared-mime-info): Update to 2.2. [source]: Switch to git source. [build-system]: Switch to meson-build-system. [arguments]: Enable parallel builds. Do not patch test files. [native-inputs]: Switch to new style. Add python, xdgmime. Remove itstool. * gnu/packages/patches/shared-mime-info-xdgmime-path.patch: New file. * gnu/packages/freedesktop.scm: Register it. --- gnu/local.mk | 2 + gnu/packages/freedesktop.scm | 41 +++++++++++++------ .../shared-mime-info-xdgmime-path.patch | 22 ++++++++++ 3 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/shared-mime-info-xdgmime-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4d0e34cf09..50d47234c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -58,6 +58,7 @@ # Copyright © 2022 jgart # Copyright © 2023 Zheng Junjie <873216071@qq.com> # Copyright © 2023 Ivana Drazovic +# Copyright © 2023 Bruno Victal # # This file is part of GNU Guix. # @@ -1911,6 +1912,7 @@ dist_patch_DATA = \ %D%/packages/patches/libsequoia-remove-store.patch \ %D%/packages/patches/serf-python3.patch \ %D%/packages/patches/shakespeare-spl-fix-grammar.patch \ + %D%/packages/patches/shared-mime-info-xdgmime-path.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b6b9f5d4ee..b16fa5d387 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -512,29 +512,44 @@ (define xdgmime (description "This module is used for shared-mime-info package tests.") (license (list license:lgpl2.1+ license:artistic2.0))))) +;; Note: when updating shared-mime-info, don't forget to update xdgmime's commit +;; to the one used in the release. (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") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) + "04dfnnflspprxg7qia3whz1754lfvgi4ihvmihg379936zy5xd22")) + (patches (search-patches "shared-mime-info-xdgmime-path.patch")))) + (build-system meson-build-system) (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) + (list + #:configure-flags + #~(list #$(format #f "-Dxdgmime-path=~a/bin" + (this-package-native-input "xdgmime")) + "-Dupdate-mimedb=true") + #:phases + #~(modify-phases %standard-phases + ;; Don't patch shebangs for the test files. + (replace 'patch-source-shebangs + (lambda _ + (let ((pred (lambda (file stat) + (and (eq? 'regular (stat:type stat)) + (not (string-prefix? "./tests/mime-detection" + file)))))) + (for-each patch-shebang + (find-files "." pred #:stat lstat)))))))) (inputs (list glib libxml2)) (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) + (list gettext-minimal pkg-config python xdgmime)) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description diff --git a/gnu/packages/patches/shared-mime-info-xdgmime-path.patch b/gnu/packages/patches/shared-mime-info-xdgmime-path.patch new file mode 100644 index 0000000000..27c578f3fa --- /dev/null +++ b/gnu/packages/patches/shared-mime-info-xdgmime-path.patch @@ -0,0 +1,22 @@ +Adapted from . + +diff --git a/meson.build b/meson.build +index 3c75424..7058562 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,11 +26,11 @@ xmlto = find_program('xmlto', required: false) + ############################################################################### + # Find xdgmime + +-xdgmime = get_option('xdgmime-path') / 'src' ++xdgmime = get_option('xdgmime-path') + +-xdgmime_print_mime_data = find_program(xdgmime/'print-mime-data', required: false) +-xdgmime_test_mime_data = find_program(xdgmime/'test-mime-data', required: false) +-xdgmime_test_mime = find_program(xdgmime/'test-mime', required: false) ++xdgmime_print_mime_data = find_program('print-mime-data', xdgmime/'print-mime-data', required: false) ++xdgmime_test_mime_data = find_program('test-mime-data', xdgmime/'test-mime-data', required: false) ++xdgmime_test_mime = find_program('test-mime', xdgmime/'test-mime', required: false) + xdgmime_found = ( + xdgmime_print_mime_data.found() and + xdgmime_test_mime_data.found() and -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v4 4/4] gnu: shared-mime-info: Add doc output. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 19:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168746242723319 (code B ref 60826); Thu, 22 Jun 2023 19:34:03 +0000 Received: (at 60826) by debbugs.gnu.org; 22 Jun 2023 19:33:47 +0000 Received: from localhost ([127.0.0.1]:36818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3v-000642-GR for submit@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:47 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:44380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3t-00063u-Nr for 60826@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:46 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id DFE6B207E3; Thu, 22 Jun 2023 21:33:44 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4EEF7800AB; Thu, 22 Jun 2023 21:33:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id YdeHc4naDjKu; Thu, 22 Jun 2023 21:33:44 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id BFF3C800AA; Thu, 22 Jun 2023 21:33:43 +0200 (CEST) From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:20 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/freedesktop.scm (shared-mime-info) [arguments]<#:phases>: Add 'install-doc phase. [outputs]: Add 'doc' output. [native-inputs]: Add docbook-xml-4.1.2, docbook-xsl and xmlto. --- gnu/packages/freedesktop.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b16fa5d387..65781fed11 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -545,11 +545,24 @@ (define-public shared-mime-info (not (string-prefix? "./tests/mime-detection" file)))))) (for-each patch-shebang - (find-files "." pred #:stat lstat)))))))) + (find-files "." pred #:stat lstat))))) + ;; The docs have no install rule. + (add-after 'install 'install-doc + (lambda* (#:key source #:allow-other-keys) + (let ((dest (string-append #$output:doc "/share/doc"))) + (with-directory-excursion "data/shared-mime-info-spec-html" + (install-file "shared-mime-info-spec.html" + (string-append dest "/html"))) + (install-file (string-append source + "/data/shared-mime-info-spec.xml") + dest))))))) (inputs (list glib libxml2)) (native-inputs - (list gettext-minimal pkg-config python xdgmime)) + (list gettext-minimal pkg-config python xdgmime + ;; For 'doc' output. + docbook-xml-4.1.2 docbook-xsl xmlto)) + (outputs (list "out" "doc")) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description -- 2.39.2 From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v4 3/4] gnu: shared-mime-info: Update to 2.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 19:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal , 60826@debbugs.gnu.org Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168746370425653 (code B ref 60826); Thu, 22 Jun 2023 19:56:02 +0000 Received: (at 60826) by debbugs.gnu.org; 22 Jun 2023 19:55:04 +0000 Received: from localhost ([127.0.0.1]:36825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQOV-0006fh-IQ for submit@debbugs.gnu.org; Thu, 22 Jun 2023 15:55:03 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:57603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQOT-0006fA-Hz for 60826@debbugs.gnu.org; Thu, 22 Jun 2023 15:55:02 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-988e6fc41ccso543253166b.3 for <60826@debbugs.gnu.org>; Thu, 22 Jun 2023 12:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687463695; x=1690055695; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eZqGx9TZu3klg4puo1SKRmc0/R19CLfTN2lEwMFj7tA=; b=U3EKNi7/eXvfCOX1Pgx5NecMgDP7d8lIyKoxgu3KTJefIELwf0aSCZNsVn8T4iCAKs xIBRjA1gWH6/1G+D5fBmQ6WzltqnpAIi06C/bfXkCLr76ehCexNWZM1AfYWg+AHH+57Q x8+agLkq2jj2PasWN11r0Due+RdlckHZ+C9hZsVr3ypUj9JqxheQHf7DPm+S3lEHsKAm Q1xGzAYWc1YKYZmf+Frd4lfGtLRE0RHtbUQG5v9HbHtaNZmy392mbydoA9YySrQYpCDk wf2i3oKDnotx7CTxHic5chI4uHUuuLDoWOKqgu3F5q64qtZxU8UAXivYz2cLEB1P7GwZ gSaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687463695; x=1690055695; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eZqGx9TZu3klg4puo1SKRmc0/R19CLfTN2lEwMFj7tA=; b=FVYqZFCCcqSREeERwafUs21ZmIUngA343hkn0JxX9PW48REdDw7T/19B1az1jrDPd3 MfRlx07EbV1TSHwVeBapcZttnsiu4/aWSFzUQZwZSNTu34HjDHFuFVXY9ElWCqUK/hmn p0n4kQkP32ZvsnPbcVbQs5vUpQQczOhjrG95/XsOxrqGmoMGfoYEoEz+GAYtSAMzWkx8 dY3GogiKnFHu+cNP8evVGNxYPSA1EA8DhUj9aj0KdAOdpt/Sl65dNAS5m/u+y0XrR0Qc JbFMfMJdl/cobkJMQNaj1k/sopLStvEyk0L7qrMRZj9YV0BJuVXiD0n7RzJbk2MaozHh 8d8w== X-Gm-Message-State: AC+VfDxUHOlCPJQgr28o4tMdQ+37qHIIQpshn4QdCw4U/7Da9HRfqC/l eStlao7SyMpXRGEsVK7ttj8= X-Google-Smtp-Source: ACHHUZ61WZgLu4CKa97Ma+TDEhfFdku+74G0OmO4XsYNnGzIW4hz64tBYxIH/WrtHaJyfqQDxDGFFQ== X-Received: by 2002:a17:907:6d03:b0:988:6193:29dc with SMTP id sa3-20020a1709076d0300b00988619329dcmr12377547ejc.7.1687463695308; Thu, 22 Jun 2023 12:54:55 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a20-20020a170906369400b0094e7d196aa4sm5004107ejc.160.2023.06.22.12.54.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 12:54:54 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Thu, 22 Jun 2023 21:54:54 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 22.06.2023 um 20:33 +0100 schrieb Bruno Victal: > * gnu/packages/gnome.scm (shared-mime-info): Update to 2.2. > [source]: Switch to git source. > [build-system]: Switch to meson-build-system. > [arguments]: Enable parallel builds. Do not patch test files. > [native-inputs]: Switch to new style. Add python, xdgmime. Remove > itstool. > * gnu/packages/patches/shared-mime-info-xdgmime-path.patch: New file. > * gnu/packages/freedesktop.scm: Register it. Should probably be * gnu/local.mk (dist_patch_DATA), right? From unknown Tue Sep 09 00:44:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v4 4/4] gnu: shared-mime-info: Add doc output. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 19:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal , 60826@debbugs.gnu.org Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168746381225861 (code B ref 60826); Thu, 22 Jun 2023 19:57:03 +0000 Received: (at 60826) by debbugs.gnu.org; 22 Jun 2023 19:56:52 +0000 Received: from localhost ([127.0.0.1]:36834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQQF-0006j3-R1 for submit@debbugs.gnu.org; Thu, 22 Jun 2023 15:56:52 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:54696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQQE-0006ir-4E for 60826@debbugs.gnu.org; Thu, 22 Jun 2023 15:56:50 -0400 Received: by mail-ej1-f65.google.com with SMTP id a640c23a62f3a-970028cfb6cso1113683766b.1 for <60826@debbugs.gnu.org>; Thu, 22 Jun 2023 12:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687463804; x=1690055804; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=kKZFVY3GZ2wbi7Z8CfjHmrMdGPwdTnQSYeEdqUwZaxA=; b=B9ubxyLwvIgRq84KP2L66TJSB5ZNpTIhuBQypGZxt0gQ1zYs87cZ/lduWLvbCi+Ftl 0FDV7mRsq9OwvPZb4ah25w1kZqfY0mAuMhSuo4pmPQ4p0yyq4IJiPuXW8TA0z3jIyQv8 2nKF2PZgUq1rnKVE1fMAODaHqguOMM/Egs1Vq3fYtPPg3kY+lLKX7a/FALF6lQxIgy9d UmknoGSxInI0y3h+0JZHyrvMkyW0Tfs7zTwPUv7faGh523VCRdYMyy7wbIabDou7fPbg IULv9ouZV9810S0vs6CWgu9d6+zQv5SPribogo6hzHlMoLdD4OAFOcm/rVKOnN8dmWkZ xbDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687463804; x=1690055804; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kKZFVY3GZ2wbi7Z8CfjHmrMdGPwdTnQSYeEdqUwZaxA=; b=fOkEM7XYNIDRweoXslsAPVrGS/j7rC+bHiHYQXZRgm6Qd3fkEZZddHZTo7wub651bL NkiZXMgfrV7mvHaJUS8T7kchBZFrRXe5K1nghk7jyNX15jHbTmLmochkVNxkDbsfqYVc EaZjO7YmZn+AOcdGDJKeUTuvWN9X8aYT5OcsBTo6kDB38jYCvtiAN3cUy0+9Rj1xIHmK wY9hKU1lnPfASBdTwpwhx0e4hxUOELpFgILi5OJiYMRTuZsqHxfulHCJEa7gXPmmuNKz hx0s5LSI3VEGFVGu5G1qHGBRp6D9B6NtN3ns9TMTbmOO3mnXz6QvBgMTNnLG/MlgmM5G dy1Q== X-Gm-Message-State: AC+VfDxhPt4O6BVOVbHmDBWLZaUhLBVx+OwxdrSavxb9Rip+o4Gy4nbN f9u11hhHDPRg75atsm2HUio= X-Google-Smtp-Source: ACHHUZ4MyiFhQeu+Q+89ECpDCTeP4hdKyREVxBK5tXpGIa3x3nFYzlOCMMCRmUzyYUg7Zbcd8GFKqg== X-Received: by 2002:a17:907:a412:b0:988:6e18:3f83 with SMTP id sg18-20020a170907a41200b009886e183f83mr12222869ejc.5.1687463804215; Thu, 22 Jun 2023 12:56:44 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g3-20020a170906c18300b00989027eb30asm5092274ejz.158.2023.06.22.12.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 12:56:43 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Thu, 22 Jun 2023 21:56:43 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 22.06.2023 um 20:33 +0100 schrieb Bruno Victal: > * gnu/packages/freedesktop.scm (shared-mime-info) > [arguments]<#:phases>: Add 'install-doc phase. > [outputs]: Add 'doc' output. > [native-inputs]: Add docbook-xml-4.1.2, docbook-xsl and xmlto. For the commit message, "Install documentation." is preferable. The ChangeLog LGTM, for the implementation I'll wait for CI. Cheers From unknown Tue Sep 09 00:44:19 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Bruno Victal Subject: bug#60826: closed (Re: [PATCH gnome-team v4 4/4] gnu: shared-mime-info: Add doc output.) Message-ID: References: <023534e0fb2f3bb214979aff9adb0e78e470ebb4.camel@gmail.com> X-Gnu-PR-Message: they-closed 60826 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 60826@debbugs.gnu.org Date: Sun, 25 Jun 2023 06:22:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1687674122-6616-1" This is a multi-part message in MIME format... ------------=_1687674122-6616-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #60826: [PATCH staging] gnu: shared-mime-info: Update to 2.2. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 60826@debbugs.gnu.org. --=20 60826: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60826 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1687674122-6616-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 60826-done) by debbugs.gnu.org; 25 Jun 2023 06:21:10 +0000 Received: from localhost ([127.0.0.1]:41943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDJ7W-0001ha-DV for submit@debbugs.gnu.org; Sun, 25 Jun 2023 02:21:10 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:56644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDJ7V-0001hO-6u for 60826-done@debbugs.gnu.org; Sun, 25 Jun 2023 02:21:09 -0400 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-3f9b627c1b8so31120185e9.1 for <60826-done@debbugs.gnu.org>; Sat, 24 Jun 2023 23:21:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687674063; x=1690266063; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ehkFQ//5ZTp5OVTtmRjkROSRcPP6mWidrRLt9qzsPSg=; b=Zm109KDhLyozZBTSFKxIJmFt0C+4RNyLO4WNQrasA7TLzyqmBinvRUPn1/870B4IwW WFtdb4GjPf3ktn9+txl+wfzLFnLfu2uAJGf0VEXykwjo82P+xv2nRo73WUzJH1G5nW6g klSN9wbmwOfX7CAkuzuYONrceN1Mr6iCFg1tL6++adHgSnF/kJM32PS6HTZN/eGYP9c8 +tI6wcZPeiMQDU0nw0vtIkpC1s6EHW2lBLHYfIOhrZ00Omm/WBTg4Q8X+s0XIXt7ngxM 7QSLakv0Qvbx7hmYq2gR9h/sVpeJ2p1nw+01m8hJ5YQ+/j61iCJjX6q6Dc+h25vKL+Kh 2zKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687674063; x=1690266063; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ehkFQ//5ZTp5OVTtmRjkROSRcPP6mWidrRLt9qzsPSg=; b=IdjtG0cU3zeMFNcwAj2i0jG2JcABs1ZCkQ/ttAKhw5z7X7BtTV7np0vd0uWVh9A8Bg v7gJp24d7C7E+6yl9/s6hhXpbMSG6FNjhsT+jnwd/0HhSA3Zd5h/D2c6+3sZXsm45Mu2 +P0UeMDpVFMnlhdIs9hkBL5tONAeL67nZBeMvbWX41oQAXHqeMfRezckzkkXANralP+e h8N9Ip/rOrjTpg2aY7ElQm8d6q8MiPLVWw8JxLJ9cmifmufJfxiI7BG1ivYgq8lbTEWf 9rbio4mHX4LjSeSbFVTboEEROIhYoFBXIwlyYfJxHKXMjIHsyGjMSaVniBCmMIwQ5Vim yf7w== X-Gm-Message-State: AC+VfDwE2T4Tq2iaCKoNjnhMM9Q6JmJyDtRcqPq1HCFxuCn+PoDoHpku wWBPkhUK18o9/fqh/WbrviBoNIfkUXk6zw== X-Google-Smtp-Source: ACHHUZ70kUp7xvzutE7j1iUVfRB9gJ8ksbjw5BqjXet5uiDzI6+6KmA5QXi3KH2s93QEN1D/C7SckQ== X-Received: by 2002:a05:600c:ada:b0:3f9:bb9:e3be with SMTP id c26-20020a05600c0ada00b003f90bb9e3bemr18354134wmr.41.1687674063100; Sat, 24 Jun 2023 23:21:03 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id h8-20020a05600c28c800b003f8ec58995fsm3919451wmd.6.2023.06.24.23.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jun 2023 23:21:02 -0700 (PDT) Message-ID: <023534e0fb2f3bb214979aff9adb0e78e470ebb4.camel@gmail.com> Subject: Re: [PATCH gnome-team v4 4/4] gnu: shared-mime-info: Add doc output. From: Liliana Marie Prikler To: Bruno Victal , 60826-done@debbugs.gnu.org Date: Sun, 25 Jun 2023 08:21:00 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60826-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 22.06.2023 um 21:56 +0200 schrieb Liliana Marie Prikler: > Am Donnerstag, dem 22.06.2023 um 20:33 +0100 schrieb Bruno Victal: > > * gnu/packages/freedesktop.scm (shared-mime-info) > > [arguments]<#:phases>: Add 'install-doc phase. > > [outputs]: Add 'doc' output. > > [native-inputs]: Add docbook-xml-4.1.2, docbook-xsl and xmlto. > For the commit message, "Install documentation." is preferable.=C2=A0 The > ChangeLog LGTM, for the implementation I'll wait for CI. Pushed with some of the announced changes, though notably I forgot to the headline of this commit. Cheers ------------=_1687674122-6616-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH staging] gnu: shared-mime-info: Update to 2.2. Date: Sun, 15 Jan 2023 02:32:50 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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(-) 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 base-commit: d9bcd1a8d6300b79f5884e48b2cefff05de8dce4 -- 2.38.1 ------------=_1687674122-6616-1--