# HG changeset patch
# User Liu Peng <rocky@slitaz.org>
# Date 1246024775 0
# Node ID 07a92deec1e6e24951bf32bbae2889317617eb8e
# Parent  fa15a340f1419465dd1c517e4e64f5bb36bcccdf# Parent  27dbd5251d69c5cce594e12e3308ac83227b55e9
emesene: update DEPENDS, remove host.patch(not needed). gajim: update DEPENDS

diff -r fa15a340f141 -r 07a92deec1e6 coreutils/receipt
--- a/coreutils/receipt	Fri Jun 26 15:30:21 2009 +0200
+++ b/coreutils/receipt	Fri Jun 26 13:59:35 2009 +0000
@@ -8,20 +8,22 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/coreutils/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
-DEPENDS="libcap"
-BUILD_DEPENDS="libcap-dev gmp-dev"
+DEPENDS="glibc-base gmp libcap"
+BUILD_DEPENDS="slitaz-toolchain libcap-dev gmp-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
 	
+	# NOTE: There does not seem to be a problem with sigcontext.h in Linux 2.6.29.3
+
 	# Hack to fix ls: expected specifier-qualifier-list before '__u64'
 	# We are not patching the original file, just fake to compile
 	# coreutils.
-	rm -f /usr/include/asm/sigcontext.h.bak
-	mv /usr/include/asm/sigcontext.h /usr/include/asm/sigcontext.h.bak || exit 1
-	cp ../stuff/sigcontext.h /usr/include/asm
+	# rm -f /usr/include/asm/sigcontext.h.bak
+	# mv /usr/include/asm/sigcontext.h /usr/include/asm/sigcontext.h.bak || exit 1
+	# cp ../stuff/sigcontext.h /usr/include/asm
 	
 	sed -i 's/1.10a/1.10.2/' configure.ac || exit 1
 	sed -i 's/dist-xz/dist-lzma/' configure.ac || exit 1
@@ -30,13 +32,12 @@
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		--enable-no-install-program=kill,uptime,ls \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$PWD/_pkg install &&
+	make DESTDIR=$PWD/_pkg install
 	
 	# Restore original sigcontext.h
-	mv -f /usr/include/asm/sigcontext.h.bak /usr/include/asm/sigcontext.h
+	# mv -f /usr/include/asm/sigcontext.h.bak /usr/include/asm/sigcontext.h
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r fa15a340f141 -r 07a92deec1e6 emesene/receipt
--- a/emesene/receipt	Fri Jun 26 15:30:21 2009 +0200
+++ b/emesene/receipt	Fri Jun 26 13:59:35 2009 +0000
@@ -5,7 +5,7 @@
 CATEGORY="network"
 SHORT_DESC="Instant messaging client for Windows Live Messenger (tm) network."
 MAINTAINER="rocky@slitaz.org"
-DEPENDS="python pygtk pycairo pysqlite"
+DEPENDS="python pygtk pycairo python-pysqlite"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.emesene.org"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r fa15a340f141 -r 07a92deec1e6 gajim/receipt
--- a/gajim/receipt	Fri Jun 26 15:30:21 2009 +0200
+++ b/gajim/receipt	Fri Jun 26 13:59:35 2009 +0000
@@ -5,8 +5,8 @@
 CATEGORY="network"
 SHORT_DESC="Gtk Jabber client."
 MAINTAINER="rocky@slitaz.org"
-DEPENDS="gtkspell python dbus-python pygtk pygobject pyopenssl pysqlite xorg-libXss bindutils"
-BUILD_DEPENDS="gettext gtkspell gtkspell-dev python-dev pygtk-dev pygobject-dev dbus-dev xorg-libXss xorg-libXss-dev xcb-util-dev enchant-dev xorg-scrnsaverproto xorg-xextproto"
+DEPENDS="gtkspell python dbus-python pygtk pygobject pyopenssl python-pysqlite xorg-libXss bind-client"
+BUILD_DEPENDS="gettext gtkspell gtkspell-dev python-dev pygtk-dev pygobject-dev dbus-dev xorg-libXss xorg-libXss-dev xcb-util-dev enchant-dev xorg-scrnsaverproto xorg-xextproto gtk+-dev"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.gajim.org/"
 WGET_URL="http://www.gajim.org/downloads/$TARBALL"
@@ -15,14 +15,6 @@
 compile_rules()
 {
     cd $src
-    while read file; do
-        [ -f done.$file ] && continue
-        echo "Apply $file..."
-        patch -p1 < ../stuff/$file || return 1
-        touch done.$file
-    done <<EOT
-host_srv.patch
-EOT
     ./configure --prefix=/usr \
         --mandir=/usr/share/man \
         $CONFIGURE_ARGS &&
diff -r fa15a340f141 -r 07a92deec1e6 gajim/stuff/host_srv.patch
--- a/gajim/stuff/host_srv.patch	Fri Jun 26 15:30:21 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-use host to resolve domain
---- gajim-0.12.1/src/common/nslookup.py.orig	2009-04-18 02:11:36.000000000 +0800
-+++ gajim-0.12.1/src/common/nslookup.py	2009-04-18 02:14:37.000000000 +0800
-@@ -123,11 +123,11 @@
- 				line = helpers.decode_string(line)
- 				domain = ufqdn
- 			if domain:
--				rest = line[len(domain):].split('=')
-+				rest = line[len(domain):].split('record')
- 				if len(rest) != 2:
- 					continue
- 				answer_type, props_str = rest
--				if answer_type.strip() != 'service':
-+				if answer_type.strip() != 'has SRV':
- 					continue
- 				props = props_str.strip().split(' ')
- 				if len(props) < 4:
-@@ -296,7 +296,7 @@
- 			return
- 	
- 	def _compose_command_args(self):
--		return ['nslookup', '-type=' + self.type , self.host]
-+		return ['host', '-t ' + self.type , self.host]
- 	
- 	def _return_result(self):
- 		if self.result_handler: