From patchwork Tue Mar 11 15:34:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jodi D." X-Patchwork-Id: 40102 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 848EE27BBE2; Tue, 11 Mar 2025 18:19:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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=unavailable 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 9896A27BBE9 for ; Tue, 11 Mar 2025 18:19:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts4Bk-0003pO-Io; Tue, 11 Mar 2025 14:18:48 -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 1ts3i0-0001F6-Cy for guix-patches@gnu.org; Tue, 11 Mar 2025 13:48:11 -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 1ts3hz-0000mw-NU for guix-patches@gnu.org; Tue, 11 Mar 2025 13:48:04 -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=wjTIV5UA8EjthIBiPRsXp+E7KOdHcCmiiWF4Ht8cI4U=; b=o/HuLAn4mXa3nwoEG+aYRP6k7qjYBg/H3LNqtbNyEHcOR9HGRaMbRl9qrAYiEFM7sCx+cs7jW7X1SiXyO7B6za5EKahCyT1ZnrIZxlJStoE9vT9QYWzBuHJXhtdHMFo9W373MIf1QNkKMkHOWhlnBPoEM8TmMfPBvEL53zxt9EQ8IFay3vMDjx0hJDC24XC5g+NwqLzDUTleiDtQXQ1tcb2Wv6FjswRilpw4MiP4aPaS3MqImFGGxYJB0zIZ0gIKOB8LK5d0byLBD8a9Aw0jdIG2vaV0D5gVNDoi3iiyEwrl7wPp8i4+t83JUGpZXPZP2U5Il+MLYHoIMBji1d+xqg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ts3hy-0001RX-ES for guix-patches@gnu.org; Tue, 11 Mar 2025 13:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76951] [PATCH] updated j4-dmenu-desktop to 3.2 Resent-From: "Jodi D." Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Mar 2025 17:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76951 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76951@debbugs.gnu.org Cc: "Jodi D." X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17417152275469 (code B ref -1); Tue, 11 Mar 2025 17:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Mar 2025 17:47:07 +0000 Received: from localhost ([127.0.0.1]:45457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ts3h4-0001Q8-I8 for submit@debbugs.gnu.org; Tue, 11 Mar 2025 13:47:07 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54810) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ts1w8-0001ID-TE for submit@debbugs.gnu.org; Tue, 11 Mar 2025 11:54:34 -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 1ts1vz-0001WZ-Ci for guix-patches@gnu.org; Tue, 11 Mar 2025 11:54:23 -0400 Received: from mail-yw1-x1144.google.com ([2607:f8b0:4864:20::1144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts1vw-0004QP-5V for guix-patches@gnu.org; Tue, 11 Mar 2025 11:54:22 -0400 Received: by mail-yw1-x1144.google.com with SMTP id 00721157ae682-6fedf6aaed2so24669807b3.0 for ; Tue, 11 Mar 2025 08:54:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741708450; x=1742313250; darn=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=wjTIV5UA8EjthIBiPRsXp+E7KOdHcCmiiWF4Ht8cI4U=; b=VHfqeS+ywwTDSRS1RanwotL2vOL3H0l+Lagtn2YUXsOjv1obSp4DCQIa65sEvE6inc fnZEgwKsAX2vZF9xotoPTRacTjL1XwATt3mP6RfEFHyAFR0CxN8B3yQppslaG60Tx4KP D+Y63b6sS/4HW6GsF29G1kJpI5SvsIok7TrdF6zS8IOrUDni4YyOP6i9JPp6FVYF33H+ N5QJS3mXFG8goOcsGpK7+whN8eiIa1rPuMOUKAg1kgb0OSyt2tVehcwj+Z+fKzs6YvRd 3Aw8rZhEfOMXwLPnaq/XDT2QoirQoaF1fFhd1QG+OhVFrwTLw07wRTR87rWBak9mYTgt V6rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741708450; x=1742313250; 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=wjTIV5UA8EjthIBiPRsXp+E7KOdHcCmiiWF4Ht8cI4U=; b=LttdqREv+oKHcFyAqu/mijL2+7wHKFKLZCjvsZfvHDTce51UExg0TPkh8wQBKO1c1r PMOVFRcGUEXftIN7ssthQYTYOQ9cwpZ7/g6p7PEGzd8fELUfRtRgCpmuYCFncO9Zs1EB UHQ3rlclAxCIgW5/9UjqUEBr/r/izvXG0wblK/OGvZuzvluKdciEAyGrALrAVFnuv7TK AeTbVbvw8v2/hToePZ8pB8Qu6eK1fvqRk3wx3X6SmVAWDKbpvzXeFmyYDQbLZbdnfOCa RrccvqnoxcfpEm9y9t+XBbciWR9XJM88BT/FdtRiOhnJZ+ehXQihik/ks2YXdl2DQvo2 eS7A== X-Gm-Message-State: AOJu0Yw0BbUMpdpYTdXHHdpE9yo7SNQk7uW/X9bi75L6tbFDXrNJkXhF IajpZrv2zpVogfbRmjgFEyEENMei6RBo30iG4OLLSYtA7kvnu5lBgF4yO8M3hG0= X-Gm-Gg: ASbGncszvXzcUvKJgFey9iOIqr9Da/e9XUSUlICeFN6t/8f36JRhOpdIhew3xm6O59P VQzYOAUq4kVxJDRKVynNB1+1Eu4M0wGZlLOtlcs8ARmBYxn45YH8q3hq4rK/mPhIY+lkSnFhHLp 26TuqMlMQjNWEm1MF3IyOCeLWzkBB6AjRlrH17VPW7p+mVrxHImRscoIRG64ID949NZLquI2V2w WScz/X9NCoe0+ln7SmGttwUiKZx0pRPppGUFDwRtlMSfD2qTJGmLXUAOXTUZ44DPiN7/iV1TENt wYkj/f5q8p2fOCmkKdqyB5Nevgc1k0UArm2sQ8QxLHSnd9H8mWZ3BgmQXFni0c886zhJ X-Google-Smtp-Source: AGHT+IFRlRBElvdLMFJzAQDJkh+nuelQ5YERaQmoeJAWKUmTAu1/ifexjPqSW4jZaRzx3FxYyRMypQ== X-Received: by 2002:a05:690c:2d81:b0:6f9:c487:2c26 with SMTP id 00721157ae682-6ff0a3c7284mr43746017b3.15.1741708450617; Tue, 11 Mar 2025 08:54:10 -0700 (PDT) Received: from jodi-pc.attlocal.net ([2600:1700:b16:8550:9a48:27ff:fe90:26fc]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6feb2c3037asm26883707b3.86.2025.03.11.08.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 08:54:10 -0700 (PDT) From: "Jodi D." Date: Tue, 11 Mar 2025 10:34:29 -0500 Message-ID: <20250311155241.15426-2-jodijodingtondev@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1144; envelope-from=jodijodingtondev@gmail.com; helo=mail-yw1-x1144.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 11 Mar 2025 13:46:59 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 11 Mar 2025 14:17:57 -0400 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 Change-Id: I5b01b9171c5a977c3167b1a9139b1c7667975163 --- note: when cross-compiling, three checks seem to fail on both aarch64-linux and armhf-linux and I don't know how to fix it nor if the issue is caused by the tests running via qemu I am hoping someone can help me figure out how to fix that relevant check phase output: The following tests FAILED: 50 - Test FileFinder (Failed) 59 - Test I3Exec (Subprocess aborted) 67 - Test detection of file creation and deletion of a subdirectory of watched directory (Failed) gnu/packages/xdisorg.scm | 49 +++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 23 deletions(-) base-commit: 7b9cd0b4293041fdbfa065b019cea589cc316060 diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5fd0685c7c..df145a2e0e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -161,6 +161,8 @@ (define-module (gnu packages xdisorg) #:use-module (gnu packages wm) #:use-module (gnu packages webkit) #:use-module (gnu packages xorg) + #:use-module (gnu packages logging) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages) #:use-module (ice-9 match)) @@ -3496,31 +3498,32 @@ (define-public kbdd (define-public j4-dmenu-desktop (package (name "j4-dmenu-desktop") - (version "2.18") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/enkore/j4-dmenu-desktop") - (commit (string-append "r" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gxpgifzy0hnpd0ymw3r32amzr32z3bgb90ldjzl438p6h1q0i26")))) + (version "3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/enkore/j4-dmenu-desktop") + (commit "fb7ba9e3ee6de575377c295b54474049e399b5ac"))) + (sha256 + (base32 "15jlb0si77sndnl5annys0dq2gkwwvzn1d2jwjay9i3xdivzmfb2")))) (build-system cmake-build-system) - (native-inputs - (list catch2)) + (native-inputs (list catch2-3 spdlog fmt)) (arguments - `(#:configure-flags '("-DWITH_GIT_CATCH=off") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'find-catch - (lambda _ - (substitute* "CMakeLists.txt" - (("PATH_SUFFIXES catch") "PATH_SUFFIXES catch2")) - #t)) - (replace 'check - (lambda _ - (invoke "./j4-dmenu-tests" "exclude:SearchPath/XDG_DATA_HOME")))))) + (list + #:configure-flags '(list "-DNO_DOWNLOAD=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-shell-path-in-tests + (lambda* (#:key outputs #:allow-other-keys) + (let ((sh-path (string-append #$bash "/bin/sh"))) + (begin + (substitute* "tests/ShellUnquote.cc" + (("/bin/sh") + sh-path)) + (substitute* "tests/TestFieldCodes.cc" + (("/bin/sh") + sh-path))))))))) (synopsis "Fast desktop menu") (description "j4-dmenu-desktop is a replacement for i3-dmenu-desktop. Its purpose