diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2020-05-21 02:00:40 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2020-05-21 02:01:20 +0200 |
| commit | 1077b8b1f31bae93efa1d3f5d0544d439461d8fc (patch) | |
| tree | 9f1f38800e3352e042bc9dca1799262917b8a0a6 /dev-vcs/rsvndump/files | |
| parent | dev-util/cutter: Drop older than 1.8.2 (diff) | |
| download | gentoo-1077b8b1f31bae93efa1d3f5d0544d439461d8fc.tar.gz gentoo-1077b8b1f31bae93efa1d3f5d0544d439461d8fc.tar.bz2 gentoo-1077b8b1f31bae93efa1d3f5d0544d439461d8fc.zip | |
dev-vcs/rsvndump: Support AR variable and AsciiDoc 9
Closes: https://bugs.gentoo.org/724252
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Diffstat (limited to 'dev-vcs/rsvndump/files')
| -rw-r--r-- | dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch | 35 | ||||
| -rw-r--r-- | dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch | 24 |
2 files changed, 59 insertions, 0 deletions
diff --git a/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch b/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch new file mode 100644 index 000000000000..1df1852ab91f --- /dev/null +++ b/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch @@ -0,0 +1,35 @@ +From e0c9eba8c080cbbf773f0d540c8291ef486544c9 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Thu, 21 May 2020 01:56:54 +0200 +Subject: [PATCH] rsvndump_conf.m4: Fix detection of Asciidoc >=8.4.0 for 9.x.x + +--- + m4/rsvndump_conf.m4 | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/m4/rsvndump_conf.m4 b/m4/rsvndump_conf.m4 +index c8a83ae..838f0f6 100644 +--- a/m4/rsvndump_conf.m4 ++++ b/m4/rsvndump_conf.m4 +@@ -76,15 +76,9 @@ AC_DEFUN([RSVN_CHECK_MAN_PROGS], [ + ver_maj=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\1/'` + ver_min=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\2/'` + ver_rev=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\3/'` +- prog_version_ok="yes" +- if test $ver_maj -lt 8; then +- prog_version_ok="no" +- fi +- if test $ver_min -lt 4; then +- prog_version_ok="no" +- fi +- if test $ver_rev -lt 0; then +- prog_version_ok="no" ++ prog_version_ok=no ++ if test $ver_maj -gt 8 -o \( $ver_maj -eq 8 -a $ver_min -ge 4 \); then ++ prog_version_ok=yes + fi + if test "$prog_version_ok" != "yes"; then + AC_MSG_ERROR([Asciidoc >= 8.4 is needed. Please upgrade your installation]) +-- +2.26.2 + diff --git a/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch b/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch new file mode 100644 index 000000000000..b82682008715 --- /dev/null +++ b/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch @@ -0,0 +1,24 @@ +From 69c66475d2887e50150ceb4481934749ad46feb6 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Thu, 21 May 2020 01:38:02 +0200 +Subject: [PATCH] Support the AR variable + +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 2e2fcc3..897282e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,6 +30,7 @@ fi + # Checks for programs. + AC_PROG_INSTALL + AC_PROG_CC ++AM_PROG_AR + AC_PROG_RANLIB + if test "$USE_MAN" = "yes"; then + RSVN_CHECK_MAN_PROGS +-- +2.26.2 + |