From 77b36d55ebe19810359a3584f633bc6a45ba9945 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 23 Aug 2019 15:56:19 +0200 Subject: [PATCH 1/7] use gettext module, fixes for creation of documentation --- Tools/git/build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Tools/git/build b/Tools/git/build index 41b3341..9a8f435 100755 --- a/Tools/git/build +++ b/Tools/git/build @@ -14,8 +14,9 @@ pbuild::post_configure_Linux() { } pbuild::pre_configure() { - pbuild::add_configure_args "LIBS=-lintl" + #pbuild::add_configure_args "LIBS=-lintl" pbuild::add_configure_args "--with-tcltk" + pbuild::add_configure_args "--with-iconv=${GETTEXT_PREFIX}" pbuild::add_configure_args "--with-perl=${PERL_PREFIX}/bin/perl" } @@ -24,9 +25,9 @@ pbuild::post_compile() { } pbuild::post_install() { - make install-doc + make install-doc V=1 XMLTO_EXTRA='--skip-validation' make -C contrib/subtree prefix="${PREFIX}" install - make -C contrib/subtree prefix="${PREFIX}" install-doc + make -C contrib/subtree prefix="${PREFIX}" install-doc XMLTO="xmlto --skip-validation" } # Local Variables: From b57f7aa783060fc762bb27a1ce045784bc60c142 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 23 Aug 2019 15:56:52 +0200 Subject: [PATCH 2/7] variants file for macos 10.14 added --- Tools/git/files/variants.macos10.14 | 1 + 1 file changed, 1 insertion(+) create mode 100644 Tools/git/files/variants.macos10.14 diff --git a/Tools/git/files/variants.macos10.14 b/Tools/git/files/variants.macos10.14 new file mode 100644 index 0000000..50363d4 --- /dev/null +++ b/Tools/git/files/variants.macos10.14 @@ -0,0 +1 @@ +git/2.21.0 unstable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 From 206615b5a41067ce0b2de7bf536636b4443b66e3 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Aug 2019 18:21:02 +0200 Subject: [PATCH 3/7] git: variants renamed to variants.rhel6 --- Tools/git/files/{variants => variants.rhel6} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Tools/git/files/{variants => variants.rhel6} (100%) diff --git a/Tools/git/files/variants b/Tools/git/files/variants.rhel6 similarity index 100% rename from Tools/git/files/variants rename to Tools/git/files/variants.rhel6 From c43e0795352b47e94c3cf91d95787ff67495641a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Aug 2019 18:41:27 +0200 Subject: [PATCH 4/7] git: variants for RHEL6 cleaned up --- Tools/git/files/variants.rhel6 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Tools/git/files/variants.rhel6 b/Tools/git/files/variants.rhel6 index 1639391..d2fa03b 100644 --- a/Tools/git/files/variants.rhel6 +++ b/Tools/git/files/variants.rhel6 @@ -1,8 +1,4 @@ git/2.3.3 stable Tcl/8.6.4 Tk/8.6.4 -git/2.5.2 stable Tcl/8.6.4 Tk/8.6.4 git/2.8.1 stable Tcl/8.6.4 Tk/8.6.4 -git/2.11.1 stable Tcl/8.6.4 Tk/8.6.4 -git/2.13.0 stable Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto -git/2.16.2 stable Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto -git/2.19.1 unstable Tcl/8.6.4 Tk/8.6.4 b:perl/5.26.1 b:asciidoc/8.6.9 b:xmlto/0.0.28 -git/2.21.0 unstable Tcl/8.6.9 Tk/8.6.9 b:perl/5.28.1 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 +git/2.21.0 stable TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 +git/2.22.0 stable TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8 From 331cf0eed5dbffd5c33bc90b8a664d99f87b2d51 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Aug 2019 19:05:09 +0200 Subject: [PATCH 5/7] git: 2.21.0 released as stable for macos10.14 --- Tools/git/files/variants.macos10.14 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/git/files/variants.macos10.14 b/Tools/git/files/variants.macos10.14 index 50363d4..34ee27c 100644 --- a/Tools/git/files/variants.macos10.14 +++ b/Tools/git/files/variants.macos10.14 @@ -1 +1 @@ -git/2.21.0 unstable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 +git/2.21.0 stable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 From 31ef568d984ff12376d6b5a5a25494305ade584f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 5 Sep 2019 11:10:06 +0200 Subject: [PATCH 6/7] git: macOS ariant for version 2.23 added --- Tools/git/files/variants.macos10.14 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/git/files/variants.macos10.14 b/Tools/git/files/variants.macos10.14 index 34ee27c..4aaa68a 100644 --- a/Tools/git/files/variants.macos10.14 +++ b/Tools/git/files/variants.macos10.14 @@ -1 +1,2 @@ -git/2.21.0 stable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 +git/2.21.0 unstable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 +git/2.23.0 unstable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 From c3a5e344f7cbfc9937c5593fc2815c9661f84d61 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 9 Sep 2019 16:48:35 +0200 Subject: [PATCH 7/7] git: versions 2.21.0, 2.23.0 released as stable for macOS --- Tools/git/files/variants.macos10.14 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/git/files/variants.macos10.14 b/Tools/git/files/variants.macos10.14 index 4aaa68a..820a564 100644 --- a/Tools/git/files/variants.macos10.14 +++ b/Tools/git/files/variants.macos10.14 @@ -1,2 +1,2 @@ -git/2.21.0 unstable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 -git/2.23.0 unstable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 +git/2.21.0 stable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1 +git/2.23.0 stable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1