From patchwork Sun Apr 13 14:57:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41633 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 DEE4827BC49; Sun, 13 Apr 2025 16:09:59 +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 9880B27BC4B for ; Sun, 13 Apr 2025 16:09:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3yxN-0004mk-6g; Sun, 13 Apr 2025 11:09:13 -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 1u3yxE-0004l6-UU for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09: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 1u3yxE-0000T3-4j for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09: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:References:In-Reply-To:Date:From:To:Subject; bh=kjUSAaR70ega5Ondqx+CswuHg1T8DflXuLgjOKYUc/E=; b=DhUGQeo3TJxQ00TX71nn8W5yqZdPiyQINieb0Amzlo5JBm8KzZFcD9Cj1PELj2s9j6U27Dj50QRRqW55B6NXJ/HR0qGtl5dJgcRwSdyYNZ7T8jloQSU8Yy6pLxTaVt4Oqw6poWxmMJKcebtctH2U9DfYmv4pxJVTQ1Exmup4646lS5eNqdxL/vvuVVBV+atNnV86VLglAozG/69N8pyK9A6x8uNnUM0u9YMxY1T7XNN5fAweeRIV6wV3DdL71bVm6CTSupsyi0WVFAJLZgTYHAcqG+w/IeJ+c4l4VMIzMKd6C/QpPXDcRYNFmQ5y0TDLsZd/oxwGbZ2alpfzZgAoWg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3yxE-0001Np-0H for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v2 3/5] 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 15:09:03 +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.17445568965201 (code B ref 76594); Sun, 13 Apr 2025 15:09:03 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 15:08:16 +0000 Received: from localhost ([127.0.0.1]:43391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3ywR-0001Lj-QD for submit@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:16 -0400 Received: from mail-bn7nam10olkn20805.outbound.protection.outlook.com ([2a01:111:f403:2804::805]:14176 helo=NAM10-BN7-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 1u3ywK-0001KU-Vl for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i6bMAnsj0f47cGcWERWREVASveURdbi+pahKiEBzTe1PvmFVbSBbVOBsxcLsLldiRHz7o7oCFsAniVkSWZBkOsjtA9qjCMEzwKo4Eh5wlRsqBo//g24YBjpb5If84NZKf8FPjBtR1ezdVQscManPg7uZtyQUbN/QjzRFbfyUwP1agZTyWK1LF7IjQkvlIOUavMFoOUwRc/g3WSYkLeIFDlS/VqHyxYKpM+C7cQG4UQssJJaeEyXDJ1Ozi8DcpJPqN4w0Rm7UrsHL9BV/zCz/Qe+gqIZu7vKXOaLDFf/ebzVjXYaY6bWXx/PIrPM5fgnd+SyczkVImNWtg+hKUspM6A== 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=kjUSAaR70ega5Ondqx+CswuHg1T8DflXuLgjOKYUc/E=; b=TT66FjYAF0DxT7nHSNz4H3wZ61Zjtr9tWzVVznBfd918pdFucR4Z3S41MqAWV/iLcT6RSU0KVU3XTmVswDcAVYJxiQzy37iPSJGO8kvUPNI4GrtZvNUINPpmqnVsFFipH1DL2Ui5oPyHEtedxIw2bSzdEG+4hoXjqD1bacqCUvb+vasEfsP36sUQkzGMBesc6bjxRiAfVn0Z7kwRy8HbPaU5PbrLifVl4p6LDMiVMx97HR0bzf8N+su1fzInv7/9UsE6Bb7CPt+X4aHg3Wop1tkdXMPfMIdYEbgXVlsYizwmJSBhABJNc6RasEvVXC8LzZIKf6sX4bkcmxNEMPyJsg== 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=kjUSAaR70ega5Ondqx+CswuHg1T8DflXuLgjOKYUc/E=; b=UukMpKS1e/y7P9VbAaPobF7c4LrOgNdwE6cyn/caLWAMqCdWJNxnLgjyj01g8X0eARwnexc2NdJrV8gVLRBRBpABYTDM9Kx6BhwOS//l7tFmJkbBELA3h62i57OtXNwtaJf5Ztz8MOUjEI+NSSueDBjiKdOn74PUT6q7DR48prKwVks82gPyej6lEbXCmkgahVtwSI/d8sHzQitcBeDIvxtL+UdqEdmMkihOkwtptUo+Mz7DXezDQWK30RFmSBRGYENnDFpuHzPTGYOJ5ciljQsqTLEU+ZOZjr9sw+k9aiWxbnFFmErOId+D8WwPOA/fDR3U/FtwQzgVbzCK7qQ3hw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SA1PR84MB3165.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:806:251::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.29; Sun, 13 Apr 2025 15:08:07 +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 15:08:07 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 10:57:04 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YQZPR01CA0001.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:85::24) 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_|SA1PR84MB3165:EE_ X-MS-Office365-Filtering-Correlation-Id: ba1c49af-952b-439d-2472-08dd7a9cff60 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|5072599009|15080799006|7092599003|19110799003|10035399004|440099028|3412199025|12071999003|21061999003|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: /VXkrM5+oqwTMr8usIDzmsabzTJpG98VfWUalsoJmvOcQxwTFoXjuKLoSdJLVeUNIAILDtrglyRuIOCdTqNe3MIpueo3K425qsntAfxeEwSvI4SzeMTg1pfpMN48mbaG2UoU03Z9QPygmgCvhvTb+Pxlm/rAapT9VHgtSFqcaKnAi86ICXe5bI2ukOWlM8ndotOQSip65rJUcscHzG/NnWYUvgvRcUPgFjmA77Yz6xAxTM5bgrpuDL67OpGYaUcnviHjvInnt0idnxGoj9pDVcJ/AV7MeokG05Z5N6DKZJafUdXWwCmzUJkO6AdRJVJhcxRLEafL37RX4BqzZOM71vdPVukaTjB1a5DJONZh4dAsVynZDUunPouuB/83ACr1I+iFQYTdwKaJ6bFMSQx5SzAlXCTaEf0VexbXuC+5zaxKmc2DEaNMBTMwFHft5o6W3isLopYhU8K8vRbok3CNbh/DhU2Y4fs3RFa4Nv9oL+7mlbJrLRzeUP/faRg+d+PcFb8hZqD9YK1eeecL9AX0ANcvXS616gAOBb3X8T90gKsaOCTFKLBEZSdKp4MA+vOaUsUGv1XSAqwH0hFcatIapZcif0deUi7pcFI1Cppv4LGZ/bsp3s20ImV0Sa2Urmjhfj/3+CqyJKCZTfshhAykcDN43hVzpDKF4qUa39V5tsQPhkguVssT3viBuuZQ36LrB5+wDBNA5nDxzV1N672nz/QZ/l0L+ReSYdTY3sawvDAe71m5u7LqsreFVXTAWGnXTZv6NepsL+aBAy0eckF+PdOYMaPTcbCHnhX1odEqDZgS82hEmQvDBSP5oIG81+8kLk4yO+a8olZF8nmwcLwZdumcJf73ahXOrn9vm6dX1O0WrlqswZd1uKEBgBsRqgbsX0WC2BG2qXVY4sFD+GiuwYVZM1ntcR/Rt80MkvUfvCti5TYwCfewxNluyjT3sjGPP06NRY7ZUCIhz3O7Mka3390GizbVyMoX3Xs5023xyUZ9yKyvoYCiTuhXwli7D3S5TwvbpskIKE6wxTLI5X5AiyGcCmnNRcAzRPjh5S4cft+YxbeCBIvpbFpI8HHn6HhbjMFxjcxNnmSfQVHLFgsZ9J2mP9qQILYPZZ2znGDXcSvOgP/BIyH9FwjSw1VGhvFCiCkuYjauJ8+XJ9cfJm0+TkpuIqtwtninIcqn7wVi0n2vEQg7gK2VBlSCXHUbf2j1KVF63LQW7sFEmN80Ud34zxNRj7MhUyCIB2wiesI4bf+59nMEe0hedsEe8JNj3cYwFvuGUcobpQ+aXlJdEQzDToQAz3JLaNxVuKsBjsxS8Hs= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Xa7Utakoyp9h2jTKjO5Q6PJvBAR7Ws7MWjIDLkxLAxySRkZmTKmVU4fUjEP0T2txQH6fkGOg02u254JnawxBGUL1yXrDt1cjTIkSsgUr9WIflb1GzjHzqOLRNFSfDV/xqRrF1X+rCg9+wrTNoY8MKqt2SmRmwv4BLq2DuUDGXaFtcnt6jbeUXik8qog7lQdzxc1UkSs9WcTuA4Z0Hu9mCi1IqEMGIcVZpE2yFIFvF8ZY25x7DDg55kJmhFKR5LugzOdOissp51WyT+2+3vKqm2tsVYg+CWlM6NTxfzN3ApxIQ1Gw82SlZ9AijHksLsIoxVATMbijHDgaFmJmd7gKdyJfHdLdfHpOF7qSGpn3LMtZxq0KZrlreSxuht42UWjtEPcaIP/ucPgRRjqLA4i2NKYizmSGH9r+F0kwVe/cZRyEnhNUEE13+XipBp6c6A7L45LKILeGEqRHx1NgaHESXl68qbdF4DHyXW5Ine5J9ym3UTSJOPxiT9/WL7OFbl5OSQCIcL8XZj0c9U0x8Pt1FjCMyUpb6S+pGf4xdBbIj+7nMUegrIhcWs+3Z2l2edzIPN/lZmH48uBRs6t6jUV46Qt3Bzno8BmZlPwTrPjqlk9TcQjgssxSSry7TI8HbFyLVGtyN8Wxezg+HsyGanVjVvvG0m+DCgLiTNIKrrfhQ8DdeaNUF0YJjyfwNRydfXAtxNCx9B1eURTj4M2lyYZVTGvj6B3mtXWgEmqHvTBtH2mkPXrb+bqzKd+/Y/sXHFfadB/+bRSUIKwXw+XVi8nPoO6lDVIJ61bBmSues76uyyGWhzfC+zSf0+iXECxYNv6BMjm/6pzeji4jIqeEzvNFiVja4Ub8Mbh103KP+P3Fcy6/KebXoSG+YmH+5bnUp3A/EFBxqjvi7RCd+uWppr5SFUkodFwfBFS2wp/vXjgKXCF9dA1ShWW+kpkblEj3FqODYUdxRlI9Ghe+xN6BE+wLGU9eIGgNdsYOyi1WVwmhTpJEpvDQ1t27NngxZ4K5XFG3H20HscBXTQO50z0/AoLOmZOiS8+1nZo/Mt8BFM+Ad38joZoHIjCyzcLPNlN2hJK+2WXXJzOii3ryLFQVbNUjSZvUPRcHCC35a1AU4Tgmq+42l+N6Tf1IcGrC+5uFqTz9AP5Suy9a+JJ8VSH37JS3nvmtzGP96YgavYfQC6ABvAEHVtAHZBdpkNMFBaODT1V798sopoCpsdQGSXaxB+WGGwSGU0Rpu5j3QLGYCaxsz6xYFUMOlRUw0yv94Yg1YU1L X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba1c49af-952b-439d-2472-08dd7a9cff60 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 15:08:07.7350 (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: SA1PR84MB3165 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 07f1d671ed..41a2daa36a 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)