| 1 |
commit: 9517ed299c6934690d7b0f0c24a73ec4f9c7b86c |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Fri Aug 20 18:24:55 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 27 23:36:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9517ed29 |
| 7 |
|
| 8 |
app-text/lesspipe: remove unused patch(es) |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22055 |
| 11 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../lesspipe/files/lesspipe-1.87-fix-tests.patch | 76 ---------------------- |
| 16 |
1 file changed, 76 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch b/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index c52e4c0957e..00000000000 |
| 21 |
--- a/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,76 +0,0 @@ |
| 24 |
-https://github.com/wofr06/lesspipe/commit/428062937e99f5a5da5c5f94fecba5b13557d973.patch |
| 25 |
- |
| 26 |
-Dropped ChangeLog + README hunks, but not weeded out the tiny MP4 change. |
| 27 |
- |
| 28 |
-From 428062937e99f5a5da5c5f94fecba5b13557d973 Mon Sep 17 00:00:00 2001 |
| 29 |
-From: wf <wp.friebelgmail.com> |
| 30 |
-Date: Sun, 8 Aug 2021 21:26:17 +0200 |
| 31 |
-Subject: [PATCH] make all tests in the test suite work |
| 32 |
- |
| 33 |
---- |
| 34 |
- lesspipe.sh | 6 +++--- |
| 35 |
- lesspipe.sh.in | 6 +++--- |
| 36 |
- 4 files changed, 9 insertions(+), 6 deletions(-) |
| 37 |
- |
| 38 |
-diff --git a/lesspipe.sh b/lesspipe.sh |
| 39 |
-index 0bf3cb9..22c10b2 100755 |
| 40 |
---- a/lesspipe.sh |
| 41 |
-+++ b/lesspipe.sh |
| 42 |
-@@ -54,7 +54,7 @@ filecmd() { |
| 43 |
- TMPDIR=${TMPDIR:-/tmp} |
| 44 |
- sep=: # file name separator |
| 45 |
- altsep== # alternate separator character |
| 46 |
--if [[ -e "$1" && "$1" = *$sep* || "$1" = *$sep*$altsep* ]]; then |
| 47 |
-+if [[ -e "$1" && "$1" = *$sep* ]]; then |
| 48 |
- sep=$altsep |
| 49 |
- xxx="${1%=}" |
| 50 |
- set "$xxx" |
| 51 |
-@@ -773,7 +773,7 @@ isfinal() { |
| 52 |
- elif [[ "$PARSEHTML" = yes && "$1" = *HTML$NOL_A_P* ]]; then |
| 53 |
- msg "append $sep to filename to view the HTML source" |
| 54 |
- parsehtml "$2" |
| 55 |
-- elif [[ "$1" = *pdf* ]] && cmd_exist pdftotext; then |
| 56 |
-+ elif [[ "$1" = *pdf* || "$1" = *PDF* ]] && cmd_exist pdftotext; then |
| 57 |
- if [[ "$PARSEHTML" = yes ]]; then |
| 58 |
- msg "append $sep to filename to view the PDF source" |
| 59 |
- istemp "pdftotext -htmlmeta -nopgbrk -q --" "$2" - | parsehtml - |
| 60 |
-@@ -952,7 +952,7 @@ isfinal() { |
| 61 |
- elif [[ "$1" = *mp3* ]] && cmd_exist id3v2; then |
| 62 |
- msg "append $sep to filename to view the raw data" |
| 63 |
- istemp "id3v2 --list" "$2" |
| 64 |
-- elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then |
| 65 |
-+ elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *MP4* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then |
| 66 |
- msg "append $sep to filename to view the raw data" |
| 67 |
- mediainfo --Full "$2" |
| 68 |
- elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist exiftool; then |
| 69 |
-diff --git a/lesspipe.sh.in b/lesspipe.sh.in |
| 70 |
-index 8819dad..a099a84 100755 |
| 71 |
---- a/lesspipe.sh.in |
| 72 |
-+++ b/lesspipe.sh.in |
| 73 |
-@@ -56,7 +56,7 @@ TMPDIR=${TMPDIR:-/tmp} |
| 74 |
- sep=: # file name separator |
| 75 |
- altsep== # alternate separator character |
| 76 |
- # if the separator is part of the file name then altsep is used |
| 77 |
--if [[ -e "$1" && "$1" = *$sep* || "$1" = *$sep*$altsep* ]]; then |
| 78 |
-+if [[ -e "$1" && "$1" = *$sep* ]]; then |
| 79 |
- sep=$altsep |
| 80 |
- xxx="${1%=}" |
| 81 |
- set "$xxx" |
| 82 |
-@@ -942,7 +942,7 @@ isfinal() { |
| 83 |
- msg "append $sep to filename to view the HTML source" |
| 84 |
- parsehtml "$2" |
| 85 |
- #ifdef pdftotext |
| 86 |
-- elif [[ "$1" = *pdf* ]] && cmd_exist pdftotext; then |
| 87 |
-+ elif [[ "$1" = *pdf* || "$1" = *PDF* ]] && cmd_exist pdftotext; then |
| 88 |
- if [[ "$PARSEHTML" = yes ]]; then |
| 89 |
- msg "append $sep to filename to view the PDF source" |
| 90 |
- istemp "pdftotext -htmlmeta -nopgbrk -q --" "$2" - | parsehtml - |
| 91 |
-@@ -1202,7 +1202,7 @@ isfinal() { |
| 92 |
- mp3info "$2" |
| 93 |
- #endif |
| 94 |
- #ifdef mediainfo |
| 95 |
-- elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then |
| 96 |
-+ elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *MP4* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then |
| 97 |
- msg "append $sep to filename to view the raw data" |
| 98 |
- mediainfo --Full "$2" |
| 99 |
- #ifdef exiftool |
Archives