From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iC25GCQGb2ce5wAAe85BDQ:P1 (envelope-from ) for ; Fri, 27 Dec 2024 19:55:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iC25GCQGb2ce5wAAe85BDQ (envelope-from ) for ; Fri, 27 Dec 2024 20:55:16 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Thmpb6cz; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WdP5L6NO; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735329315; h=from:from:sender:sender: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=MeUw+vR8WK/LiXf6+p0ZIC73GRbbu92eGgsNRBptNp8=; b=rlg55WnLDQdyAkypRcwTcZJXSa0SdCsWqk8nLSie3hR3dPJeaCvqxoAztIhlECinLGa31a b1KG4YWiIGAyabQ+2B6YBmE2hUmjz1uqTSFYxGNkBTJRAvkhFKxFlZ1ggJZ0E/+L4lmegY aOE9TWY4kwEh6mYCEaPIPouLrBNMzHau/POiKBtgOcDYfopsuwOkyxxGU0EZC+jpD1kmlA B/pWTF1hoLdJsAL7v3lc2sB+Wry4kTxCLvvGubMQ07/geGmbfKEnqvaH4a+Ehl4rcx2tg1 ZC+Cy4fEvNolWwGUz+qGfHWfjTtOgf6YUFa9j0rg/BJSiXtDpuF8BWnuYReo1A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Thmpb6cz; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WdP5L6NO; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735329315; a=rsa-sha256; cv=none; b=Usuloxn4fcHg6a6jAwAXwwsI0V4k2R5P+bMIH7WnbKClVQSCR8FS/vC8QUk5JXHpqx0l8q pwhqnDi7vWHBLWGEhGj9RZasMip5abFNFM/n5u88b6c91wv3mgh1xVUGFZbbcmC8wQ3Uup GB0H1luUNr/9shDFz9Hm+d6XktR67/V/l+2RwotrUHj/l5AvZ8mRKDN1c2xAiDOjkG/DdI kwz4YEQM1L7/XVXWLHfRcFMRQaVSzn5Bp94C3T9RIlm3osB1c8LD7MpwAhbIDxiRBIte0p BOxu1U03SUp962cWpV0lYrE8TtAkT8DYwFD+bx7nRr5LALmYbYBgklfVFoMiCw== 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 CA33685600 for ; Fri, 27 Dec 2024 20:55:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRGQJ-0000FY-Lq; Fri, 27 Dec 2024 14:55: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 1tRGQI-0000Ck-6e for guix-patches@gnu.org; Fri, 27 Dec 2024 14:55:02 -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 1tRGQH-0000eO-UM for guix-patches@gnu.org; Fri, 27 Dec 2024 14:55:01 -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:Date:From:To:In-Reply-To:References:Subject; bh=MeUw+vR8WK/LiXf6+p0ZIC73GRbbu92eGgsNRBptNp8=; b=Thmpb6czYwhcqwYtvHMHE/o96UmCwSnSLQ1OttbBogkx2hQp9rexnfokJ6iKdADz+He9s/dk2CHAWEWJBX3sA9cOL5RK0fbyM8ScOb6BvyyTSTqYPqnTojxam0aJE91AzjdankHUq5SKlrHMU3Q3VE7KQntUh3sC0E2E64x1ykPj8l4zU70y1oiPmjvjeGr77EV0u2nOSfkvl/tzpMARB6LgkqvS7wUSSqnT7woWknXiCog4CrxkWszy3yH8FylyBULvZYIu8/G66wQ9LPJkHYsYONiiKsMplxG2+MK2/uj9qPzSZxIo61+jztKaHwzvcs31d0u2bPVzkXnB+JG9Rw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRGQH-0003Db-Pm for guix-patches@gnu.org; Fri, 27 Dec 2024 14:55:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v0 07/15] gnu: catfish: Update to 4.20.0. References: <20241227194602.25785-1-ashvith@noreply.codeberg.org> In-Reply-To: <20241227194602.25785-1-ashvith@noreply.codeberg.org> Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Dec 2024 19:55:01 +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 Received: via spool by 75146-submit@debbugs.gnu.org id=B75146.173532927712311 (code B ref 75146); Fri, 27 Dec 2024 19:55:01 +0000 Received: (at 75146) by debbugs.gnu.org; 27 Dec 2024 19:54:37 +0000 Received: from localhost ([127.0.0.1]:47656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRGPs-0003CU-C6 for submit@debbugs.gnu.org; Fri, 27 Dec 2024 14:54:36 -0500 Received: from mail-pl1-f182.google.com ([209.85.214.182]:44447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRGPp-0003CG-Jh for 75146@debbugs.gnu.org; Fri, 27 Dec 2024 14:54:34 -0500 Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2164b662090so82291005ad.1 for <75146@debbugs.gnu.org>; Fri, 27 Dec 2024 11:54:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735329207; x=1735934007; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MeUw+vR8WK/LiXf6+p0ZIC73GRbbu92eGgsNRBptNp8=; b=WdP5L6NOuuzQuZyGiHPoJqSzQfWOl/oxON8bJqvPUmrdZldQmkI2SV3wft+1cvH7u/ 5dnu8qjB1yX28wMaPJh57pcQq/13NI2EI8SxvBQLKDC5Fv+MZ8Nr/d9Itca040cx63md 3K1Bmdz1YhQIt/+qC8FxUEXMdtkV/UXpdDZ55C4G38vhbagpY7bOlsEOnGgbyQtk0K+k qZsxfeXP4pwdl9WdpG8Lg8FKrlEHsVex+XQx8QGx9412x8TjTIsx1Ho+5UOI9ezDU+Ti XLVLdPqEsshKE9xUPul5Spt30OYejSz7W6DjYH2uOveH83TMtUy3Pkv6mt8cClekitSQ MtlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735329207; x=1735934007; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MeUw+vR8WK/LiXf6+p0ZIC73GRbbu92eGgsNRBptNp8=; b=U4LA2hEjCls1u3IIIjmT1PIbvoi/oijdGfVXiUzTwTCmo7d6PLQMZuqogIipNllDBI j2LpJaWFeXrQ1jRTXySDrGUoQiUquxmpxQIs2ngjtYNbUVEsCnr8icvGQ2NoA2qdrfec rwTpDXjf4rgT11SJXBS8dSEEcMEV22VV4fEzobXb+5U4FS+vBU9KVWdII/O1f2QGSJNJ IrGQJTYtW8T846DWMG2HMndgW3VdPzHQZxVpcmaYLtVMVAvQbNZDGT4LZHwOkJCTfsSP Zp68yt+ka2aapd79GK4fCPeYx5AkZO1BXcD79Ks6vpMHZquclXIeHOl2FI7j/t//Uhp0 5glg== X-Gm-Message-State: AOJu0YybSDU+LK0zZFuFTAdu/DoETQw+XBr49XdtfS4nz2+4zbx2oH8V m0OUPEK2Fou/2OuFcv+pg0sPi+FsLm9kH0XHNQtoQCgY5ihBtcYjRk4WqfmK X-Gm-Gg: ASbGncup09HvXTJ9l57oSEz8/rhDH1JGCphQl7c2Ewx7vZpZmaLs8axj/p5zivzRpoG bbIaWg2zZ41SerfDAuXegpV/+C9GjA9x1v433oYKm9TrTqcbThK6fLFxh/jZBc2/aQO5I5a6z4j 6B6TGcT21AtOxdpLRrrU0N6jAFqIzPrJfK6Dvh2ZbWXFcDyaTol1n8+AmjhE0To1IfnQ7uVa6VN bsO4C4Gq1sMjG1OPMl3FfOOX2z9T82DjXzzCUsuPzES/fJN4yOn2U9DFewp4Z3UAkSI/XiK5ltR 1g/ws852Rg== X-Google-Smtp-Source: AGHT+IF3Nf5bTSj7EHlgeUjPkRT1KOeajytK1NP79i8DSmK5FIViRgu70z5DHpAFQvAwLn5ZGnxuBQ== X-Received: by 2002:a05:6a20:8403:b0:1e5:ddac:1ed7 with SMTP id adf61e73a8af0-1e5e046f87fmr43552342637.12.1735329207219; Fri, 27 Dec 2024 11:53:27 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:846d:3ba6:3078:1833:5938]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-72aad83616asm14978902b3a.76.2024.12.27.11.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 11:53:26 -0800 (PST) From: Ashvith Shetty X-Google-Original-From: Ashvith Shetty Date: Sat, 28 Dec 2024 01:23:18 +0530 Message-ID: <20241227195320.27450-1-ashvith@noreply.codeberg.org> X-Mailer: git-send-email 2.46.0 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.16 X-Spam-Score: -4.16 X-Migadu-Queue-Id: CA33685600 X-Migadu-Scanner: mx10.migadu.com X-TUID: voxwGQiKvFc/ From: Ashvith Shetty * gnu/packages/xfce.scm (catfish): Update to 4.20.0. [source]: Update to XFCE's GitLab URL. [home-page]: Set to docs.xfce.org. [build-system]: Switch to meson-build-system [arguments]: Enable tests Do not replace phase 'install. Do not delete 'sanity-check. [native-inputs]: Add cmake, desktop-file-utils, (list gtk+ "bin") and python. Remove python-distutils-extra. Change-Id: Ifc922b45308718b1a5586c15a0025f3e6d20ea4b --- gnu/packages/xfce.scm | 88 +++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 152da5c12d..22557bd241 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -43,6 +43,7 @@ (define-module (gnu packages xfce) #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) #:use-module (gnu packages cdrom) + #:use-module (gnu packages cmake) #:use-module (gnu packages docbook) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) @@ -82,7 +83,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) @@ -223,50 +224,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")))))))))) + (native-inputs (list cmake + desktop-file-utils + (list gtk+ "bin") + pkg-config + python + 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/") (synopsis "File searching tool for Xfce") (description "Catfish is a file searching tool for Linux and Unix. The interface is -- 2.46.0