wok-current rev 16258

ARM: add webkit (cross compile in my local chroot :-) and needed deps
author Christophe Lincoln <pankso@slitaz.org>
date Sat Apr 05 06:13:29 2014 +0200 (2014-04-05)
parents 314808318aef
children 75362eca62d8
files glib-networking-dev/receipt glib-networking/receipt gnutls-dev/receipt gnutls/receipt libgnutls/receipt libsoup-dev/receipt libsoup/receipt libwebkit-dev/receipt libwebkit/receipt netsurf/receipt
line diff
     1.1 --- a/glib-networking-dev/receipt	Sat Apr 05 03:24:21 2014 +0200
     1.2 +++ b/glib-networking-dev/receipt	Sat Apr 05 06:13:29 2014 +0200
     1.3 @@ -8,6 +8,7 @@
     1.4  LICENSE="LGPL2"
     1.5  WANTED="glib-networking"
     1.6  WEB_SITE="http://www.gtk.org/"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  DEPENDS="glib-networking"
    1.10  
     2.1 --- a/glib-networking/receipt	Sat Apr 05 03:24:21 2014 +0200
     2.2 +++ b/glib-networking/receipt	Sat Apr 05 06:13:29 2014 +0200
     2.3 @@ -9,14 +9,19 @@
     2.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
     2.5  WEB_SITE="http://www.gtk.org/"
     2.6  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
     2.7 +HOST_ARCH="i486 arm"
     2.8  
     2.9  DEPENDS="glib libgio libgnutls"
    2.10 -BUILD_DEPENDS="glib-dev libgio-dev gnutls-dev intltool automake autoconf git"
    2.11 +BUILD_DEPENDS="glib-dev libgio-dev gnutls-dev "
    2.12 +
    2.13 +# Handle cross compilation.
    2.14 +case "$ARCH" in
    2.15 +	i?86) BUILD_DEPENDS="$BUILD_DEPENDS intltool automake autoconf" ;;
    2.16 +esac
    2.17  
    2.18  # Rules to configure and make the package.
    2.19  compile_rules()
    2.20  {
    2.21 -	cd $src
    2.22  	./configure \
    2.23  		--prefix=/usr \
    2.24  		--without-ca-certificates \
     3.1 --- a/gnutls-dev/receipt	Sat Apr 05 03:24:21 2014 +0200
     3.2 +++ b/gnutls-dev/receipt	Sat Apr 05 06:13:29 2014 +0200
     3.3 @@ -8,6 +8,7 @@
     3.4  LICENSE="GPL3"
     3.5  WANTED="gnutls"
     3.6  WEB_SITE="http://www.gnu.org/software/gnutls/"
     3.7 +HOST_ARCH="i486 arm"
     3.8  
     3.9  DEPENDS="gnutls libtasn1-dev libgcrypt-dev libgpg-error-dev p11-kit-dev \
    3.10  zlib-dev pkg-config"
     4.1 --- a/gnutls/receipt	Sat Apr 05 03:24:21 2014 +0200
     4.2 +++ b/gnutls/receipt	Sat Apr 05 06:13:29 2014 +0200
     4.3 @@ -9,23 +9,38 @@
     4.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     4.5  WEB_SITE="http://www.gnu.org/software/gnutls/"
     4.6  WGET_URL="http://ftp.gnu.org/gnu/$PACKAGE/$TARBALL"
     4.7 +HOST_ARCH="i486 arm"
     4.8  
     4.9 -DEPENDS="nettle libgpg-error ncurses readline zlib gcc-lib-base libgnutls \
    4.10 -libtasn1 p11-kit"
    4.11 -BUILD_DEPENDS="libtasn1-dev ncurses-dev readline-dev p11-kit-dev \
    4.12 -nettle-dev libgpg-error-dev libgcrypt-dev"
    4.13 +DEPENDS="nettle libgpg-error ncurses readline zlib gcc-lib-base 
    4.14 +libgnutls libcrypto libtasn1"
    4.15 +BUILD_DEPENDS="libtasn1-dev ncurses-dev readline-dev nettle-dev 
    4.16 +libgpg-error-dev libgcrypt-dev libcrypto-dev"
    4.17 +
    4.18 +# Handle SliTaz arch.
    4.19 +case "$SLITAZ_ARCH" in
    4.20 +	i?86) DEPENDS="$DEPENDS p11-kit" ;;
    4.21 +esac
    4.22 +
    4.23 +# Handle cross compilation.
    4.24 +case "$ARCH" in
    4.25 +	i?86) 
    4.26 +		BUILD_DEPENDS="$BUILD_DEPENDS p11-kit-dev" ;;
    4.27 +	arm*) 
    4.28 +		ARCH_ARGS="--with-libgcrypt-prefix=/cross/$ARCH/sysroot/usr \
    4.29 +		--without-p11-kit --disable-rpath" ;;
    4.30 +esac
    4.31  
    4.32  # Rules to configure and make the package.
    4.33  compile_rules()
    4.34  {
    4.35 -	cd $src
    4.36  	# Apply http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0092 fix
    4.37  	# from https://www.gitorious.org/gnutls/gnutls/commit/6aa26f78150ccbdf0aec1878a41c17c41d358a3b
    4.38  	patch -p1 < $stuff/CVE-2014-0092.u
    4.39 -	./configure --with-libgcrypt \
    4.40 -	--disable-guile \
    4.41 -	--with-zlib \
    4.42 -	$CONFIGURE_ARGS &&
    4.43 +	./configure \
    4.44 +		--with-libgcrypt \
    4.45 +		--disable-guile \
    4.46 +		--with-zlib \
    4.47 +		$CONFIGURE_ARGS ${ARCH_ARGS} &&
    4.48  	make && make install
    4.49  }
    4.50  
     5.1 --- a/libgnutls/receipt	Sat Apr 05 03:24:21 2014 +0200
     5.2 +++ b/libgnutls/receipt	Sat Apr 05 06:13:29 2014 +0200
     5.3 @@ -8,6 +8,7 @@
     5.4  LICENSE="GPL3"
     5.5  WANTED="gnutls"
     5.6  WEB_SITE="http://www.gnu.org/software/gnutls/"
     5.7 +HOST_ARCH="i486 arm"
     5.8  
     5.9  BUILD_DEPENDS="libgcrypt-dev libgpg-error-dev"
    5.10  DEPENDS="p11-kit"
     6.1 --- a/libsoup-dev/receipt	Sat Apr 05 03:24:21 2014 +0200
     6.2 +++ b/libsoup-dev/receipt	Sat Apr 05 06:13:29 2014 +0200
     6.3 @@ -8,6 +8,7 @@
     6.4  LICENSE="LGPL2"
     6.5  WANTED="libsoup"
     6.6  WEB_SITE="http://live.gnome.org/LibSoup/"
     6.7 +HOST_ARCH="i486 arm"
     6.8  
     6.9  DEPENDS="libsoup libxml2-dev gnutls-dev glib-dev pkg-config"
    6.10  
    6.11 @@ -17,7 +18,10 @@
    6.12  	mkdir -p $fs/usr/lib $fs/usr/share
    6.13  	cp -a $install/usr/lib/*.*a $fs/usr/lib
    6.14  	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    6.15 +	if [ -d "$install/usr/share/gir-1.0" ]; then
    6.16 +		cp -a $install/usr/share/gir-1.0 $fs/usr/share
    6.17 +		cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    6.18 +	fi
    6.19  	cp -a $install/usr/include $fs/usr
    6.20 -	cp -a $install/usr/share/gir-1.0 $fs/usr/share
    6.21  }
    6.22  
     7.1 --- a/libsoup/receipt	Sat Apr 05 03:24:21 2014 +0200
     7.2 +++ b/libsoup/receipt	Sat Apr 05 06:13:29 2014 +0200
     7.3 @@ -9,21 +9,27 @@
     7.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
     7.5  WEB_SITE="https://live.gnome.org/LibSoup/"
     7.6  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
     7.7 +HOST_ARCH="i486 arm"
     7.8  
     7.9 -DEPENDS="glibc-base libxml2 zlib glib glib-networking libgio gtk+ libgnutls libtasn1 libgcrypt"
    7.10 -BUILD_DEPENDS="gtk+-dev glib-networking-dev libgio libgio-dev libxml2-dev libgcrypt-dev libtasn1-dev gobject-introspection-dev gnutls-dev zlib-dev"
    7.11 +DEPENDS="glibc-base libxml2 zlib glib glib-networking libgio gtk+ \
    7.12 +libgnutls libtasn1 libgcrypt"
    7.13 +BUILD_DEPENDS="gtk+-dev glib-networking-dev libgio libgio-dev \
    7.14 +libxml2-dev libgcrypt-dev libtasn1-dev gnutls-dev zlib-dev"
    7.15 +
    7.16 +# Handle cross compilation.
    7.17 +case "$ARCH" in
    7.18 +	i?86) BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;;
    7.19 +esac
    7.20  
    7.21  # Rules to configure and make the package.
    7.22  compile_rules()
    7.23  {
    7.24 -	cd $src
    7.25  	./configure \
    7.26  		--with-html-dir=/usr/share/doc \
    7.27  		--disable-gtk-doc \
    7.28  		--without-gnome \
    7.29  		$CONFIGURE_ARGS &&
    7.30 -	make &&
    7.31 -	make install
    7.32 +	make && make install
    7.33  }
    7.34  
    7.35  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.36 @@ -31,6 +37,5 @@
    7.37  {
    7.38  	mkdir -p $fs/usr/lib
    7.39  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    7.40 -	cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    7.41  }
    7.42  
     8.1 --- a/libwebkit-dev/receipt	Sat Apr 05 03:24:21 2014 +0200
     8.2 +++ b/libwebkit-dev/receipt	Sat Apr 05 06:13:29 2014 +0200
     8.3 @@ -9,20 +9,26 @@
     8.4  MAINTAINER="mallory@sweetpeople.org"
     8.5  LICENSE="LGPL2"
     8.6  WEB_SITE="http://webkitgtk.org"
     8.7 +HOST_ARCH="i486 arm"
     8.8  
     8.9 -DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev sqlite-dev pkg-config"
    8.10 +DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev sqlite-dev"
    8.11  
    8.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.13  genpkg_rules()
    8.14  {
    8.15  	mkdir -p $fs/usr/lib $fs/usr/share
    8.16  	cp -a $install/usr/lib/*.*a $fs/usr/lib
    8.17 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    8.18 -	cp -a $install/usr/include $fs/usr
    8.19 -	[ -d $install/usr/share/gir-1.0 ] &&
    8.20 -		cp -a $install/usr/share/gir-1.0 $fs/usr/share
    8.21 -	if [ -f $fs/usr/lib/pkgconfig/webkit-1.0.pc ]; then
    8.22 -		ln -sf /usr/lib/pkgconfig/webkit-1.0.pc \
    8.23 -			$fs/usr/lib/pkgconfig/webkitgtk-1.0.pc
    8.24 -	fi
    8.25 +	# ARM: no pkg-config, include or gir files 
    8.26 +	case "$ARCH" in
    8.27 +		i?86)
    8.28 +			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    8.29 +			cp -a $install/usr/include $fs/usr
    8.30 +			cp -a $install/usr/share/gir-1.0 $fs/usr/share
    8.31 +			cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    8.32 +			# webkitgtk-1.0.pc
    8.33 +			if [ -f $fs/usr/lib/pkgconfig/webkit-1.0.pc ]; then
    8.34 +				ln -sf /usr/lib/pkgconfig/webkit-1.0.pc \
    8.35 +					$fs/usr/lib/pkgconfig/webkitgtk-1.0.pc
    8.36 +			fi ;;
    8.37 +	esac
    8.38  }
     9.1 --- a/libwebkit/receipt	Sat Apr 05 03:24:21 2014 +0200
     9.2 +++ b/libwebkit/receipt	Sat Apr 05 06:13:29 2014 +0200
     9.3 @@ -4,43 +4,48 @@
     9.4  VERSION="1.8.3"
     9.5  CATEGORY="network"
     9.6  SHORT_DESC="xHTML render library."
     9.7 -MAINTAINER="mallory@sweetpeople.org"
     9.8 +MAINTAINER="devel@slitaz.org"
     9.9  LICENSE="LGPL2"
    9.10  SOURCE="webkit"
    9.11  TARBALL="$SOURCE-$VERSION.tar.xz"
    9.12  WEB_SITE="http://webkitgtk.org"
    9.13  WGET_URL="$WEB_SITE/releases/$TARBALL"
    9.14 +HOST_ARCH="i486 arm"
    9.15  
    9.16  DEPENDS="gtk+ enchant libxslt expat gtk+ jpeg libpng libxml2 sqlite \
    9.17  xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
    9.18  xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
    9.19  xorg-libXrandr xorg-libXrender xorg-libXt acl xorg-libXdamage libsoup \
    9.20  gcc-lib-base libtasn1 util-linux-uuid glib-networking"
    9.21 -BUILD_DEPENDS="gtk+-dev enchant enchant-dev gperf libxslt-dev jpeg-dev \
    9.22 -libpng-dev glib-dev autoconf automake gnutls-dev sqlite-dev libtool \
    9.23 -m4 bison flex xorg-libXdamage-dev acl-dev libsoup-dev libxml2-dev \
    9.24 -libxcb-dev xcb-util-dev util-linux-uuid-dev zlib-dev libtasn1-dev \
    9.25 -gobject-introspection-dev tar gettext glib-networking-dev gtk-doc"
    9.26 +BUILD_DEPENDS="gtk+-dev enchant-dev libxslt-dev jpeg-dev libpng-dev \
    9.27 +glib-dev sqlite-dev gnutls-dev xorg-libXdamage-dev acl-dev libsoup-dev \
    9.28 +libxml2-dev libxcb-dev xcb-util-dev util-linux-uuid-dev zlib-dev \
    9.29 +libtasn1-dev glib-networking-dev"
    9.30 +
    9.31 +# Handle cross compilation.
    9.32 +case "$ARCH" in
    9.33 +	i?86) 
    9.34 +		BUILD_DEPENDS="$BUILD_DEPENDS tar gettext m4 bison flex gperf
    9.35 +		autoconf automake gtk-doc libtool" ;;
    9.36 +esac
    9.37  
    9.38  # Rules to configure and make the package.
    9.39  compile_rules()
    9.40  {
    9.41 -	cd $src
    9.42  	# libwebkit does not like parallel builds.
    9.43  	export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/')
    9.44  	# fix Bug 84526: webkit-gtk-1.8.0 fails to build with --disable-video
    9.45  	# Build fix with newer bison 2.6
    9.46 -	for file_diff in $stuff/*.diff; do
    9.47 -		echo -n "Applying patch $(basename $file_diff)"
    9.48 -		patch -Np1 -i $file_diff > /dev/null
    9.49 -		status
    9.50 -	done
    9.51 +	if [ ! "$continue" ]; then
    9.52 +		for file_diff in $stuff/*.diff; do
    9.53 +			echo -n "Applying patch $(basename $file_diff)"
    9.54 +			patch -Np1 -i $file_diff > /dev/null
    9.55 +			status
    9.56 +		done
    9.57 +		patch -p0 < $stuff/CodeGeneratorGObject-bug-84526.patch || exit 1
    9.58 +	fi
    9.59  	# Build
    9.60 -	patch -p0 < $stuff/CodeGeneratorGObject-bug-84526.patch || exit 1
    9.61  	./configure \
    9.62 -		--prefix=/usr \
    9.63 -		--infodir=/usr/share/info \
    9.64 -		--mandir=/usr/share/man \
    9.65  		--enable-introspection=no \
    9.66  		--enable-video=no \
    9.67  		--enable-jit=yes \
    9.68 @@ -51,14 +56,14 @@
    9.69  		--disable-gtk-doc \
    9.70  		$CONFIGURE_ARGS &&
    9.71  	make all stamp-po 2>&1 | grep -v Source/WebCore/dom/testing &&
    9.72 -	make DESTDIR=$DESTDIR install 2>&1 | grep -Ev '(/usr/share/gtk-doc/html|Documentation/webkitgtk/version.xml)' &&
    9.73 +	make install 2>&1 | \
    9.74 +		grep -Ev '(/usr/share/gtk-doc/html|Documentation/webkitgtk/version.xml)' &&
    9.75  	cp -a $src/Programs/GtkLauncher $DESTDIR/usr/bin
    9.76  }
    9.77  
    9.78  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.79  genpkg_rules()
    9.80  {
    9.81 -	mkdir -p $fs/usr/lib $fs/usr/bin
    9.82 -	[ -d $install/usr/lib/girepository-1.0 ] && cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    9.83 +	mkdir -p $fs/usr/lib
    9.84  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    9.85  }
    10.1 --- a/netsurf/receipt	Sat Apr 05 03:24:21 2014 +0200
    10.2 +++ b/netsurf/receipt	Sat Apr 05 06:13:29 2014 +0200
    10.3 @@ -13,9 +13,10 @@
    10.4  
    10.5  DEPENDS="gtk+ libssl libpng jpeg lcms libparserutils hubbub libnsgif \
    10.6  libcurl libglade librsvg libgsf libcss libmng zlib libxml2"
    10.7 -BUILD_DEPENDS="$DEPENDS gtk+-dev libglade-dev openssl-dev libpng-dev jpeg-dev lcms-dev \
    10.8 -re2c lemon libparserutils-dev hubbub-dev libnsgif-dev librsvg-dev curl-dev pango-dev \
    10.9 -libcss-dev libwapcaplet-dev libmng-dev zlib-dev libxml2-dev libcroco"
   10.10 +BUILD_DEPENDS="$DEPENDS gtk+-dev libglade-dev openssl-dev libpng-dev \
   10.11 +jpeg-dev lcms-dev re2c lemon libparserutils-dev hubbub-dev libnsgif-dev \
   10.12 +librsvg-dev curl-dev pango-dev libcss-dev libwapcaplet-dev libmng-dev \
   10.13 +zlib-dev libxml2-dev libcroco"
   10.14  
   10.15  # Rules to configure and make the package.
   10.16  compile_rules()
   10.17 @@ -29,7 +30,6 @@
   10.18  	sed -i 's/cp -v/cp /' Makefile
   10.19  	
   10.20  	make install DESTDIR=$DESTDIR PREFIX=/usr
   10.21 -
   10.22  }
   10.23  
   10.24  # Rules to gen a SliTaz package suitable for Tazpkg.
   10.25 @@ -41,7 +41,6 @@
   10.26  	cp -a $install/usr/bin $fs/usr
   10.27  	cp -a $install/usr/share/netsurf $fs/usr/share
   10.28  
   10.29 -	
   10.30  	# Remove files to save some space
   10.31  	rm -rf $fs/usr/share/netsurf/docs
   10.32  	rm -rf $fs/usr/share/netsurf/*.xpm