From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 4MUSH6Hnb2f3TAEA62LTzQ:P1 (envelope-from ) for ; Sat, 28 Dec 2024 11:57:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 4MUSH6Hnb2f3TAEA62LTzQ (envelope-from ) for ; Sat, 28 Dec 2024 12:57:21 +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="ML2bnc/K"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=dOJF0ytZ; 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=1735387041; 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=3q1I/AKMVvzxy/RQVhNceYt245CWwxyiWWD3SNZh+VA=; b=i/Slv6HM4ZfKNKHtCIYFiWEOK17P0mxNunYflqNglkFr5YxD8jAm+mrvxFa6ycXRgPMNtL 2/yCcM4NTPu+882M+ykziuDjUHwM6AP8t0Mw7gNkFV66anbKneoVuSkqQgHN7p0QpWp9jn gu0NkBwFcwoF1ED8NyUSn5NWNzR4BXCwShkq17nL4oYQ4fAoEHQe3TpgxiZZMX4AymZmY/ fJPMSEzU6U6I/dY/Q6wHC6WeY6aSAiAWA5IbNfDsala79SQUtUSYmx0qlcGX5Ny0WOiMs/ EP/DqC0IDMWsojKUkCUPfjwJ4CZRS9G7US1OAFQZpgXi/jzS893Lg3XN3Mn4Mw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="ML2bnc/K"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=dOJF0ytZ; 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=1735387041; a=rsa-sha256; cv=none; b=FTuyHB2MF0uL5GLZtFizmOWdN1k/7WuL5sT/7HV+bzg2odjc2E94iaVIwSwgFmX8FbMqvA FbYLbzqdI+x9aaPMgYHwUVTL18l3Sphi2l/NkbU2HhbU0T1L2MX9c4QXuYR+73pYxj0NSN Io5Aav8xvnLq19JccTQ3x+vLuocrrORlvfnDrZVbykqHzQZTfJSkICzIXVkUOh0EI1ROjD 0Fce+U5p2fjong2RKItAgKK72mEpI0SSSKQdQSZyizUomub9YmxpAd3W3k59emAPuOEiPW FBkbvPHyvLudXgOXrTc1V7W57AD+TbgwGxKXvBcnYkzk8Uf6e/hCxdEhMW3flg== 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 526FC93E8C for ; Sat, 28 Dec 2024 12:57:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRVRJ-00020D-UT; Sat, 28 Dec 2024 06:57:05 -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 1tRVRH-0001yp-Cl for guix-patches@gnu.org; Sat, 28 Dec 2024 06:57:03 -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 1tRVRH-0006BF-4W for guix-patches@gnu.org; Sat, 28 Dec 2024 06:57:03 -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=3q1I/AKMVvzxy/RQVhNceYt245CWwxyiWWD3SNZh+VA=; b=ML2bnc/Ky855G95s9K5stka12GlzME9X5bjeE5JKedo0DMZiM7q6JPl2Q+f74evc/cuvlsoHH+oeCowaEJ1AURYNEJLrbbYO32vlQQOOVIPCEH8h8gl1qaDn7no/Rdaj6rU+yQe4G/Kkf1A5/J7K/Yz9S48pB+ChY4JX+60FCLAdij0gQ8cxlUjnKla/ymhyenO2wNNyY1tWnujHDg4GOoAWtX8w4twYj1hVYAzkznnB9G4o8suNdDqwXS7kBICcoTRcaFaSypI0FMehizFwyBgjCqrYO+PCCNdqpMA+OsXoQaR0LuNh5N5i4LFrNotfLZVsbpw8YOkt08BbaafdpA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRVRG-0000rl-UT for guix-patches@gnu.org; Sat, 28 Dec 2024 06:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v1 07/15] gnu: catfish: Update to 4.20.0. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 11:57:02 +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.17353869743192 (code B ref 75146); Sat, 28 Dec 2024 11:57:02 +0000 Received: (at 75146) by debbugs.gnu.org; 28 Dec 2024 11:56:14 +0000 Received: from localhost ([127.0.0.1]:49565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRVQT-0000pO-GH for submit@debbugs.gnu.org; Sat, 28 Dec 2024 06:56:14 -0500 Received: from mail-pl1-f173.google.com ([209.85.214.173]:51331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRVQQ-0000pA-MN for 75146@debbugs.gnu.org; Sat, 28 Dec 2024 06:56:11 -0500 Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-216634dd574so66747245ad.2 for <75146@debbugs.gnu.org>; Sat, 28 Dec 2024 03:56:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735386904; x=1735991704; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3q1I/AKMVvzxy/RQVhNceYt245CWwxyiWWD3SNZh+VA=; b=dOJF0ytZcHhcryskl+zaXbooaMt8ViQus3y8n4/VT1mV9JAicDxFqJVjq7k9WUA+YO 0TPUDLQ6IEkP6K+qajAwam1Bk+Cf/kyJsesy/VXsMzfJmHDmcUG4G/rn6c6Lw4kgOH8g NFoYRtd53BoszGDVjr2lqsQocqBcM1rbCOYJLdJFVdvGPZwUJdjuu5NYvUYdoC9T52i8 gpSkQShsT+iphwFRhz8HOtOiH5hxWw/HRTXLCR19ozTQguqU2CwocYT86rLpWNoEXG3M NbkqSjSMVZIwxTjvgzcu7o4+0AvOB2iFfE+RQYJbIDdxQFLcjzb99DB2UpBSW2sysxDV /58Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735386904; x=1735991704; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3q1I/AKMVvzxy/RQVhNceYt245CWwxyiWWD3SNZh+VA=; b=cKcmkEJYC1vUn8R7zv4IS2vutRq9b1p0hpQ5SSBosThfIC/FItsj9dXPA1zctQgY8R n4EBm5gxsI6xFWRvBE/U3LfDaoKJd4z31/7watsw8jXvO9aiSVePhaAgmlhWOqIRgQNp jXyP7mHceuXxeP0RPl30vhjA9S1XYpfKV/km4axMbo1NXmuAi+2tvzNEjL9rQQV5rPZ6 RJHw1FPah/DvG5WpXm8CdWDIH0AMn/wp979v2zRf4TpbVHBrbhjOlVDh1jRRbNPeIdCj vqYgcRRQ9sVkJft6zIvcsYZ3TPygTUfzZXQ98epG8FmywCeo3i4BFyAgXHpt0erCmTQg oPbg== X-Gm-Message-State: AOJu0YzU8c3Xe2jMULUdx7KjZFvqZ12a17z/KvnZdq8OiJYe7qxBM1yJ P5y7IpK2XT2HSP+VlfP7Kd7vdQy7G3zpi/nkqfil9gnL2l7TkP01JYLaZEBz X-Gm-Gg: ASbGncvgKeAjG8NMpwTGL+LAu63XZpdFS2weI38fcFMefDXgi4lTBlYUsZkveDaiCdJ CL+97SZaq9M/2gaLaf17F/v3cnWMK5c067OmByjopuQqyWB3caWouhpIaRxNDU94hXTrK1XXy8d 7AnWIDq/AMaEqEkFxH9VAes2Zkx0zqDA6PPTH9/0kX3uKMeqEoIBekbkhdT/xVeOaGGOLOqhUHn gF6755VEn4brVAwZpnl11QMqZx7gM+vUzQWZI26HcKOap+ljVFHZWHuDzumMTmyLIkyS68zkWy3 4S6K0wVENg== X-Google-Smtp-Source: AGHT+IFEabK8DE3TrNmlSJ8hoX8N75uzDXhKWAxJF6yH1F3Bda6Xq6vCw6wHiZ3LwMMVpE+k6za+XA== X-Received: by 2002:a17:902:ce86:b0:216:2f7f:ff69 with SMTP id d9443c01a7336-219e6e894c8mr342226945ad.5.1735386904360; Sat, 28 Dec 2024 03:55:04 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:846d:3ba6:3078:1833:5938]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-219dc96e919sm149487555ad.69.2024.12.28.03.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2024 03:55:03 -0800 (PST) From: Ashvith Shetty X-Google-Original-From: Ashvith Shetty Date: Sat, 28 Dec 2024 17:22:57 +0530 Message-ID: <20241228115320.24218-8-ashvith@noreply.codeberg.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241228115320.24218-1-ashvith@noreply.codeberg.org> References: <20241228115320.24218-1-ashvith@noreply.codeberg.org> 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.36 X-Spam-Score: -4.36 X-Migadu-Queue-Id: 526FC93E8C X-Migadu-Scanner: mx10.migadu.com X-TUID: D0UxAt3HaS1k 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]: 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: Ieca091640912cfbe50d13623bcc0866aa5e3514c --- gnu/packages/xfce.scm | 89 ++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 152da5c12d..921f3e09f0 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,50 @@ (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 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