wok-current rev 3580

emesene: update DEPENDS, remove host.patch(not needed). gajim: update DEPENDS
author Liu Peng <rocky@slitaz.org>
date Fri Jun 26 13:59:35 2009 +0000 (2009-06-26)
parents fa15a340f141 27dbd5251d69
children 8968d2135586
files emesene/receipt gajim/receipt gajim/stuff/host_srv.patch
line diff
     1.1 --- a/coreutils/receipt	Fri Jun 26 15:30:21 2009 +0200
     1.2 +++ b/coreutils/receipt	Fri Jun 26 13:59:35 2009 +0000
     1.3 @@ -8,20 +8,22 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.5  WEB_SITE="http://www.gnu.org/software/coreutils/"
     1.6  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
     1.7 -DEPENDS="libcap"
     1.8 -BUILD_DEPENDS="libcap-dev gmp-dev"
     1.9 +DEPENDS="glibc-base gmp libcap"
    1.10 +BUILD_DEPENDS="slitaz-toolchain libcap-dev gmp-dev"
    1.11  
    1.12  # Rules to configure and make the package.
    1.13  compile_rules()
    1.14  {
    1.15  	cd $src
    1.16  	
    1.17 +	# NOTE: There does not seem to be a problem with sigcontext.h in Linux 2.6.29.3
    1.18 +
    1.19  	# Hack to fix ls: expected specifier-qualifier-list before '__u64'
    1.20  	# We are not patching the original file, just fake to compile
    1.21  	# coreutils.
    1.22 -	rm -f /usr/include/asm/sigcontext.h.bak
    1.23 -	mv /usr/include/asm/sigcontext.h /usr/include/asm/sigcontext.h.bak || exit 1
    1.24 -	cp ../stuff/sigcontext.h /usr/include/asm
    1.25 +	# rm -f /usr/include/asm/sigcontext.h.bak
    1.26 +	# mv /usr/include/asm/sigcontext.h /usr/include/asm/sigcontext.h.bak || exit 1
    1.27 +	# cp ../stuff/sigcontext.h /usr/include/asm
    1.28  	
    1.29  	sed -i 's/1.10a/1.10.2/' configure.ac || exit 1
    1.30  	sed -i 's/dist-xz/dist-lzma/' configure.ac || exit 1
    1.31 @@ -30,13 +32,12 @@
    1.32  		--prefix=/usr \
    1.33  		--infodir=/usr/share/info \
    1.34  		--mandir=/usr/share/man \
    1.35 -		--enable-no-install-program=kill,uptime,ls \
    1.36  		$CONFIGURE_ARGS &&
    1.37  	make &&
    1.38 -	make DESTDIR=$PWD/_pkg install &&
    1.39 +	make DESTDIR=$PWD/_pkg install
    1.40  	
    1.41  	# Restore original sigcontext.h
    1.42 -	mv -f /usr/include/asm/sigcontext.h.bak /usr/include/asm/sigcontext.h
    1.43 +	# mv -f /usr/include/asm/sigcontext.h.bak /usr/include/asm/sigcontext.h
    1.44  }
    1.45  
    1.46  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- a/emesene/receipt	Fri Jun 26 15:30:21 2009 +0200
     2.2 +++ b/emesene/receipt	Fri Jun 26 13:59:35 2009 +0000
     2.3 @@ -5,7 +5,7 @@
     2.4  CATEGORY="network"
     2.5  SHORT_DESC="Instant messaging client for Windows Live Messenger (tm) network."
     2.6  MAINTAINER="rocky@slitaz.org"
     2.7 -DEPENDS="python pygtk pycairo pysqlite"
     2.8 +DEPENDS="python pygtk pycairo python-pysqlite"
     2.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.10  WEB_SITE="http://www.emesene.org"
    2.11  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     3.1 --- a/gajim/receipt	Fri Jun 26 15:30:21 2009 +0200
     3.2 +++ b/gajim/receipt	Fri Jun 26 13:59:35 2009 +0000
     3.3 @@ -5,8 +5,8 @@
     3.4  CATEGORY="network"
     3.5  SHORT_DESC="Gtk Jabber client."
     3.6  MAINTAINER="rocky@slitaz.org"
     3.7 -DEPENDS="gtkspell python dbus-python pygtk pygobject pyopenssl pysqlite xorg-libXss bindutils"
     3.8 -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"
     3.9 +DEPENDS="gtkspell python dbus-python pygtk pygobject pyopenssl python-pysqlite xorg-libXss bind-client"
    3.10 +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"
    3.11  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.12  WEB_SITE="http://www.gajim.org/"
    3.13  WGET_URL="http://www.gajim.org/downloads/$TARBALL"
    3.14 @@ -15,14 +15,6 @@
    3.15  compile_rules()
    3.16  {
    3.17      cd $src
    3.18 -    while read file; do
    3.19 -        [ -f done.$file ] && continue
    3.20 -        echo "Apply $file..."
    3.21 -        patch -p1 < ../stuff/$file || return 1
    3.22 -        touch done.$file
    3.23 -    done <<EOT
    3.24 -host_srv.patch
    3.25 -EOT
    3.26      ./configure --prefix=/usr \
    3.27          --mandir=/usr/share/man \
    3.28          $CONFIGURE_ARGS &&
     4.1 --- a/gajim/stuff/host_srv.patch	Fri Jun 26 15:30:21 2009 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,26 +0,0 @@
     4.4 -use host to resolve domain
     4.5 ---- gajim-0.12.1/src/common/nslookup.py.orig	2009-04-18 02:11:36.000000000 +0800
     4.6 -+++ gajim-0.12.1/src/common/nslookup.py	2009-04-18 02:14:37.000000000 +0800
     4.7 -@@ -123,11 +123,11 @@
     4.8 - 				line = helpers.decode_string(line)
     4.9 - 				domain = ufqdn
    4.10 - 			if domain:
    4.11 --				rest = line[len(domain):].split('=')
    4.12 -+				rest = line[len(domain):].split('record')
    4.13 - 				if len(rest) != 2:
    4.14 - 					continue
    4.15 - 				answer_type, props_str = rest
    4.16 --				if answer_type.strip() != 'service':
    4.17 -+				if answer_type.strip() != 'has SRV':
    4.18 - 					continue
    4.19 - 				props = props_str.strip().split(' ')
    4.20 - 				if len(props) < 4:
    4.21 -@@ -296,7 +296,7 @@
    4.22 - 			return
    4.23 - 	
    4.24 - 	def _compose_command_args(self):
    4.25 --		return ['nslookup', '-type=' + self.type , self.host]
    4.26 -+		return ['host', '-t ' + self.type , self.host]
    4.27 - 	
    4.28 - 	def _return_result(self):
    4.29 - 		if self.result_handler: