From patchwork Thu Jun 19 07:58:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43211 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 6018827BC4B; Thu, 19 Jun 2025 09:01:40 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 B7AC527BC49 for ; Thu, 19 Jun 2025 09:01:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSACp-0000JT-Ax; Thu, 19 Jun 2025 04:01:07 -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 1uSAC3-0008NY-Hb for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:21 -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 1uSAC0-0000IB-FW for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:17 -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:References:In-Reply-To:Date:From:To:Subject; bh=S4QD0saUsMtWYQf0t20nTn1HLH39sKYdAXx25LfrZt0=; b=JEgis/drXSqEtC9ZmAjczeD3ik68ZunnMZqf049iAxvsqcBmOO9MqkuYBf2OwPqIxCHUeSn6BdEfoEUY1nyeXSwDXQK9sW2umV1wb3GsS6anG9TAjZx/v88MGiWZXOqT98jfONE7ktwz3FJ+ZMMPwc9Nfyvc4JMKt91AUKcTj8sE7LbNc/b6Xmy1+d8rYrcaYN0IVKuBeXohpTGci9zHaYxNS8l7Dp97j5iOA/LYxiwkh0W9mCK+S6A6+TX3RYtHACFJgshaqwQqoq/iSZInk6FWvNvzRniYnA9lLnWwt4hBfMxzN3HT9vRovzQ6bc+CM0ikvo9EfE4dLGRJPEg0Hg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uSAC0-0006xO-1y for guix-patches@gnu.org; Thu, 19 Jun 2025 04:00:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78828] [PATCH 4/8] gnu: ulauncher: Update to 6.0.0-18.901ce03. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jun 2025 08:00:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78828@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78828-submit@debbugs.gnu.org id=B78828.175031997526317 (code B ref 78828); Thu, 19 Jun 2025 08:00:15 +0000 Received: (at 78828) by debbugs.gnu.org; 19 Jun 2025 07:59:35 +0000 Received: from localhost ([127.0.0.1]:60334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uSABI-0006q5-Gv for submit@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:34 -0400 Received: from 10.mo562.mail-out.ovh.net ([46.105.72.220]:52737) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uSAAt-0006lh-FZ for 78828@debbugs.gnu.org; Thu, 19 Jun 2025 03:59:12 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfx6ymSz1j8N; Thu, 19 Jun 2025 07:59:05 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78828@debbugs.gnu.org>; Thu, 19 Jun 2025 07:59:05 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.15]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bNCfx4jm8z5wGd; Thu, 19 Jun 2025 07:59:05 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 369B7D440A2; Thu, 19 Jun 2025 07:59:05 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003f8fe032a-cf1c-49d1-84fd-9cdd892e381a, 129058C0FBD5227E7F6EF83700C8F3C5E5DC00BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.169.212 Date: Thu, 19 Jun 2025 09:58:50 +0200 Message-ID: <20250619075859.10878-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250619075859.10878-1-ngraves@ngraves.fr> References: <20250619075859.10878-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14071778513519698658 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdegleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepheeljedvudejfffgudduueeutddtvdejudeuudfgkedufeduteevteelleehteeunecuffhomhgrihhnpehulhgruhhntghhvghrrdhiohenucfkphepuddvjedrtddrtddruddpkedtrddvudehrdduieelrddvuddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeekvdekseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=S4QD0saUsMtWYQf0t20nTn1HLH39sKYdAXx25LfrZt0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750319946; v=1; b=H4S3jceP0JQAk+15NKURLCp61RpYAquk8g4AqQHc15v0Q3x0U+7KIlDgbDQpZK5s1DdpyVSQ g1GTI6J2ys2m76qGgP2KRNFl6z/DHIfEYRjhtW2Ao1DtxI3Gso56J5d3EDrpqqyeL5Q7cCvaFvp Dg/DnObFAHNwnv0QyG0wr2zFnMahozQumrLeufjdwm8jdBi+QSGFVto4G8zFVpX+Purw6muhthd 4fRoUp35xtPZ3ILmy1luLWMwcitHuUEJYA7rdhs6KC8HaFQFAWjzyyVPvBSVDP7b+FoXV+NwK3V /G5U4vYjNhJJgBzmUexnkQJzLpUOOQNTH8bwRz0o6lQBw== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/xdisorg.scm (ulauncher): Update to 6.0.0-18.901ce03. [build-system]: Switch to pyproject-build-system. [arguments]{test-flags}: Ignore some failing tests. {phases}: Remove deprecated phase 'fix-usr. Add phase 'fix-bash. [native-inputs]: Remove python-distutils-extra. Add python-pytest, python-pytest-mock, python-setuptools, python-wheel. [propagated-inputs]: Add python-xlib. --- gnu/packages/xdisorg.scm | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9d66718630..f65d24b3d1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2091,8 +2091,8 @@ (define-public xdpyprobe (license license:gpl3+))) (define-public ulauncher - (let ((commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9") - (revision "4")) + (let ((commit "901ce03beb157ff8fb354558594495eb74c6de7b") + (revision "18")) (package (name "ulauncher") (version (git-version "6.0.0" revision commit)) @@ -2104,10 +2104,14 @@ (define-public ulauncher (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) - (build-system python-build-system) + (base32 "0qrqpbqrrklfgqr48zafzggrbzns2q6h27nh63skfd9w582nsajg")))) + (build-system pyproject-build-system) (arguments (list + #:test-flags + ;; XXX: Most likely require a running X server. + #~(list "--ignore=tests/ui/test_preferences_server.py" + "--ignore=tests/ui/test_result_widget.py") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-libX11 @@ -2115,11 +2119,11 @@ (define-public ulauncher (substitute* "ulauncher/utils/xinit.py" (("libX11.so.6") (search-input-file inputs "/lib/libX11.so"))))) - (add-after 'unpack 'fix-usr - (lambda _ - (substitute* "setup.py" - (("\\{sys.prefix\\}") - (string-append #$output))))) + (add-after 'unpack 'fix-bash + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/modes/shortcuts/test_run_script.py" + (("/bin/bash") + (search-input-file inputs "bin/bash"))))) (add-after 'unpack 'fix-os-release (lambda _ (define (touch file) @@ -2141,10 +2145,19 @@ (define (touch file) (lambda _ (setenv "HOME" (getcwd))))))) - (native-inputs (list intltool python-distutils-extra python-mock)) + (native-inputs (list intltool + python-mock + python-pytest + python-pytest-mock + python-setuptools + python-wheel)) (inputs (list libx11 python-levenshtein python-pycairo)) - (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas - python-pygobject webkitgtk-with-libsoup2)) + (propagated-inputs (list keybinder + libwnck + gsettings-desktop-schemas + python-pygobject + python-xlib + webkitgtk-with-libsoup2)) (home-page "https://ulauncher.io") (synopsis "Application launcher for Linux") (description