Date: Sunday, August 22, 2010 @ 18:21:19 Author: bisson Revision: 88357
upstream update, together with a patch to make it compile under makechrootpkg Added: uim/trunk/uim-home.patch Modified: uim/trunk/PKGBUILD ----------------+ PKGBUILD | 32 ++++++++++++++++++++++---------- uim-home.patch | 24 ++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-08-22 22:01:13 UTC (rev 88356) +++ PKGBUILD 2010-08-22 22:21:19 UTC (rev 88357) @@ -2,25 +2,37 @@ # Maintainer: damir <da...@archlinux.org> pkgname=uim -pkgver=1.5.7 +pkgver=1.6.0 pkgrel=1 -pkgdesc="Multilingual input method library" +pkgdesc='Multilingual input method library' arch=('i686' 'x86_64') -url="http://code.google.com/p/uim/" +url='http://code.google.com/p/uim/' license=('custom') depends=('m17n-lib' 'ncurses' 'gtk2') -makedepends=('gnome-panel' 'pkgconfig' 'gettext' 'intltool') +makedepends=('pkg-config' 'gettext' 'intltool' 'gnome-panel') optdepends=('gnome-panel: for using the GNOME applet') options=('!libtool') install=uim.install -source=(http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b84a43fb92d7ceb4bd801a76120c2a71') -sha1sums=('fbea2590286ddc857a7824d8544cb08842f4299f') +source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" + 'uim-home.patch') +sha1sums=('d27f2ca8136da0702c82f0522911d06b2b8f8ea7' + 'dbcf90f3ea246c5723d715e0935072baa9364cd2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexecdir=/usr/lib/uim || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + + # makechrootpkg runs build() as "nobody", which has HOME=/ + # However, UIM's make needs $HOME to be writable. + patch -p0 < ../uim-home.patch + export HOME="`pwd`" + + ./configure --prefix=/usr --libexecdir=/usr/lib/uim + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } + Added: uim-home.patch =================================================================== --- uim-home.patch (rev 0) +++ uim-home.patch 2010-08-22 22:21:19 UTC (rev 88357) @@ -0,0 +1,24 @@ +diff -aur uim/uim-helper.c uim/uim-helper.c +--- uim/uim-helper.c 2010-08-22 19:23:37.646666698 +0200 ++++ uim/uim-helper.c 2010-08-22 19:26:57.676666781 +0200 +@@ -178,7 +178,7 @@ + goto path_error; + } + +- if (strlcpy(helper_path, pw->pw_dir, len) >= (size_t)len) { ++ if (strlcpy(helper_path, getenv("HOME"), len) >= (size_t)len) { + endpwent(); + goto path_error; + } +diff -aur uim/uim-posix.c uim/uim-posix.c +--- uim/uim-posix.c 2010-08-22 19:23:37.650000031 +0200 ++++ uim/uim-posix.c 2010-08-22 19:26:40.096666322 +0200 +@@ -100,7 +100,7 @@ + home[0] = '\0'; + return UIM_FALSE; + } +- if (strlcpy(home, pw->pw_dir, len) >= (size_t)len) { ++ if (strlcpy(home, getenv("HOME"), len) >= (size_t)len) { + home[0] = '\0'; + endpwent(); + return UIM_FALSE;