[arch-commits] Commit in uim/trunk (PKGBUILD home.patch install)

[Gaetan Bisson]

    Date: Tuesday, May 17, 2011 @ 04:27:15
  Author: bisson
Revision: 124164

upstream update, patch deprecated

Modified:
  uim/trunk/PKGBUILD
  uim/trunk/install
Deleted:
  uim/trunk/home.patch

------------+
 PKGBUILD   |   25 +++++++++++--------------
 home.patch |   24 ------------------------
 install    |   10 +++++-----
 3 files changed, 16 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-17 07:14:11 UTC (rev 124163)
+++ PKGBUILD	2011-05-17 08:27:15 UTC (rev 124164)
@@ -1,32 +1,29 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
 
 pkgname=uim
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc='Multilingual input method library'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/uim/'
-license=('custom')
+license=('custom:BSD')
 depends=('gtk2' 'libxft' 'libedit' 'anthy' 'm17n-lib')
 makedepends=('intltool' 'gettext' 'gnome-panel')
 optdepends=('gnome-panel: gnome applet indicator')
 options=('!libtool')
-source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2"
-        'home.patch')
-sha1sums=('412bb2df6041185084e2f64fb73357389bf992b5'
-          'dbcf90f3ea246c5723d715e0935072baa9364cd2')
+source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('b79ed80c2557e804e6d3d2771a213a29cd932a73')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	# 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 
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/uim \
+		--with-anthy-utf8
 	make
 }
 

Deleted: home.patch
===================================================================
--- home.patch	2011-05-17 07:14:11 UTC (rev 124163)
+++ home.patch	2011-05-17 08:27:15 UTC (rev 124164)
@@ -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;

Modified: install
===================================================================
--- install	2011-05-17 07:14:11 UTC (rev 124163)
+++ install	2011-05-17 08:27:15 UTC (rev 124164)
@@ -1,13 +1,13 @@
 post_install() {
-  echo -n "updating gtk.immodules... "
-  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-  echo "done."
+	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_install
 }
 
 post_remove() {
-  post_install
+	post_install
 }