wok rev 16478

Up xpaint + libXaw3dXft and add to ARM (would be nice to have a small paint tool in next R-Pi release
author Christophe Lincoln <pankso@slitaz.org>
date Wed Apr 23 01:56:24 2014 +0200 (2014-04-23)
parents 7d672a2330b8
children f2cae20278f1
files ed/receipt libXaw3dXft-dev/receipt libXaw3dXft/receipt ntpclient/receipt xorg-libXaw3d-dev/receipt xorg-libXaw3d/receipt xpaint/receipt
line diff
     1.1 --- a/ed/receipt	Wed Apr 23 01:06:05 2014 +0200
     1.2 +++ b/ed/receipt	Wed Apr 23 01:56:24 2014 +0200
     1.3 @@ -9,6 +9,7 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.5  WEB_SITE="http://www.gnu.org/software/ed/"
     1.6  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  DEPENDS=""
    1.10  BUILD_DEPENDS=""
    1.11 @@ -16,7 +17,8 @@
    1.12  # Rules to configure and make the package.
    1.13  compile_rules()
    1.14  {
    1.15 -	./configure --prefix=/usr && make && make install
    1.16 +	./configure --prefix=/usr && 
    1.17 +	make CC=${HOST_SYSTEM}-gcc && make install
    1.18  }
    1.19  
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- a/libXaw3dXft-dev/receipt	Wed Apr 23 01:06:05 2014 +0200
     2.2 +++ b/libXaw3dXft-dev/receipt	Wed Apr 23 01:56:24 2014 +0200
     2.3 @@ -1,13 +1,14 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="libXaw3dXft-dev"
     2.7 -VERSION="1.6.2"
     2.8 +VERSION="1.6.2c"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="Xpaint module devel files."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12  LICENSE="MIT"
    2.13  WANTED="libXaw3dXft"
    2.14  WEB_SITE="http://sourceforge.net/projects/sf-xpaint/"
    2.15 +HOST_ARCH="i486 arm"
    2.16  
    2.17  DEPENDS="libXaw3dXft xorg-libXmu-dev pkg-config"
    2.18  
     3.1 --- a/libXaw3dXft/receipt	Wed Apr 23 01:06:05 2014 +0200
     3.2 +++ b/libXaw3dXft/receipt	Wed Apr 23 01:56:24 2014 +0200
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="libXaw3dXft"
     3.7 -VERSION="1.6.2"
     3.8 +VERSION="1.6.2c"
     3.9  CATEGORY="x-window"
    3.10  SHORT_DESC="Xpaint module"
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12 @@ -9,6 +9,7 @@
    3.13  WEB_SITE="http://sourceforge.net/projects/sf-xpaint/"
    3.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.15  WGET_URL="$SF_MIRROR/sf-xpaint/$TARBALL"
    3.16 +HOST_ARCH="i486 arm"
    3.17  
    3.18  DEPENDS="xorg-libXmu fontconfig xorg-libXrender xorg-libXft lzlib"
    3.19  BUILD_DEPENDS="xorg-libXmu-dev util-linux-uuid-dev expat-dev libxml2-dev"
     4.1 --- a/ntpclient/receipt	Wed Apr 23 01:06:05 2014 +0200
     4.2 +++ b/ntpclient/receipt	Wed Apr 23 01:56:24 2014 +0200
     4.3 @@ -11,15 +11,11 @@
     4.4  WGET_URL="http://doolittle.icarus.com/ntpclient/$TARBALL"
     4.5  HOST_ARCH="i486 arm"
     4.6  
     4.7 -DEPENDS=""
     4.8 -
     4.9  # Rules to configure and make the package.
    4.10  compile_rules()
    4.11  {
    4.12 -	cd $src
    4.13 -	
    4.14  	# disable debug
    4.15 -	sed -i 's/\(^CFLAGS += -DENABLE_DEBUG\)/#\1/' Makefile
    4.16 +	sed -i 's/\(^CFLAGS += -DENABLE_DEBUG\)/#\1/' Makefile && 
    4.17  	make 
    4.18  }
    4.19  
     5.1 --- a/xorg-libXaw3d-dev/receipt	Wed Apr 23 01:06:05 2014 +0200
     5.2 +++ b/xorg-libXaw3d-dev/receipt	Wed Apr 23 01:56:24 2014 +0200
     5.3 @@ -9,6 +9,7 @@
     5.4  WANTED="xorg-libXaw3d"
     5.5  SOURCE="libXaw3d"
     5.6  WEB_SITE="http://www.x.org/"
     5.7 +HOST_ARCH="i486 arm"
     5.8  
     5.9  DEPENDS="xorg-libXaw3d xorg-libXmu-dev xorg-libXpm-dev pkg-config"
    5.10  
     6.1 --- a/xorg-libXaw3d/receipt	Wed Apr 23 01:06:05 2014 +0200
     6.2 +++ b/xorg-libXaw3d/receipt	Wed Apr 23 01:56:24 2014 +0200
     6.3 @@ -10,6 +10,7 @@
     6.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
     6.5  WEB_SITE="http://www.x.org/"
     6.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
     6.7 +HOST_ARCH="i486 arm"
     6.8  
     6.9  DEPENDS="xorg-libXmu"
    6.10  BUILD_DEPENDS="xorg-libXmu-dev util-linux-uuid-dev"
     7.1 --- a/xpaint/receipt	Wed Apr 23 01:06:05 2014 +0200
     7.2 +++ b/xpaint/receipt	Wed Apr 23 01:56:24 2014 +0200
     7.3 @@ -1,23 +1,29 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="xpaint"
     7.7 -VERSION="2.9.9.1"
     7.8 +VERSION="2.9.10.2"
     7.9  CATEGORY="graphics"
    7.10  SHORT_DESC="Simple paint program for X"
    7.11  MAINTAINER="mojo@slitaz.org"
    7.12  LICENSE="GPL3"
    7.13 -WEB_SITE="http://sourceforge.net/projects/sf-xpaint/"
    7.14 +WEB_SITE="http://sf-xpaint.sourceforge.net/"
    7.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    7.16  WGET_URL="$SF_MIRROR/sf-$PACKAGE/$TARBALL"
    7.17 +HOST_ARCH="i486 arm"
    7.18  
    7.19 -DEPENDS="openjpeg libXaw3dXft"
    7.20 +DEPENDS="openjpeg libXaw3dXft xorg-libXaw3d"
    7.21  BUILD_DEPENDS="openjpeg-dev libXaw3dXft-dev libpng-dev jpeg-dev tiff-dev \
    7.22 -expat-dev libxml2-dev util-linux-uuid-dev"
    7.23 +expat-dev libxml2-dev util-linux-uuid-dev xorg-libXaw3d-dev"
    7.24  
    7.25  # Rules to configure and make the package.
    7.26  compile_rules()
    7.27  {
    7.28 -	./configure $CONFIGURE_ARGS && make -j 1 && make install
    7.29 +	[ "$ARCH" == "i486" ] && LIBTOOL=libtool
    7.30 +	./configure $CONFIGURE_ARGS &&
    7.31 +	# Fix cross compilation
    7.32 +	sed -i s'/$(CC) substads.c/gcc substads.c/' Makefile &&
    7.33 +	sed -i s'/$(CC) preproc.c/gcc preproc.c/' Makefile &&
    7.34 +	make -j 1 LIBTOOL=${HOST_SYSTEM}-libtool && make install
    7.35  }
    7.36  
    7.37  # Rules to gen a SliTaz package suitable for Tazpkg.