From patchwork Thu May 8 03:43:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 42387 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 327EB27BC49; Thu, 8 May 2025 04:44:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 608C027BC49 for ; Thu, 8 May 2025 04:44:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCsBB-0002VP-Nr; Wed, 07 May 2025 23:44:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCsB0-0002Uy-SG for guix-patches@gnu.org; Wed, 07 May 2025 23:44:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCsB0-0007xI-Je for guix-patches@gnu.org; Wed, 07 May 2025 23:44:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=GL+qxv9d3omsbWK8GlYXmCmn5d74QsMMPZjIcl6OqcY=; b=NFHZdTDTsVT7uKqXgqjct03/sG79ZDPu1RNhzsFGR6pZRHTavYLat8kiBoAM3A1Cm2liDZOl6HNgJex5oXkFwNdP12Vl7cLQotmInHt/N/Ad2wjGW+fUwE4cARLYJPE7Sr0n6gu8ivaotjx7KRlFRyWKECPllOOIoOaNn4hfxdLWbNg/Yzff/cQHjiivT7NTBtO/EbJ3ebY6QjFNmC00X0wdgwdOkEiAGdKEJy//Qz/qrf7rl4f7GrCgmGBXWoEMgeF/OsrWXjVRoA8ZzCpw5lCmRokrQQDApAueaP6LmUVCqvR6EzFpHkD44h0CYLLfyabMk2M8XXHmkxE2aQOzuA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCsB0-0006Yc-47 for guix-patches@gnu.org; Wed, 07 May 2025 23:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78307] [PATCH] gnu: xdg-utils: Update to 1.2.1. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 03:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78307@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174667582825172 (code B ref -1); Thu, 08 May 2025 03:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 May 2025 03:43:48 +0000 Received: from localhost ([127.0.0.1]:51589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCsAg-0006Xi-Qm for submit@debbugs.gnu.org; Wed, 07 May 2025 23:43:48 -0400 Received: from lists.gnu.org ([2001:470:142::17]:50354) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCsAc-0006XR-Hj for submit@debbugs.gnu.org; Wed, 07 May 2025 23:43:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCsAW-0002Ts-TL for guix-patches@gnu.org; Wed, 07 May 2025 23:43:32 -0400 Received: from mail.z572.online ([88.99.160.180]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCsAU-0007wI-Ex for guix-patches@gnu.org; Wed, 07 May 2025 23:43:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1746676221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GL+qxv9d3omsbWK8GlYXmCmn5d74QsMMPZjIcl6OqcY=; b=nY6U+0hCaoje3mMTpaGjMISQ9bK9GaIxgaMhnNlVkxXcQotrDmQ5Z23VPzNhy8UUQP58fF QnNVNXBECxI/HS2Eq/xTCyq0glWESHaBOZLCnad9J620gxNYj2Vqzf1nlb540bPEnbH+PE G91ErfBVrmEEyuXKNmTBIVQAgfj97NU= Received: from m.tailaa68d.ts.net ( [115.192.96.110]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 11dab75a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Thu, 8 May 2025 03:50:21 +0000 (UTC) From: Zheng Junjie Date: Thu, 8 May 2025 11:43:19 +0800 Message-ID: <87b0cdde6e694a0cb2bd203e3dbef64ed011bdfa.1746675799.git.z572@z572.online> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=88.99.160.180; envelope-from=z572@z572.online; helo=mail.z572.online X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=0.001, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (xdg-utils): Update to 1.2.1. [source]: update url. Switch to git-fetch. [native-inputs]: Add docbook-xml-4.3. Change-Id: If843ed148e85b9c44d0b28e327ff551d5457103e --- gnu/packages/freedesktop.scm | 61 +++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 29 deletions(-) base-commit: 475173e4f25ad6437ee770b83e741d759f5ce380 prerequisite-patch-id: 6c77c02a9116b9db83a420e293830eeb645714cb prerequisite-patch-id: 6ceb021cda6c3102fd5a1998f888d645467c0935 prerequisite-patch-id: 408fa55e77c5d05cc349886e3e84d65b4cb703e2 diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index de8fb975bcc..8796928c83c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Alex Devaure ;;; Copyright © 2023 Bruno Victal -;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024, 2025 Zheng Junjie ;;; Copyright © 2022 Samuel Culpepper ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq @@ -668,19 +668,22 @@ (define-public shared-mime-info (define-public xdg-utils (package (name "xdg-utils") - (version "1.1.3") + (version "1.2.1") (source (origin - (method url-fetch) - (uri (string-append - "https://portland.freedesktop.org/download/xdg-utils-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/xdg/xdg-utils.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) + "0hnb523hiz8wy6gffapys6vw7h1xq50li0s31mvyv4v5nmp2bhg7")))) (build-system gnu-build-system) (native-inputs - (list docbook-xsl docbook-xml-4.1.2 + (list docbook-xsl + docbook-xml-4.1.2 + docbook-xml-4.3 libxslt xmlto w3m-for-tests)) (inputs (list bash-minimal ;for 'wrap-program' @@ -700,27 +703,27 @@ (define-public xdg-utils ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-hardcoded-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "scripts/xdg-mime.in" - (("/usr/bin/file") - (search-input-file inputs "bin/file"))) - (substitute* "scripts/xdg-open.in" - (("/usr/bin/printf") - (search-input-file inputs "bin/printf"))))) - (add-after 'install 'wrap-executables - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen" - "sed" "xprop" "xset")) - (pkgs (map (lambda (cmd) - (search-input-file inputs - (string-append "bin/" cmd))) - dependencies)) - (bindirs (map dirname pkgs))) - (with-directory-excursion (string-append #$output "/bin") - (for-each (cute wrap-program <> - `("PATH" ":" prefix ,bindirs)) - (find-files "."))))))))) + (add-after 'unpack 'patch-hardcoded-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/xdg-mime.in" + (("/usr/bin/file") + (search-input-file inputs "bin/file"))) + (substitute* "scripts/xdg-open.in" + (("/usr/bin/printf") + (search-input-file inputs "bin/printf"))))) + (add-after 'install 'wrap-executables + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen" + "sed" "xprop" "xset")) + (pkgs (map (lambda (cmd) + (search-input-file inputs + (string-append "bin/" cmd))) + dependencies)) + (bindirs (map dirname pkgs))) + (with-directory-excursion (string-append #$output "/bin") + (for-each (cute wrap-program <> + `("PATH" ":" prefix ,bindirs)) + (find-files "."))))))))) (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/") (synopsis "Freedesktop.org scripts for desktop integration") (description "The xdg-utils package is a set of simple scripts that