From 508922f8518b3c3d0400f0ce678ebe072ccc69cb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 15 Feb 2018 22:42:06 +0000 Subject: texinfo: update to 6.5 --- abs/core/texinfo/PKGBUILD | 49 ++++++++++++++----------- abs/core/texinfo/texinfo-4.13a-data_types.patch | 32 ---------------- abs/core/texinfo/texinfo-install.hook | 11 ++++++ abs/core/texinfo/texinfo-remove.hook | 10 +++++ abs/core/texinfo/texinfo.install | 21 ----------- 5 files changed, 48 insertions(+), 75 deletions(-) delete mode 100644 abs/core/texinfo/texinfo-4.13a-data_types.patch create mode 100644 abs/core/texinfo/texinfo-install.hook create mode 100644 abs/core/texinfo/texinfo-remove.hook delete mode 100644 abs/core/texinfo/texinfo.install diff --git a/abs/core/texinfo/PKGBUILD b/abs/core/texinfo/PKGBUILD index 22ef3c6..60ed982 100644 --- a/abs/core/texinfo/PKGBUILD +++ b/abs/core/texinfo/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 145004 2011-12-13 23:40:32Z allan $ -# Maintainer: Allan McRae +# $Id$ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Allan McRae # Contributor: Tom Newsom pkgname=texinfo -pkgver=4.13a -pkgrel=7 -pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/texinfo/" -license=('GPL3') -groups=('base') -depends=('ncurses' 'findutils' 'gzip') -install=texinfo.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} - texinfo-4.13a-data_types.patch) -md5sums=('71ba711519209b5fb583fed2b3d86fcb' - 'db2ca82c831684cd7cef181234017c46' - 'd8574782ff7def1e2dc5c291dbeaec18') +pkgver=6.5 +pkgrel=1 +pkgdesc='GNU documentation system for on-line information and printed output' +arch=(x86_64) +url='http://www.gnu.org/software/texinfo/' +license=(GPL3) +groups=(base base-devel) +depends=(ncurses gzip perl sh) +source=(https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} + texinfo-install.hook + texinfo-remove.hook) +md5sums=('3715197e62e0e07f85860b3d7aab55ed' + 'SKIP' + '9a98fb162650ff3065f9a4ebec22db36' + '5590fb3ef9ec309c98f5a4d85eca49da') +validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith build() { - cd ${srcdir}/${pkgname}-4.13 - patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch + cd $pkgname-$pkgver ./configure --prefix=/usr make } +check() { + make -C $pkgname-$pkgver check +} + package() { - cd ${srcdir}/${pkgname}-4.13 - make DESTDIR=${pkgdir} install + make -C $pkgname-$pkgver DESTDIR="$pkgdir" install - # fix this here as it prevents make from trying to rebuild manual pages - sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi + install -dm755 "$pkgdir"/usr/share/libalpm/hooks/ + install -m644 texinfo-{install,remove}.hook "$pkgdir"/usr/share/libalpm/hooks/ } diff --git a/abs/core/texinfo/texinfo-4.13a-data_types.patch b/abs/core/texinfo/texinfo-4.13a-data_types.patch deleted file mode 100644 index 2a87c21..0000000 --- a/abs/core/texinfo/texinfo-4.13a-data_types.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c ---- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200 -+++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200 -@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st - const char *carried_over_ptr; - size_t carried_over_len, carried_over_count; - const char *cur_ptr = mbi_cur_ptr (iter); -- int cur_len = mb_len (mbi_cur (iter)); -+ size_t cur_len = mb_len (mbi_cur (iter)); - int replen; - int delim = 0; - int rc; -@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) - mbi_advance (iter)) - { - const char *cur_ptr = mbi_cur_ptr (iter); -- int cur_len = mb_len (mbi_cur (iter)); -+ size_t cur_len = mb_len (mbi_cur (iter)); - - if (cur_len == 1) - { -@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line, - mbi_advance (iter)) - { - const char *cur_ptr = mbi_cur_ptr (iter); -- int cur_len = mb_len (mbi_cur (iter)); -- int replen; -+ size_t cur_len = mb_len (mbi_cur (iter)); -+ size_t replen; - - if (cur_ptr >= endp) - break; diff --git a/abs/core/texinfo/texinfo-install.hook b/abs/core/texinfo/texinfo-install.hook new file mode 100644 index 0000000..80f7896 --- /dev/null +++ b/abs/core/texinfo/texinfo-install.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = usr/share/info/* + +[Action] +Description = Updating the info directory file... +When = PostTransaction +Exec = /bin/sh -c 'while read -r f; do install-info "$f" /usr/share/info/dir 2> /dev/null; done' +NeedsTargets diff --git a/abs/core/texinfo/texinfo-remove.hook b/abs/core/texinfo/texinfo-remove.hook new file mode 100644 index 0000000..e57e666 --- /dev/null +++ b/abs/core/texinfo/texinfo-remove.hook @@ -0,0 +1,10 @@ +[Trigger] +Type = File +Operation = Remove +Target = usr/share/info/* + +[Action] +Description = Removing old entries from the info directory file... +When = PreTransaction +Exec = /bin/sh -c 'while read -r f; do install-info --delete "$f" /usr/share/info/dir 2> /dev/null; done' +NeedsTargets diff --git a/abs/core/texinfo/texinfo.install b/abs/core/texinfo/texinfo.install deleted file mode 100644 index f1554e4..0000000 --- a/abs/core/texinfo/texinfo.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=usr/share/info -filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3) - -post_install() { - # Scan *all* info files on install - for file in $(find $infodir -type f ! -name dir); do - install-info $file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} -- cgit v0.12