texinfo: update to 6.5.
This commit is contained in:
parent
5f7402c2a1
commit
6ad43fb7fc
|
@ -1,49 +0,0 @@
|
|||
fix crash in incremental search for \
|
||||
|
||||
--- info/search.c 2017/07/05 17:56:51 7906
|
||||
+++ info/search.c 2017/07/05 19:16:44 7907
|
||||
@@ -174,8 +174,8 @@
|
||||
state->match_count = match_count;
|
||||
}
|
||||
|
||||
-/* Search BUFFER for REGEXP. Pass back the list of matches
|
||||
- in MATCH_STATE. */
|
||||
+/* Search BUFFER for REGEXP. If matches are found, pass back the list of
|
||||
+ matches in MATCH_STATE. */
|
||||
enum search_result
|
||||
regexp_search (char *regexp, int is_literal, int is_insensitive,
|
||||
char *buffer, size_t buflen,
|
||||
@@ -201,6 +201,7 @@
|
||||
char *buf = xmalloc (size);
|
||||
regerror (result, &preg, buf, size);
|
||||
info_error (_("regexp error: %s"), buf);
|
||||
+ free (buf);
|
||||
return search_invalid;
|
||||
}
|
||||
|
||||
@@ -215,7 +216,10 @@
|
||||
extend_matches (match_state);
|
||||
|
||||
if (match_state->match_count == 0)
|
||||
- return search_not_found;
|
||||
+ {
|
||||
+ free_matches (match_state);
|
||||
+ return search_not_found;
|
||||
+ }
|
||||
else
|
||||
return search_success;
|
||||
}
|
||||
--- info/session.c 2017/07/05 17:56:51 7906
|
||||
+++ info/session.c 2017/07/05 19:16:44 7907
|
||||
@@ -3953,10 +3953,7 @@
|
||||
}
|
||||
|
||||
if (result != search_success)
|
||||
- {
|
||||
- free_matches (&matches);
|
||||
- return result;
|
||||
- }
|
||||
+ return result;
|
||||
|
||||
if (node->flags & N_Simple)
|
||||
{
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'texinfo'
|
||||
pkgname=texinfo
|
||||
version=6.4
|
||||
revision=2
|
||||
version=6.5
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static"
|
||||
hostmakedepends="perl ncurses-devel"
|
||||
|
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="GPL-3"
|
||||
homepage="http://www.gnu.org/software/texinfo/"
|
||||
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
|
||||
checksum=6ae2e61d87c6310f9af7c6f2426bd0470f251d1a6deb61fba83a3b3baff32c3a
|
||||
checksum=77774b3f4a06c20705cc2ef1c804864422e3cf95235e965b1f00a46df7da5f62
|
||||
|
||||
post_install() {
|
||||
rm -f ${DESTDIR}/usr/share/info/dir
|
||||
|
|
Loading…
Reference in New Issue