From patchwork Sun Apr 13 17:39:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41639 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 C61B527BC4B; Sun, 13 Apr 2025 18:41:36 +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,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=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 26C5927BC49 for ; Sun, 13 Apr 2025 18:41:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u41KM-0002pH-J4; Sun, 13 Apr 2025 13:41:06 -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 1u41KI-0002ob-Uw for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:05 -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 1u41KI-00036D-Bx for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -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=iir808J1EBWyiTFGDA1b9nfqELn0pekmeZ4iVU1scf8=; b=a/3uZwt+2wYITdRhjXmL/fqEaOxRUHX8d3CngRy6K0823mS2NLBuc2Q03cKME6bSYlXUfgzfVDN6vQR2f1RoQ8ZR8Zddr23+zhqAFLWRZEPjF32E3kVTMPKWag3anpgYeNSq6v85i9bBo12GEf9rBEZT6o5xK+IBdRRc3iOnYayXY468EoLTmjbly2Ag9HuiGvSv7+eQuNBPZNiUon2Sa5q/tQ+ZKjR7rtDzglZs5wDNbaYkuNqsGhBe/yr/V3515CjZaM6+QRL72+qLeZsrLasb2QHWBwOE1Z1v2yYYb9eqw1eeDJ6/Sc3ewZPmD+B0v8VeXOSn6ITE8A7Ad8UKyA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u41KI-0000aO-6U for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v3 2/4] gnu: quilt: Update to 0.68. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 17:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445660172160 (code B ref 76594); Sun, 13 Apr 2025 17:41:02 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 17:40:17 +0000 Received: from localhost ([127.0.0.1]:43716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u41JY-0000Yl-SN for submit@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:17 -0400 Received: from mail-mw2nam12olkn2033.outbound.protection.outlook.com ([40.92.23.33]:22465 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u41JR-0000SH-VY for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eaXPgD2AhX09i3/tUT6QIJzFmfRhKM3qaDUT1+yHgNtAS1X40gUnXPcHQtILiGEMw4dhViGH0UOhE97e1vpswCWl7mHQjAXHVjFveRn/96LoMuHkodryUr4BJEirPXJNmpQqzymWf3QgIRAR7S58TomfFa4GAlVcLjjlrcN/GHTrAHaUKfAtaELTpO9HptYc/giXXDRgZUQixmS166Pm3vxs+ZCZPpNddnmtVGA9++5LdyEsj0qkt8z5cEjjRSqa1TaMY9wusm7f2xdj+jDbjUOW4xN3WgRIFL/StdcjUxRgiPxcVt8xs2FrmVEPSixRbOncIeaOTJG+qsnDAcvOEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iir808J1EBWyiTFGDA1b9nfqELn0pekmeZ4iVU1scf8=; b=gNVMcyMTHN8VhVwLQkWdlgXyCcLUsqZvEpPkdrX3sMbPOzmM67rEbSWuZb50dXFTw2I+Sbeg5oC9uJGEmUVzUXrNHMmbcHwoD15jcKi9vY3pqmE9FAjvd8vmaGp8Zs1CYdZ6lndr55JhL3UxBuB1iQB9pJroztFayhYQKMNRePOYhkrbdaFeVJBqdkBbrBLZJcWS3DvDdlLhrdt8viKqjjXQgW9wsRTItAR2f0JaoUyz8UN2LQWoXtLYj52g4c+lyF1l2LvQSF366cIwa9cBzOSQgtxPQy7qOHBPEWQXHI990H0Az+fTmwzd7Y/+Qu0vQyuzdx25KMHkqDoatjWMlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iir808J1EBWyiTFGDA1b9nfqELn0pekmeZ4iVU1scf8=; b=P3ZWcfGc3Ru8cuaiF0J8Yz5pRebRD0tEILUaLHpq2o6Zr80LvI/vwMk4qXw1JKj+27FmbeoVqSn1A7r97KZUA/xzVtJ1vTm4tDjvSer3bjNoqzpW+IpLtIuTmKV4SC6Zq6nOMTUq2+q2y82Nb78arF9tzXL66EsxuW4aw8me8vtn+dltsKw/+fOnaMzFHlr91j7vPKOuAJKlTSBmPHUr4Zy0HfKXqut+qjFy6X5BCd+XBu77b2J+5+JlwrhFpwdJs3HMSwXypUTC8+/mbZR+aihvI4qAKiTNwK7Hoy4KYbnK2gbf1z+lhsrN1gZvSIJg+C2cPTKE1xco0C3A/lqVBA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH8PR84MB3137.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:1c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.28; Sun, 13 Apr 2025 17:40:05 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 17:40:05 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 13:39:42 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> References: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> X-ClientProxiedBy: YQBP288CA0042.CANP288.PROD.OUTLOOK.COM (2603:10b6:c01:9d::25) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH8PR84MB3137:EE_ X-MS-Office365-Filtering-Correlation-Id: b7eac096-deac-4145-96de-08dd7ab239e4 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599009|15080799006|7092599003|10035399004|3412199025|440099028|12071999003|21061999003|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: op5/7FyaR/SmNz8SCwH+JI4UN42E8Ma28dR+lGJOkbXgJomsOrO1Ed1d5/76e6UHu5rrlVcFWCbWU9jF42y3gkkUnDG848cD+jwqR24pTMnfQmktLVqr7yZJWczxqKVWSfRMNOiVIcn1r4I1MoWjQJQfT//S+uN1ikhhOa+2qetYGLkVzSddLZ95eFt9oDAB8uN/k4YGd/lDjZuMe8oDWWue7f5ZbTKNdHJaHQ0xE/zzCyspU3kCfT7iQWoNiVrGX40xKhuTNdM4OxnC9po7/45LLmiuhsb7s5opRzgHYjQwnG07vBlVMBRzhwlWHro0Ghco4Ry/z+IYWVZ2jKrNSxT7VqNNzMGZqP22EqEn17NeFrJ/epZyX8D4rIK+6yMakddrOmGrw+C/P4QIVuNU0o/6uV5y5k2fSRMlqjEUKpsQkzw+0Eg5DRP5QBKjJ6daBQTqFAdiK8PYdZWI5QvpOVm2DYmMDfZXVh3DEBdxrrRH9EDj4hbDY7f1No0LvJFZk5W3oyQq3LH+Fgoxk44xUx1IVtIzHgqvCdCs3B6ADmjIf8F/Ur5WYUe+Htaow8fncKWNBpu+hIqdRZhW7oCghwpdbFfGavgogjOByHFe0u9RD/fOjby4M4xUBGjvCIXGTGJ3hUBwECIo8XFI9IAhTn4kzzWYVJVlGiIJU3Iks4zg5LczP8sJIswyBJOULcrK//PDhLHqD4QJB4ChNtTZWY0cqPgjmr6ESZHlprKrdMfxSdkcW41B8DFqpzTowcDoE4/VhchD7cDlBhHxDoDUuC+zkea6aAEO43g+AG0sK7XCcX2/4BZBgGUngqMMG6TIaVXUceh7qjl6kwmByb8ZDqk4WiqVbe6U0aTM5wbhCmkw36AA0BzvFEZqxPkS3iakDtgfljZcFsUIVjUq1ggPhOLuikBQaFMfpMDEpzb1bkYzg+jbqFHXeQCcStBQzYypj7a0DeN5V1XP5o18vvRMUA2p31ir8cSHJkdRgmDEyIAVqSFhP0jiTerjR9PxOoQh+UAh8NULHrUsG0BjeuAD4wUyt9WX+6adwC9E5QUtskujEYMUyPAC9E637S/JsRsAPwiQeZCR0tD2+nFV2YDlemW5E602UT+24ahv0GKCOLoGtGl7Fo8cpSMbnByjyBWo6YGQ+/z9AftWhX9sGC4LGPb8Z6TeUGpiprhj8QxenDNn2AjDeZlUoY5oegrJ47+AUEKf41G+KX3Z3RPZfPZIZd7caOI4DFYRo7MaqX66et3sb2o/EGr1YNt0L9LwlgxCHeFUtOoy2VDe4cgm04RZT56xpS8fjbdCvjl0Vpa+Bno= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PnDsN/h4Paejyf8jl5AGoVM8YNKJUdn9TXIuxTpOZlYsYL7Mziwhi7RiPxTEc6GkgZfuEdrLZy2zwgoeH0w9Yazol+NZKP/IBLh4OSbUKpDbExjeKSCBrySGJE8OxcO4vwjPyepf8ldEAYFawEcY+Oq/Me4AE/DH97cmcjH+ulFNSM2aDtiyDvaaxc5VtKM04bB5ShwIcFKLUvi9oEhgo9jAMvPD00Pvn3nlWWDrxPjhcD8aphXLvwfwJSwgz+z4qbOLPH8Y93CU9vUJRdEXmkur5/x9eAkr//vdixYpKBTbDrXbZEulRDSAcd0dwfbJ+eXndV7vtsp5kA2ycL6dsTp2xefBRK2Dt1Xb80/iQFuhqZfX8SgO62FZXyejZD6gFt43PZeNs3nol6lrhGV1yOEW5JNrgyem1SnulEveIKUJeT1OQnBKdSHOtpNt9rB/+YWxhRBKDURLONxUynVmk0i1lcCuMRIrhru0Im+5XqDjZmTMfF7P6Sqhzmek347V5ek5/1WnylMeqRs5ivmfAnpUTr9TDWoNL3X4cey19hk8ApAVbhdQdOVaktL7QCb5X5RBbqK6NWwJ4C43iRpcriPEA+GpawggyiFxB/EAm6M79kC760OGImi1l3Q6Fo0UrUIBtFKRvcrtYXr3eW5tSA9/5AfdyqlAnlAw8ReLnNEctdGCCvB8hWt6sYC38jK1EYYEfWVDnWV/hlB1NO9VCUF4VXsiO0j+Sf/wA9G2vnGWFX6rpHcTaWpRFMGNRdFNo5RBOF/OGj2kPYY0+96BuidLt2fgb80MMRzbDU0lopFLaWB0JtGIkRiuN9kWFrO3tzCbn2efEYQpMHgQMN/+BP17Z3Mbo9/7dR5Zm/BqSVD9BTkgwd1epvWKwa1zRCi1So9x1+5q6thZYH9PBXUShpDGVTHCTAOKtLy7Y6aP6bZi/GlIyUdMzctmFqOtx/rFSjJiD1QG+XUjUepIjjsV0Wp3akg+p4DvGBkMZ0BLh4DGLbKLNuABJFYYwzUWyezCp0xlirTY4YAcO+hQpzzhidSpA7vAs7ZgPhG/rYH45aKf+hpzrFKU3WtZgTZHL++8YTt7cGUyhrFCPbnXzBFUJGkphSWs7vaI8HxqtkvB0C90fEah8L9eOOa9/VnUse0fGW+qRLuSdwKty739/NYthjnEaO2ukzTY9Z4qAitsiiuFA2TF2LjxI8xLTU/r2gq+CQ1vgKh8J3KT2F6La6nWV+FGy/XXCIgahpHUdP25OY69S85qoM/Z+p4OM+Tigonl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7eac096-deac-4145-96de-08dd7ab239e4 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 17:40:05.7245 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR84MB3137 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patchutils.scm (quilt): Update to 0.68. Enable parallel tests as upstream fixed it. * /gnu/packages/patches/quilt-grep-compat.patch: Delete file. * gnu/local.mk: Remove quilt-grep-compat.patch. Change-Id: I5da532c07c83d00363799a1cc7f48e0fe63864fe --- gnu/local.mk | 1 - gnu/packages/patches/quilt-grep-compat.patch | 145 ------------------- gnu/packages/patchutils.scm | 6 +- 3 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 gnu/packages/patches/quilt-grep-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c0b9a76cd2..9d8b17f94a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2164,7 +2164,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ - %D%/packages/patches/quilt-grep-compat.patch \ %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch \ %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ diff --git a/gnu/packages/patches/quilt-grep-compat.patch b/gnu/packages/patches/quilt-grep-compat.patch deleted file mode 100644 index 25fef506d1..0000000000 --- a/gnu/packages/patches/quilt-grep-compat.patch +++ /dev/null @@ -1,145 +0,0 @@ -From upstream -https://git.savannah.nongnu.org/cgit/quilt.git/patch/?id=f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f - -From f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f Mon Sep 17 00:00:00 2001 -From: Jean Delvare -Date: Fri, 9 Sep 2022 10:10:37 +0200 -Subject: Avoid warnings with grep 3.8 - -GNU grep version 3.8 became more strict about needless quoting in -patterns. We have one occurrence of that in quilt, where "/" -characters are being quoted by default. There are cases where they -indeed need to be quoted (typically when used in a sed s/// command) -but most of the time they do not, and this results in the following -warning: - -grep: warning: stray \ before / - -So rename quote_bre() to quote_sed_re(), and introduce -quote_grep_re() which does not quote "/". - -Signed-off-by: Jean Delvare ---- - quilt/diff.in | 2 +- - quilt/patches.in | 2 +- - quilt/scripts/patchfns.in | 20 +++++++++++++------- - quilt/upgrade.in | 4 ++-- - 4 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/quilt/diff.in b/quilt/diff.in -index e90dc33..07788ff 100644 ---- a/quilt/diff.in -+++ b/quilt/diff.in -@@ -255,7 +255,7 @@ then - # Add all files in the snapshot into the file list (they may all - # have changed). - files=( $(find $QUILT_PC/$snap_subdir -type f \ -- | sed -e "s/^$(quote_bre $QUILT_PC/$snap_subdir/)//" \ -+ | sed -e "s/^$(quote_sed_re $QUILT_PC/$snap_subdir/)//" \ - | sort) ) - printf "%s\n" "${files[@]}" >&4 - unset files -diff --git a/quilt/patches.in b/quilt/patches.in -index bb17a46..eac45a9 100644 ---- a/quilt/patches.in -+++ b/quilt/patches.in -@@ -60,7 +60,7 @@ scan_unapplied() - # Quote each file name only once - for file in "${opt_files[@]}" - do -- files_bre[${#files_bre[@]}]=$(quote_bre "$file") -+ files_bre[${#files_bre[@]}]=$(quote_grep_re "$file") - done - - # "Or" all files in a single pattern -diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in -index c2d5f9d..1bd7233 100644 ---- a/quilt/scripts/patchfns.in -+++ b/quilt/scripts/patchfns.in -@@ -78,8 +78,14 @@ array_join() - done - } - --# Quote a string for use in a basic regular expression. --quote_bre() -+# Quote a string for use in a regular expression for a grep pattern. -+quote_grep_re() -+{ -+ echo "$1" | sed -e 's:\([][^$.*\\]\):\\\1:g' -+} -+ -+# Quote a string for use in a regular expression for a sed s/// command. -+quote_sed_re() - { - echo "$1" | sed -e 's:\([][^$/.*\\]\):\\\1:g' - } -@@ -215,7 +221,7 @@ patch_in_series() - - if [ -e "$SERIES" ] - then -- grep -q "^$(quote_bre $patch)\([ \t]\|$\)" "$SERIES" -+ grep -q "^$(quote_grep_re $patch)\([ \t]\|$\)" "$SERIES" - else - return 1 - fi -@@ -365,7 +371,7 @@ is_applied() - { - local patch=$1 - [ -e $DB ] || return 1 -- grep -q "^$(quote_bre $patch)\$" $DB -+ grep -q "^$(quote_grep_re $patch)\$" $DB - } - - applied_patches() -@@ -465,7 +471,7 @@ remove_from_db() - local tmpfile - if tmpfile=$(gen_tempfile) - then -- grep -v "^$(quote_bre $patch)\$" $DB > $tmpfile -+ grep -v "^$(quote_grep_re $patch)\$" $DB > $tmpfile - cat $tmpfile > $DB - rm -f $tmpfile - [ -s $DB ] || rm -f $DB -@@ -520,7 +526,7 @@ find_patch() - fi - - local patch=${1#$SUBDIR_DOWN$QUILT_PATCHES/} -- local bre=$(quote_bre "$patch") -+ local bre=$(quote_sed_re "$patch") - set -- $(sed -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\|\.xz\|\.lzma\|\.lz\)\([ "$'\t'"]\|$\)/!d" \ - -e 's/[ '$'\t''].*//' "$SERIES") - if [ $# -eq 1 ] -@@ -631,7 +637,7 @@ files_in_patch() - then - find "$path" -type f \ - -a ! -path "$(quote_glob "$path")/.timestamp" | -- sed -e "s/$(quote_bre "$path")\///" -+ sed -e "s/$(quote_sed_re "$path")\///" - fi - } - -diff --git a/quilt/upgrade.in b/quilt/upgrade.in -index dbf7d05..866aa33 100644 ---- a/quilt/upgrade.in -+++ b/quilt/upgrade.in -@@ -74,7 +74,7 @@ printf $"Converting meta-data to version %s\n" "$DB_VERSION" - - for patch in $(applied_patches) - do -- proper_name="$(grep "^$(quote_bre $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" -+ proper_name="$(grep "^$(quote_grep_re $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" - proper_name=${proper_name#$QUILT_PATCHES/} - proper_name=${proper_name%% *} - if [ -z "$proper_name" ] -@@ -84,7 +84,7 @@ do - fi - - if [ "$patch" != "$proper_name" -a -d $QUILT_PC/$patch ] \ -- && grep -q "^$(quote_bre $patch)\$" \ -+ && grep -q "^$(quote_grep_re $patch)\$" \ - $QUILT_PC/applied-patches - then - mv $QUILT_PC/$patch $QUILT_PC/$proper_name \ --- -cgit v1.1 - diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index b929ed9a5a..ea784c5acd 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -169,15 +169,14 @@ (define-public patchutils (define-public quilt (package (name "quilt") - (version "0.67") + (version "0.68") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/quilt/" "quilt-" version ".tar.gz")) (sha256 - (base32 "1hiw05aqysbnnl15zg2n5cr11k0z7rz85fvq8qv6qap7hw4vxqrv")) - (patches (search-patches "quilt-grep-compat.patch")))) + (base32 "09l4nf6qb8y8l62z8ypdg5mraz0lvqxg1j1p6xdyh1n10gg0k37y")))) (build-system gnu-build-system) (native-inputs (list gettext-minimal)) @@ -188,7 +187,6 @@ (define-public quilt guile-3.0)) (arguments (list - #:parallel-tests? #f #:phases #~(modify-phases %standard-phases (delete 'check) From patchwork Sun Apr 13 17:39:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41641 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 1721027BC4B; Sun, 13 Apr 2025 18:41:47 +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,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=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 9943F27BC49 for ; Sun, 13 Apr 2025 18:41:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u41KN-0002pJ-04; Sun, 13 Apr 2025 13:41: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 1u41KJ-0002oc-99 for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:05 -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 1u41KI-00036O-Rw for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -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=3yJ8lnlOCPcK7hRFUgk/y3XTICoUCEFgGG58pu0M2ms=; b=uA3shi5FbOATsiBbB0El53E8EeP6Ek5xlanWn1kgbytfFtdSQcdNn1f9nxozVzlbo/aE5NYtqWWptkSK7xmLQuC0OiRYD54eKuS3/fz6ObY6UtH6ZM0TgjmZGaXEmUWeUGHBRRjsj6lJ5MNTl+rjUbI2apiQTg32qBGRTZwAAlffi7cRnO0DqhLAOkZLjXO671UXGIWTxjGnILA6rnDtb27NJ9hI4+Q40Poq74wRwM7UkhhE180x/lzr+5gx945NrNG4Cwjcp0BsMlIQ2tnw/hGjkTrybPJHHC6LSRYGeFfH+ECk2NEZKXvwUdoSPoh3dSTOKzpXbj/YXI2f9xHTKw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u41KI-0000aX-ME for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v3 3/4] gnu: quilt: Use standard check phase. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 17:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445660302193 (code B ref 76594); Sun, 13 Apr 2025 17:41:02 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 17:40:30 +0000 Received: from localhost ([127.0.0.1]:43720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u41Jl-0000ZJ-NI for submit@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:30 -0400 Received: from mail-co1nam11olkn2051.outbound.protection.outlook.com ([40.92.18.51]:30560 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u41Jj-0000Yz-DY for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xmjLX+OYsyPC1y5pd8VwVxE4HcS9vFvjwB21WIHs2yVS4k+ssW7Ylbw1UxhTLYoPmcNo5SbYEWhW1p2M+9Rb1pp7GKVUDN0AsYg0cbn1xhJb8laEA5hVVeOEoVQc5O7XbWXn1tlyjNNEH9rfbCZfag/eukBEEwEaVarZrphsDdaBLjNobNBr6QZZE7GyM1Za0EbTJGTpKyeig9pCViKxuxds7Qra7HZDuwXFWjcscxuJR2ogHbCWnvsj9fRfKNKHgj3/tDzPx9OMJ2q2TBKkx0+bI2dqwfwgc3bYs2O+3Ayl+TMCmUym2+7w7nPmfKCEcj/v4KpxB1Bqb1L8rBTf+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3yJ8lnlOCPcK7hRFUgk/y3XTICoUCEFgGG58pu0M2ms=; b=tEYeYMNcgauvJAT1+FQsO6dLhw3g5agAhp3GGWMEzvqQ5AJBFNRugBUd9Bbze0Ov7BCsgrZ1aMyj2AzBGp/acSJqAF9llw6rV8gHLx7wVgtRb8l7WiL3HJgWx1uAmIHpm3H20ZrPnx7zhEE9Xb2OrV65poca6n5YyR9iJXi/mekabwYHR/6cp7gWZYvxJ1OuPT72cjjPeRP/f7EIW32T31sUIEDUERnRJ8HQ0eYrO9ZhfCjohc3oquup+M8qJCCF8YCF7rZggqR7HvbhKO4jZn9Y6y598RZH3Qn4lsWLwIb86XNKpNYLHUtBOXlzwct2qpXFwXAgcPLbQRQ7lmQvKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3yJ8lnlOCPcK7hRFUgk/y3XTICoUCEFgGG58pu0M2ms=; b=hSVn1ivf/mMGeyYzT+7HIyY4th2DFtXK/9FS8dP2c+qInjXlK7g/EsGCoFfOJ4INYzybunBozwn8rh57mqRFzNec7MuCgxs/TxL9/bX3OdLm3RVOPXQiHcSS4efgDsvWdRxYCfgWk8Uy+FBZni6pH3BN+/0gmXObEC0yauYKncBvV7si2C4RgaFCx8FCDXOBE80P1fqebz7zLqHrT4WCIyOmefOKEAuq0PD6l5busTQ5cIlUwQhEDIGXISLKx08BIBKT+6YiYpkXbQq5BgWY3L1Od+Pl8T1LBeoHK9u0+1KNPEH1kidqGRM2QjBaA2/4IA69gCR9Jhb1CuOdvQ/QCA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH8PR84MB3137.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:1c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.28; Sun, 13 Apr 2025 17:40:19 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 17:40:19 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 13:39:43 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> References: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> X-ClientProxiedBy: YQBP288CA0033.CANP288.PROD.OUTLOOK.COM (2603:10b6:c01:9d::10) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH8PR84MB3137:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e8bbee5-91ca-40dc-cf44-08dd7ab24214 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599009|15080799006|7092599003|10035399004|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: VaWoZ+v+BEKq65oIKYDApJPMxYvpi/V3p8v53jDzHo8i3w05cZki90spm2cUeRAlELgXBcC0x63EEWEV3PFPK5XKg5oRLoJHYebYzIsRNU2SecWysywGthbj++3ptrgrDXwfWYQDwYsAQ7Zwov4y2TEUliFzWzZNvg56weuDrvPds6wcPO5qdm3ij44ZIuCq5qW/Xlp4d1jrJj9g4jDoNZwI6K/o0eRb/7CcL9YSl0zjRrAyX7acIjpQw5T+L6qyOvR4tLaY9aVN28WqGAI7Z4pBDioXVY0KLKh1rWvcYq/3/nt7sx26+62vWEHOvZ7dDBREkpuULzXolfbSrawp+3vfG6NftyH0Xn6unsSvtvrzSoACEHIFkjSO001AK8VqZo89hrAulGGWTWk7uw0syuWpydBNl00G2rk49lzgBWM57UZazw5RBIGXwlRyzuzzdJiO9YpUTY1BoRHyqxqjzHeQAPX+VA5A4KIvzlSzKiUhPU7BUjK3jk3zFYHaezMsRY1YjYv1VsBqyZPVctXhNsXNupkI/JNw6az4uLdPQfPXODu5KWmk/znqUXHrbE3MJxSsNGyMc4n94fh/0v+XlaFVghleiVqOAN0gDXZj6xCeeLP3LFkxukwSK2AS/x93eD5q/o4+M6JTJZsHTTrWECW9NNZHO4qUlgSrZtHKUj48uOVKQm9H3mMHJDQdFXKLEREg0w1CQJQxNhrXI+xVc2jgg5sOXoI4DqoM8FwuhCxG/iwZX6v9XnhGawttvMbz0dV5XZVrlJaF8QZ453KBAV3IvNf8Ql9Bqnl7UtcwxA79kOqhRHYQ8Ggh1iuk3MXcVSh345M8RmBmcdidfw7qmRsVAZ52hMn8/fDqarcSm+nxJ1D2/P6aKkNRYeLwZ6EQoBXTaK4psef2FKoVgLvM1/oRkUFuczgsu5ZmcC5rbpHTJ6SI4hm1mMpotwCYr41RN5MF3vV8Bd86wOy/veyOC/xEamWiJp84FI7JndJ16b78+Vyyam1YjJBV4ppAPkavMUYG02UqqwSAgZUT4BehekNN6EceFF6RGjy6lVLINZLi2fZA6p+FRn1nSHcNnJENSCz4FStJ3EKrz1UUAVXn9LaF3+itoLfcYbMt6UsrLZQu955LGA9U42KsvpMjMbmv3wNBxhCPRxSaXZnGlUGQRlDUbuTt6SkkZBr7rKfqRfec0ZRnwwuyT5QVwWSYWVGj5Lc7VGnkB6O6k9d7txFMQYnT/Nm32ADqvGHstRpspklVYJfJq4qgKBnKqp5Emuk0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dKKFwCXnNcx7g3QBMEfYwrqy381RYNxZH8Rs0mbjwTXxFgBXVUvbNsrcybU9aS2Yxp0BzW8qM2IqNzzqHMQBmgDx5Mgot5DQHDvH5scp8wdvzj8wb5SWthcsEazQ/YgTzcVx4PJTRr+/HFfzBLuMXwGrLSCgpto/Toeid3UFPXbBPAVhiLcNUfFBKxCtR8s8DdvyhZx2aYGahXLKRRt8IjOmx1BipLMfHm6Ed+SnclWoHTJX+TtnJt7BCeADLn+QoiIf8VhAfLZHOoDKEy+I+NVCLrKIe/Yb+btWa5KImakd6icpMB279fxZ1Z9OtSiaIF+A420XKuBfCNXDPCV5RgTc5zXu3hQQl+hcDPF/iBOJHo/U8aCUcRza+wR7thmUBKIV3IjjTSm5A8p9eQT6GzDSpkOzpfPmhBNnQ9+at03uzkaN/exqQ2ieHc/3+NDT2NLHHk6euOqIYiymV6GAuQxAI+haamsXzcvOxpfI6ocAdCmH9+pMjqX+PCtgg1tdMOyFeOkBe3cpU4p4423YfVldujvKPfP4Ie6AZ8SibIiwddWUAM47TY/xvupLHweMc/hPUEwaoTdu+Ivqc5Qfab2JG6PBkLCMjfdp6XInoKhJ0EWVCu4KipKmRFuQjjxSAC7U1eUdTuKwHqRlc+SzbPVfzZm6q3v/Ixq+1vEs7AKA4pTu7r+GPgY63Ts21m3vsYtAmjdsNgm9aayj590WgGz6FM7lOINgcaVuRyuokewApgKVLoRLrdaXrmFk+eyHIqJagpdokH8oZPRaOtvskNn/RHhb42FwwyTtsNCaUg5BIhpL8ilFcg2I40oW7XMsDzjlaDZW9sx//hqtlQwkQMb78nBHwSxEd0ZJD+32GlFkwX7711wVDmbvBoYQjkErU6paL4RyKmpD73XwsR4pCmjMgY3sbpcAiz4YJyImiymw37C753d5kmI8oVEnZL7J/m0sHJoDdOsy5o9xQ0ZPhE2tdY5TJDaLpQfPXIBK69baJHXBKrWFYsGAjYRF7d2baMhWMu43IeqwhwJzt9a9jSCfwXoibidvy7FVbgktPvxdR+cpEU9cTGc2Th+3MzPPjxymaJ/uiqAN9Hgs17q2Hl1Lcxf7ylhBl3UJc6O2ZBT92t97YBb9TflT06648G7N/2ESSQxmxlIEfSIwJMQ0ihil/L5Tbh9YMmho7TONfCgf8kOcz9fXe12jCpeba7prFYggUsNw8mAeon3yeQ8zKGrLQ2A05VRmdSr74WtcRD3NBPM270B2nI39+/57NzSF X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e8bbee5-91ca-40dc-cf44-08dd7ab24214 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 17:40:19.0369 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR84MB3137 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patchutils.scm (quilt): Use standard check phase. Change-Id: I79cb2828a877b7b6ba3cf7b16a56f454ea44803d --- gnu/packages/patchutils.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index ea784c5acd..3da1e7b3b4 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -206,7 +206,9 @@ (define-public quilt ,(map cmd-path (list "find" "grep" "mkdir"))))))) (add-after 'compress-documentation 'check - (lambda _ + (assoc-ref %standard-phases 'check)) + (add-before 'check 'fix-check + (lambda* (#:key inputs #:allow-other-keys) (substitute* '("test/run" "test/edit.test") (("/bin/sh") (which "sh")) (("rm -rf") (string-append (which "rm") " -rf"))) @@ -232,12 +234,12 @@ (define-public quilt (or (and=> (which cmd) (lambda (p) (string-append > p <))) &)))) - (let ((make (which "make"))) - ;; Assert the installed 'quilt' can find utilities it needs. - (unsetenv "PATH") - ;; Used by some tests for access to internal "scripts" - (setenv "QUILT_DIR" (string-append #$output "/share/quilt")) - (invoke make "check"))))))) + ;; Assert the installed 'quilt' can find utilities it needs by + ;; emptying PATH of everything except make. + (setenv "PATH" (string-append (assoc-ref inputs "make") "/bin")) + + ;; Used by some tests for access to internal "scripts" + (setenv "QUILT_DIR" (string-append #$output "/share/quilt"))))))) (home-page "https://savannah.nongnu.org/projects/quilt/") (synopsis "Script for managing patches to software") (description From patchwork Sun Apr 13 17:39:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41642 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 EFCE127BC4B; Sun, 13 Apr 2025 18:44:22 +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,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=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 232E627BC49 for ; Sun, 13 Apr 2025 18:44:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u41NM-0003Ye-Jt; Sun, 13 Apr 2025 13:44:12 -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 1u41ND-0003YE-73 for guix-patches@gnu.org; Sun, 13 Apr 2025 13:44:04 -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 1u41NC-0003bB-CC for guix-patches@gnu.org; Sun, 13 Apr 2025 13:44:02 -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=2enB76rSHE13uTK1+923Wzfgo7o6zO2RszsMz6l8g+U=; b=FDmMxECVJqI4ynFkjBz3f8+3K6I7qfDRUIJyw3lWnVI4+YfAWIfIzBVeuQWXlRS0aCQTw5EzAlBcjmcko7aPp5sI0GDgf0hf+ibJO0YTW6Zi37UyoF8MCaitVqrc9BXJkY1o5p2qMAajbQyEOuu13kfytut5pAU9n71EDy/VhqCNYVmrr9I6ZB6fBTAIbtjOf9Ib8So14bUQKtHoKoLwx4UkOb9fTGCkJN1Z5AmYrT/Yo4izPbWOSXIYTDi7tj2j3kN/knEgFoV6fodXSx2WvGVdmxxH5WRsreQOFxbcROUD78egPgyKlGDnhMb9YlfdV/Xz7HekHrLjsv90Bl7ScA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u41NC-0000gw-6P for guix-patches@gnu.org; Sun, 13 Apr 2025 13:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v3 4/4] gnu: quilt: Build emacs package. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 17:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445662362635 (code B ref 76594); Sun, 13 Apr 2025 17:44:02 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 17:43:56 +0000 Received: from localhost ([127.0.0.1]:43740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u41N5-0000gI-Iu for submit@debbugs.gnu.org; Sun, 13 Apr 2025 13:43:56 -0400 Received: from mail-co1nam11olkn2064.outbound.protection.outlook.com ([40.92.18.64]:2880 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u41N2-0000fn-3n for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 13:43:53 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KcmfQ1lrXfSgvK5zVINsR1tIv36Y3fU2LRKyQQq7T1/qzlsQmJqJvCX8GA5lJGpdWaLFL/Bvnk8rPVERJoFZ9LOVkIviEYhlxy3Y80UMgSTsDLFcgZ3G2Uloh68yBObMgS6DuGDTgCy2F77XGl8KVClnSC/itctJvhwLJag6jM17YiOeTEc6GTHBjTeWRf+XyRRHO/8N7GAlNdKlIXDj6j6O4zSwSpBt8qbZsRYoSH1bWL4qC2gbXgT5e1axq9dReqmhh1K6MrH0RUBe+jtt5M8hHyHZn/lBPsqEiFeDeem2hN6cwSpUkxt26pnrE+6CSwqAcs9WeA1cgmzTvZw3cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2enB76rSHE13uTK1+923Wzfgo7o6zO2RszsMz6l8g+U=; b=Bx2DXyJynPRw4XxMC6jD1fxs/4aJ0uFAYHJkEWn3t5FnTsObdQsOkx9THwsOnuNXfV0Ucwv4cX2KNpS5tm8BR9ors21eYU5e1RU/44saG3/prqUNPsC1C0uM8GrpGIfp6La9Q2Qyoi/9PXh72w176gqagQvtiSSXP7QfRGmKG2DW31rqsVjf8qADgC0jE5FMVvxE6EHKzJzAZBDbYtks/a9S68GiqTQMqDPB9fCEVW3+og9Pa+fpDnWXuD/j3BeVw6Jwt1Sk7zGl5jFvokrQNX5qWjw5kQkU3wr+NX4JxdN/rQhwrHj1IJ3q2HgE0PFT7FJp7cVYhSmBydDlOWSg1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2enB76rSHE13uTK1+923Wzfgo7o6zO2RszsMz6l8g+U=; b=YBLU4Ugu4GLkPxLzO2CF3oMJT2Xnm2x8RRk/hju8xmfwCWJLTECKWuxlyGLyxCxvNVmWj54lz+jKyRxUr5c2SXmjxtNMkPJhCszkQE22dMEAHI56ANr3iPg/66/VfdPECOlBniKzYAWJQdRni5LvSs5zE08VgQcTOwfG0QDY9D30O99/QDD2tYYwTP4zOSg1tBiHsBdIfgJaKytHyJ+xuxYz7vq7PU489x1/Z+c9Lk/DYZcZ4vrnIzK6rHCX0+m/gXUtazkBRstA3lKpQGeGebi46ZvA4nx6h/3/ejeonHP6qZnVZQzaQMK4GJ5pKfd6eCteu6xQcKlGr8Qc0yByJQ== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH8PR84MB3137.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:1c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.28; Sun, 13 Apr 2025 17:43:45 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 17:43:44 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 13:39:46 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> References: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> X-ClientProxiedBy: YQBPR01CA0102.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::38) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <363a8ee8ddfa6c5776c9f36e2d1beefdead30429.1744565984.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH8PR84MB3137:EE_ X-MS-Office365-Filtering-Correlation-Id: 3deb7f7d-0ecb-4470-7817-08dd7ab2bcb2 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599009|15080799006|7092599003|3412199025|440099028|13041999003|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: aM7Gz3C+5TUGz+rdrrUm2h+km2xuty6zYErcXuf9UTEUjnF3BGI8efv0ayLLvDrk8Y2ofTP3WEAhkJeIFLEBdeUbFR4E33f+k3kGIO/aNa3f4Z1rl1Knen9WH08Z4lbNRB7PFBp8Q239de+fB11Tfcv+5+xLtoYt2f+HNRTNKxPFfma7VzYKlEWJ95TWOH89xOwtTv3S4mLIk4m7C3ZNVXQfClNfIoUA1LdHTmlepx4ThZP4i5JRx0HMZWQ0IM/bQeO+zTshkOQrCfUZz7CPaQYivvO57hsySd7wVmqCVRlx1sSn8YHjuaq1GTMu4QzYVqC6OcR4C6LCJBg6q5Om9TCMJcoTAHUs5aiQdpPcKqp0opFt8+hAzZCBRS6k7l0LiUn8U8DdUuntD2ber2FEMa64i+jKcpb/2z6vgkdhWkV8apPVoRXu9h45yQWrbjFwGNXk7qSFVfMn+kW4IqsgaDu2aY/NDHfr2Kl1iLh/PIgj5CJolBnRosotT5X95EVGrA17qLOwdGEknVoUWCzgAHmVqIdF6vKQ884/ytZHOBuiZRzalXY9lKgJ8JDrT1C2TadIao4k8kKj3wIQPepgOcvtfzSIJOky00aTq+F2o8fouyTYmksFM5zGzceQ9XWxiJ819QFPLLyTYNNPp3UssmElNDZ4cRZ1PKQMNJz/yvlj96z3n2V9m5fzsWqZlI/vqbpKpCe6DSfyUGAfYggxbvk2qMHyW/lbix2SYTIaVzfQBo51PFXhB+Rk4pkQSQnvITn3taFW1d/YlyOMS5ZUxmmvsturQCt6EzGNAMTMUQygBdrzkwdnb4fADlbZienWiDUhqBnhJ142h4QlTxC167YLlIqEJ8qGG3ns85JFE3qeuUj2yN34+yKpHQEdMj9QtpEG8VdPHhzAFDKRlo4iNi+/N4NN46RGdgIXOewAd5waSvdJ31sM3oG3oHmy3E+w+1BHvFJx0BYJXfpgenxEDtbgE3gVTpCkzjH8wH7jE+pRwpPZ/UAxMOB2gBUbQ+cWGjQDjXNnHc6IFDDW7yOKYyaEMnx3DazOL08xejHDaR4OGziOXLC1tYMryMmDG5ksQANpsjIzfOPF6/GKZv0eSy4ezAg1P7vKwYo/J8JQcKDbMx0qnACeeijpim/azo15YJQGG7CnLWh/al2+632IYl7aPBkS7axBjL2nd1n/vefUv72palwmaBE9vrCaRsmRMgBRkYUhr5S1Yvy/Z7nxbQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ojkD3CqA2KD8qKe2ERNAZpcVBTWnxSGCmrmqJAuxJgRzM4giklxCJvk3wQevF6J2hax/c8GQmkuydy0pCuzIM1lNzJSy1lTet+uuyEpV2CNxZGjKPI51x3KozEGPKC2UJs4vn+WMBQj/WCdOExtfl05P50F5yq10wecFOTg/5qO4Z1kdH283YGiUjvNMyoE2NGzKBgFzDKjsxSkts+QZ4s7+Zr5TqDleoFftZNN+zrQz9AVktPfzcfm9Yfl3vZ3TbdeVsotvjIbzysCqA95rwQOTtv954UFpnl3icpPReb1Z37eFpTrTVIGglfaGoQXjjTTU8bNn/EWhGuMJ2cKqTOOIZH3ZNKSYHsnL+TMqyg7qT9dN6XTRCeh3tZAGVuMMa+i5buSzWUUC2RPbQ9WeN+vuK2Jf/YODM90ByOtp+5UfZ3xgG4qtvstdUCfihJLLMfa/VJDbUCpczKJm1u2LY+1sz+gyhuvdImqIvds+9Jp6abSbC85oEceYRjGk6bqqjpL2vwBA9Y1VXJ+wphx2gW2AOTkgCpQrntTjNfZOy1v1vFetMD0bMpFJgaqkr2oCY5wg+Q9+SDn5aH5V1RiYJKIYsiv+kcPGod76s9Z7PY49R19sYXVRU0FkY3/DIdJ1oz9a7h4g3P6EGq/2ZXHPBpyTK0RsuFFNQmDBAhPFTMcNX/nX0WBvGK1niVsZgkehBSjf+lOvVlHvHyIOyoTZbh0JMFHLWsbNy4hMZSgTUVTZe3P5NVa8CFAdvF2wV9rBjS2DNK7J/dB5soDyE7+h6FImsrq1jY32z4bhym1HjYb6rNpxcGVYiaNErJWXBuNOpULempyJdp7RqXitscmapU8AVrLmqjOVXVxjxH/jwZeahPKAa8InhW5zjSTuRqCWEowUymAP1o94zk0So4SXOC9FL2Q2GCl8lTFX4p1XyqwDO43LBfNT+cwd3vPhJwV3lxexCB1JEC803b04ZHWWR9ve2GFPl9g4+6315kocg5hUT7bugk/Bi2aHhOX1zpsb0Nqc2+w2eEXpzjKXRs1f2B7/Czh/zf6lolxhYul++ky2u11B7XNRMCO6zctXjOJecsDFSjORn6AIaL5sf72utw0HUZutC4GxjetyF7ZTSq2oOS5mmo/0ckDclSgFWVSt1azuCmDl6zynQ6T1gOyTyu0Dt4WS1+aFHFPtuK9CuCYLbmQKB33BciDwEKQbMYuAUnRs+dAHtRmFjwIjCa8CoEGfujUp96lD3Xz5G3+F022GgkBcx31tbiEoaT2qNffz X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3deb7f7d-0ecb-4470-7817-08dd7ab2bcb2 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 17:43:44.8367 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR84MB3137 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patchutils.scm (quilt): Build emacs package. Change-Id: I4d70ad1c137a377f71cd9d3f1b69f5ed95e4debd --- Look at this absolute abomination! I'm so proud of this! Please tell me all the reasons why this a terrible idea because I know it is but the specific reasons elude me. gnu/packages/patchutils.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 3da1e7b3b4..64283d4ac1 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -44,6 +44,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages django) + #:use-module (gnu packages emacs) #:use-module (gnu packages freedesktop) #:use-module (gnu packages file) #:use-module (gnu packages gawk) @@ -179,7 +180,7 @@ (define-public quilt (base32 "09l4nf6qb8y8l62z8ypdg5mraz0lvqxg1j1p6xdyh1n10gg0k37y")))) (build-system gnu-build-system) (native-inputs - (list gettext-minimal)) + (list emacs-minimal gettext-minimal)) (inputs (list bash-minimal perl less file gzip ed diffutils diffstat findutils tar @@ -187,8 +188,31 @@ (define-public quilt guile-3.0)) (arguments (list + #:imported-modules `(,@%default-gnu-imported-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:modules `(,@%default-gnu-modules + ((guix build emacs-build-system) #:prefix emacs:) + (guix build emacs-utils)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'emacs-build + (lambda* (#:rest args) + ;; Don't build using makefile + (substitute* "Makefile.in" + ((".*lib/quilt.el.*") "")) + (with-directory-excursion "lib" + ;; Run the `emacs-build-system' phases that aren't 'unpack' or + ;; duplicated in %standard-phases + (for-each + (lambda (phase) + (apply (cdr phase) + ;; No tests + (append args '(#:tests? #f)))) + (filter (lambda (phase) + (not (or (eq? 'unpack (car phase)) + (memq phase %standard-phases)))) + emacs:%standard-phases))))) (delete 'check) (add-after 'install 'wrap-script ;; quilt's configure checks for the absolute path to the utilities it