From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GHWmHBaYc2fl7gAAqHPOHw:P1 (envelope-from ) for ; Tue, 31 Dec 2024 07:07:02 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id GHWmHBaYc2fl7gAAqHPOHw (envelope-from ) for ; Tue, 31 Dec 2024 08:07:02 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=bzb3sUXt; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735628822; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=35O+T4bLzo8Ok19eKeMK0FwTX+Jvr2ZoCYc4F8uKayI=; b=WXob2+Y712tahnbnRBMZV+n8hW9N30GO276cZkTG3PmiIsDOdoM1HKeDfBf+f1pAt7ke8m lRzk9Rt2t2HhT73CLF6fhzunEobMGNSbgw1XRwLEtuWLao2o4eM7yMhAC6UUWdR60ypJez FrrnnYxbVGldtMDPrUa6Y5Z5fvYp21t5EoXbI1F0hPoA+KhZybWXKZaIXPkRmBRBzKJG/V EJNUW4u1PAkBK6Dbk4CVb4pNixmdDRa5QIqjcjkXQTCMLbBue9gtO5LJtuUdHKwkI9N80d c864AIkiMjPS9YdTRIBcmJ+VQRf8MC2wOg/kWX2nJdhFFnisHfn38Fq38eIuKg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=bzb3sUXt; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735628822; a=rsa-sha256; cv=none; b=AHvrIL2PDEnFEzdiLx02PEpgCCB7tdO8lkqOoaPpTdR//2IoDxj+OwXe8BL//BTOvDAjWB KZl2ZJ7qdLEyhqlr+/We8TCYnNOZiucCDgRiEhCgZrEzRLlygQs3uLxybuD3NUROfsaqCz 0Y5fEFys/H7xqJ7wWR6AVAvql4Snkk9lUpWL3cf9q02ZVfxZtsOHcZ2ZIjos86uMm3+Vpm Dr1GHBLnJ+MgTEiy0gNiQaVeMZc6OxV0y5f7d0CU0GktnWl7JJ9Sp523es0nBSSfvk979l 75CQW2phs5dWuPGDxTSly5L5HXZh01jI6zKZPUirRyeD4S/Qv788rcVzCkxr1Q== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0FFFA1EA94 for ; Tue, 31 Dec 2024 08:07:02 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSVyT-0003al-Pi; Tue, 31 Dec 2024 01:43:30 -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 1tSVyG-0003Tm-28 for guix-patches@gnu.org; Tue, 31 Dec 2024 01:43:17 -0500 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 1tSVyF-00058m-L0 for guix-patches@gnu.org; Tue, 31 Dec 2024 01:43:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=35O+T4bLzo8Ok19eKeMK0FwTX+Jvr2ZoCYc4F8uKayI=; b=bzb3sUXtsmY9xvN3f3KOiA5dCtiMHAgXpcr/jTjEz3EFqu/tLogBLWmeI+KpmBaXiTQ4Vc1cbw1Yz/uiUfi3io+f4aYkQ2uYe/S5R0/AZGQA3zls4OUK86Corlou7139MHXLbkTcDWX44d3SWOgXTkpaJ6dVoc+wJdyS8cZSxwfj3DyqVpXTJhf/trqKcQRao2FG2zxGoqCmWS1cpxvwHmCz7ZE9s3mLyqDHJpnQ0HFiLYa9JFqY5x2eJ5qIX7y7K//ivddF9itGBE6evApY2HbgD5sPMItNLKVL/+iT2Mx1gcFduO7kwOqFNEJQ4YJeB/xesgRwVRZnUmW8btH3Vw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSVyB-0000rB-9j; Tue, 31 Dec 2024 01:43:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v4 16/68] gnu: catfish: Update to 4.20.0. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 31 Dec 2024 06:43:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75146@debbugs.gnu.org Cc: Ashvith Shetty , Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 75146-submit@debbugs.gnu.org id=B75146.17356273603021 (code B ref 75146); Tue, 31 Dec 2024 06:43:11 +0000 Received: (at 75146) by debbugs.gnu.org; 31 Dec 2024 06:42:40 +0000 Received: from localhost ([127.0.0.1]:60946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVxf-0000mX-VN for submit@debbugs.gnu.org; Tue, 31 Dec 2024 01:42:40 -0500 Received: from mail.envs.net ([5.199.136.28]:47904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVxT-0000kf-B4 for 75146@debbugs.gnu.org; Tue, 31 Dec 2024 01:42:28 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id E6E7C38A3E6F; Tue, 31 Dec 2024 06:42:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id yepc9LO5dJvK; Tue, 31 Dec 2024 06:42:23 +0000 (UTC) Received: from localhost (unknown [112.44.106.216]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 31 Dec 2024 06:42:18 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id bf25a0af; Tue, 31 Dec 2024 06:45:07 +0000 (UTC) Date: Tue, 31 Dec 2024 14:43:46 +0800 Message-ID: <52dc2a0f3a11b2da95e83c448067f7a4b3e32727.1735627083.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches From: iyzsong--- via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 1.30 X-Spam-Score: 1.30 X-Migadu-Queue-Id: 0FFFA1EA94 X-TUID: ngRV7Pqq1rT9 From: Ashvith Shetty * gnu/packages/xfce.scm (catfish): Update to 4.20.0. [source]: Switch to git-fetch. [home-page]: Set to docs.xfce.org. [build-system]: Switch to meson-build-system [arguments]: Simpify phases. [native-inputs]: Add desktop-file-utils, gettext-minimal, gtk+:bin and python. Remove intltool and python-distutils-extra. Change-Id: Ieca091640912cfbe50d13623bcc0866aa5e3514c --- gnu/packages/xfce.scm | 87 +++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 61377e2f16..73bf34cd80 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -81,7 +81,7 @@ (define-module (gnu packages xfce) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) - #:use-module (guix build-system python) + #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) @@ -220,50 +220,49 @@ (define-public libxfce4ui (define-public catfish (package (name "catfish") - (version "4.18.0") - (source (origin - (method url-fetch) - (uri (string-append "https://archive.xfce.org/src/apps/" - "catfish/" (version-major+minor version) - "/catfish-" version ".tar.bz2")) - (sha256 - (base32 - "16cbsnki7qragwhbfs3h0ja7xg8xlf59ajxhddqm0jkmrirrpbpx")))) - (build-system python-build-system) + (version "4.20.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.xfce.org/apps/catfish") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vyf62n8j2pgxd30j8hf1x6d0yz8r86ng39p9smfpq7m3vll8i7c")))) + (build-system meson-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-command-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "catfish/CatfishSearchEngine.py" - (("'which'") (string-append "'" (which "which") "'"))) - (substitute* "catfish/CatfishWindow.py" - (("xdg-mime") (which "xdg-mime")) - (("xdg-open") (which "xdg-open"))))) - ;; setup.py script does not support one of the Python build - ;; system's default flags, "--single-version-externally-managed". - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "python" "setup.py" "install" - (string-append "--prefix=" (assoc-ref outputs "out")) - "--root=/"))) - ;; The check failed to spawn a message bus without /etc/machine-id. - (delete 'sanity-check) - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/catfish") - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))) - #:tests? #f)) - (native-inputs - (list pkg-config python-distutils-extra intltool)) - (inputs - (list bash-minimal which xfconf xdg-utils)) - (propagated-inputs - (list gtk+ python-dbus python-pexpect python-pycairo - python-pygobject)) - (home-page "https://docs.xfce.org/apps/catfish/start") + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-command-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "catfish/CatfishSearchEngine.py" + (("'which'") + (string-append "'" + (which "which") "'"))) + (substitute* "catfish/CatfishWindow.py" + (("xdg-mime") + (which "xdg-mime")) + (("xdg-open") + (which "xdg-open"))))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/catfish") + `("GUIX_PYTHONPATH" = + (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" = + (,(getenv "GI_TYPELIB_PATH")))))))) + #:tests? #f)) + (native-inputs (list desktop-file-utils ;for update-desktop-database + gettext-minimal + (list gtk+ "bin") ;for gtk-update-icon-cache + pkg-config + python)) + (inputs (list bash-minimal which xfconf xdg-utils)) + (propagated-inputs (list gtk+ python-dbus python-pexpect python-pycairo + python-pygobject)) + (home-page "https://docs.xfce.org/apps/catfish/") (synopsis "File searching tool for Xfce") (description "Catfish is a file searching tool for Linux and Unix. The interface is -- 2.46.0