From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 21 20:52:41 2023 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 To: Bruno Victal Subject: Re: bug#60826: [PATCH staging] gnu: shared-mime-info: Update to 2.2. 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-Debbugs-Envelope-To: 60826 Cc: 60826@debbugs.gnu.org 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