Date: Thursday, February 10, 2011 @ 15:32:59 Author: bisson Revision: 109572
move files around, dependency cleanup, and add libedit Added: uim/trunk/home.patch (from rev 109002, uim/trunk/uim-home.patch) uim/trunk/install (from rev 109002, uim/trunk/uim.install) Modified: uim/trunk/PKGBUILD Deleted: uim/trunk/uim-home.patch uim/trunk/uim.install ----------------+ PKGBUILD | 33 ++++++++++++++++----------------- home.patch | 24 ++++++++++++++++++++++++ install | 13 +++++++++++++ uim-home.patch | 24 ------------------------ uim.install | 13 ------------- 5 files changed, 53 insertions(+), 54 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-02-10 20:32:15 UTC (rev 109571) +++ PKGBUILD 2011-02-10 20:32:59 UTC (rev 109572) @@ -3,36 +3,35 @@ pkgname=uim pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='Multilingual input method library' arch=('i686' 'x86_64') url='http://code.google.com/p/uim/' license=('custom') -depends=('m17n-lib' 'ncurses' 'gtk2') -makedepends=('pkg-config' 'gettext' 'intltool' 'gnome-panel' 'anthy') -optdepends=('gnome-panel: for using the GNOME applet') +depends=('gtk2' 'libxft' 'libedit' 'anthy' 'm17n-lib') +makedepends=('intltool' 'gettext' 'gnome-panel') +optdepends=('gnome-panel: gnome applet indicator') options=('!libtool') -install=uim.install source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" - 'uim-home.patch') + 'home.patch') sha1sums=('412bb2df6041185084e2f64fb73357389bf992b5' 'dbcf90f3ea246c5723d715e0935072baa9364cd2') +install=install + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - # 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`" + # UIM's Makefile needs to write in $HOME + patch -p0 < ../home.patch; export HOME="`pwd`" - ./configure --prefix=/usr --libexecdir=/usr/lib/uim \ - --with-anthy-utf8 - make + ./configure --prefix=/usr --libexecdir=/usr/lib/uim \ + --with-anthy-utf8 + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } Copied: uim/trunk/home.patch (from rev 109002, uim/trunk/uim-home.patch) =================================================================== --- home.patch (rev 0) +++ home.patch 2011-02-10 20:32:59 UTC (rev 109572) @@ -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; Copied: uim/trunk/install (from rev 109002, uim/trunk/uim.install) =================================================================== --- install (rev 0) +++ install 2011-02-10 20:32:59 UTC (rev 109572) @@ -0,0 +1,13 @@ +post_install() { + echo -n "updating gtk.immodules... " + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + echo "done." +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: uim-home.patch =================================================================== --- uim-home.patch 2011-02-10 20:32:15 UTC (rev 109571) +++ uim-home.patch 2011-02-10 20:32:59 UTC (rev 109572) @@ -1,24 +0,0 @@ -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; Deleted: uim.install =================================================================== --- uim.install 2011-02-10 20:32:15 UTC (rev 109571) +++ uim.install 2011-02-10 20:32:59 UTC (rev 109572) @@ -1,13 +0,0 @@ -post_install() { - echo -n "updating gtk.immodules... " - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - echo "done." -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}