summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/pcre/PKGBUILD8
-rw-r--r--core/texinfo/PKGBUILD11
-rw-r--r--core/texinfo/texinfo-4.13a-data_types.patch32
3 files changed, 43 insertions, 8 deletions
diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD
index 489408a43..5d98eea9f 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141157 2011-10-25 05:06:55Z allan $
+# $Id: PKGBUILD 145006 2011-12-13 23:40:35Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
pkgname=pcre
-pkgver=8.20
+pkgver=8.21
pkgrel=1
pkgdesc="A library that implements Perl 5-style regular expressions"
arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ license=('BSD')
depends=('gcc-libs')
options=('!libtool')
source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('a1931c70e1273e3450d5036fe273d25c'
- '41c2dceac25c6ebf192ec128021be339')
+md5sums=('0a7b592bea64b7aa7f4011fc7171a730'
+ '4768871445dff956e620a9e902b4db55')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD
index 9ba51eca5..22ef3c6e5 100644
--- a/core/texinfo/PKGBUILD
+++ b/core/texinfo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142185 2011-11-05 22:42:55Z allan $
+# $Id: PKGBUILD 145004 2011-12-13 23:40:32Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=texinfo
pkgver=4.13a
-pkgrel=6
+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/"
@@ -12,12 +12,15 @@ license=('GPL3')
groups=('base')
depends=('ncurses' 'findutils' 'gzip')
install=texinfo.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
+ texinfo-4.13a-data_types.patch)
md5sums=('71ba711519209b5fb583fed2b3d86fcb'
- 'db2ca82c831684cd7cef181234017c46')
+ 'db2ca82c831684cd7cef181234017c46'
+ 'd8574782ff7def1e2dc5c291dbeaec18')
build() {
cd ${srcdir}/${pkgname}-4.13
+ patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch
./configure --prefix=/usr
make
}
diff --git a/core/texinfo/texinfo-4.13a-data_types.patch b/core/texinfo/texinfo-4.13a-data_types.patch
new file mode 100644
index 000000000..2a87c2146
--- /dev/null
+++ b/core/texinfo/texinfo-4.13a-data_types.patch
@@ -0,0 +1,32 @@
+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;