diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/man-db/1361_1360.diff | 25 | ||||
| -rw-r--r-- | core/man-db/PKGBUILD | 11 |
2 files changed, 32 insertions, 4 deletions
diff --git a/core/man-db/1361_1360.diff b/core/man-db/1361_1360.diff new file mode 100644 index 000000000..c93856980 --- /dev/null +++ b/core/man-db/1361_1360.diff @@ -0,0 +1,25 @@ +=== modified file 'src/straycats.c' +--- src/straycats.c 2011-01-10 20:08:22 +0000 ++++ src/straycats.c 2011-06-04 06:34:51 +0000 +@@ -177,6 +177,7 @@ + char *lang, *page_encoding; + char *mandir_base; + pipecmd *col_cmd; ++ char *col_locale; + char *fullpath; + + /* we have a straycat. Need to filter it and get +@@ -226,6 +227,12 @@ + col_cmd = pipecmd_new_argstr + (get_def_user ("col", COL)); + pipecmd_arg (col_cmd, "-bx"); ++ col_locale = find_charset_locale ("UTF-8"); ++ if (col_locale) { ++ pipecmd_setenv (col_cmd, "LC_CTYPE", ++ col_locale); ++ free (col_locale); ++ } + pipeline_command (decomp, col_cmd); + + fullpath = canonicalize_file_name (catdir); + diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index 0c4b05652..25675079f 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119687 2011-04-13 16:45:31Z andyrtr $ +# $Id: PKGBUILD 126294 2011-06-04 09:41:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db pkgver=2.6.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') url="http://www.nongnu.org/man-db/" @@ -19,16 +19,19 @@ provides=('man') replaces=('man') install=${pkgname}.install source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz + 1361_1360.diff #http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz convert-mans man-db.cron.daily) +options=('!libtool') md5sums=('2b41c96efec032d2b74ccbf2e401f93e' + '08b76b1f924c5493a280b79fc0aebde4' '2b7662a7d5b33fe91f9f3e034361a2f6' 'd30c39ae47560304471b5461719e0f03') -options=('!libtool') build() { cd ${srcdir}/${pkgname}-${pkgver} - + # https://bugs.archlinux.org/task/18722 + patch -Np0 -i $srcdir/1361_1360.diff ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ --with-sections="1 n l 8 3 0 2 5 4 9 6 7" |