pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libpaper2: add upstream patch to fix test problems



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Wed Apr 12 20:15:02 2023 +0200
Changeset:	fab61d071f388fbae88dc73061c2598a90c7d5f8

Modified Files:
	libpaper2/distinfo
Added Files:
	libpaper2/patches/patch-tests_run-test

Log Message:
libpaper2: add upstream patch to fix test problems

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fab61d071f388fbae88dc73061c2598a90c7d5f8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libpaper2/distinfo                     |  1 +
 libpaper2/patches/patch-tests_run-test | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diffs:
diff --git a/libpaper2/distinfo b/libpaper2/distinfo
index 63e32e01c4..c4bd86acf5 100644
--- a/libpaper2/distinfo
+++ b/libpaper2/distinfo
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.13 2023/04/12 15:52:46 wiz Exp $
 BLAKE2s (libpaper-2.0.11.tar.gz) = f920bd7469137eb0614c8bf78fb60d5d004e2b25852ab9f23b45572ce3b0bad2
 SHA512 (libpaper-2.0.11.tar.gz) = 129d18a91992d8ec85a2f20cf67e66458fdf6ca9acbe07e820cd34063a03b1bc9835f2d70ad9766e9e02e1ff693a595a8fd11776c0152f379e31da5506b5785c
 Size (libpaper-2.0.11.tar.gz) = 1304618 bytes
+SHA1 (patch-tests_run-test) = d89ac4bb474049c3ea1a7f327d4176499e3217a4
diff --git a/libpaper2/patches/patch-tests_run-test b/libpaper2/patches/patch-tests_run-test
new file mode 100644
index 0000000000..0bb3e3104f
--- /dev/null
+++ b/libpaper2/patches/patch-tests_run-test
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/rrthomas/libpaper/commit/1e04ef9475bbf53eec859aada5e7202cd1ed8d30
+
+--- tests/run-test.orig	2023-04-12 15:37:18.000000000 +0000
++++ tests/run-test
+@@ -55,7 +55,7 @@ paper_test() {
+     # 1. Convert backslashes to forward slashes
+     # 2. Compress multiple slashes (from relocated paths on some systems)
+     # 3. Remove prefix of name of 'paper' executable
+-    sed -e 's|\\|/|g' -e 's|/\+|/|g' -e 's|^.*/paper:|paper:|g' < "$basename-output.txt" > "$basename-output-fixed.txt"
++    sed -e 's|\\|/|g' -e 's|//|/|g' -e 's|^.*/paper:|paper:|g' < "$basename-output.txt" > "$basename-output-fixed.txt"
+     $DIFF -u "$expected_file" "$basename-output-fixed.txt"
+ }
+ 


Home | Main Index | Thread Index | Old Index