From 4704955d5bcd67589ad92d3959a4b31a4d4ae2e6 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Sat, 26 Oct 2019 18:27:34 +0700 Subject: academic/gri: Updated for version 2.0.1. Signed-off-by: Willy Sudiarto Raharjo --- academic/gri/UTF8patch.README | 19 +++++++++++++++++++ academic/gri/gri-texinfo-6.7patch.txt | 10 ++++++++++ academic/gri/gri.SlackBuild | 13 ++++++++++--- academic/gri/texinfo-utf8.patch | 12 ++++++++++++ 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 academic/gri/UTF8patch.README create mode 100644 academic/gri/gri-texinfo-6.7patch.txt create mode 100644 academic/gri/texinfo-utf8.patch diff --git a/academic/gri/UTF8patch.README b/academic/gri/UTF8patch.README new file mode 100644 index 0000000000..f30c7c969b --- /dev/null +++ b/academic/gri/UTF8patch.README @@ -0,0 +1,19 @@ +Compilation of gri breaks on doc/gri.texi with current tex-info. + +"It is because Texinfo 6.7 changed the default input encoding to UTF-8 +and the input is in ISO-8859-1. The easiest way to fix this would be to +convert the input file to UTF-8, but you could also add +"@documentencoding ISO-8859-1" to the file." +(from email correspondence with texinfo developers) + +The patchfile 'gri-texinfo-6.7patch.txt' set the whole file to ISO-8859-1 +and does not alter the contributor's name. + + +The other patchfile, 'texinfo-utf8.patch', was generated by Matteo Bernardini +(http://cgit.ponce.cc/slackbuilds/commit/?h=gri), and changes the accented o in the name. + +Either patch allows compilation of gri. + +see: +https://www.linuxquestions.org/questions/slackware-14/sbo-scripts-not-building-on-current-read-1st-post-pls-4175561999/page142.html#post6049662 \ No newline at end of file diff --git a/academic/gri/gri-texinfo-6.7patch.txt b/academic/gri/gri-texinfo-6.7patch.txt new file mode 100644 index 0000000000..f9b2dedf91 --- /dev/null +++ b/academic/gri/gri-texinfo-6.7patch.txt @@ -0,0 +1,10 @@ +diff -Naur gri-2.12.23/doc/gri.texi gri-2.12.23-new/doc/gri.texi +--- gri-2.12.23/doc/gri.texi 2017-08-24 15:31:52.000000000 +0100 ++++ gri-2.12.23-new/doc/gri.texi 2019-10-22 16:13:33.476840964 +0100 +@@ -1,5 +1,5 @@ + \input texinfo +- ++@documentencoding ISO-8859-1 + @c + @comment *** Start of HTML stuff *** + @comment # HTML support, via comments in texinfo: diff --git a/academic/gri/gri.SlackBuild b/academic/gri/gri.SlackBuild index 7ebaf19929..965946ecd2 100644 --- a/academic/gri/gri.SlackBuild +++ b/academic/gri/gri.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gri -# Copyright 2018 Rob van Nues +# Copyright 2018-2019 Rob van Nues # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -69,6 +69,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +#with thanks to Gavin Smith +patch -p1 < $CWD/gri-texinfo-6.7patch.txt +#with thanks to Matteo Bernardini +#patch -p1 < $CWD/texinfo-utf8.patch + aclocal autoconf automake --add-missing @@ -81,8 +86,10 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +#with thanks to Matteo Bernardini +#see: https://www.linuxquestions.org/questions/slackware-14/sbo-scripts-not-building-on-current-read-1st-post-pls-4175561999/page142.html#post6049662 +make -j1 +make -j1 install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/academic/gri/texinfo-utf8.patch b/academic/gri/texinfo-utf8.patch new file mode 100644 index 0000000000..b63573de33 --- /dev/null +++ b/academic/gri/texinfo-utf8.patch @@ -0,0 +1,12 @@ +diff -Naur gri-2.12.23.orig/doc/gri.texi gri-2.12.23/doc/gri.texi +--- gri-2.12.23.orig/doc/gri.texi 2017-08-24 16:31:52.000000000 +0200 ++++ gri-2.12.23/doc/gri.texi 2019-10-22 15:39:51.666151000 +0200 +@@ -19277,7 +19277,7 @@ + Thomas Larsen, + @cindex Thomas Larsen (contributor) + @cindex contributor, Thomas Larsen +-Alejandro L�pez-Valencia, ++Alejandro Lopez-Valencia, + @cindex Alejandro Lopez-Valencia (contributor) + @cindex contributor, Alejandro Lopez-Valencia + Kawamura Masao, \ No newline at end of file -- cgit v1.2.3