wok diff libwebkit/receipt @ rev 20255

firefox, thunderbird: try to force i686
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Mar 13 21:40:37 2018 +0100 (2018-03-13)
parents 8d6f480bf664
children 6e8b1bcb30e2
line diff
     1.1 --- a/libwebkit/receipt	Sun Nov 10 17:13:06 2013 +0000
     1.2 +++ b/libwebkit/receipt	Tue Mar 13 21:40:37 2018 +0100
     1.3 @@ -4,43 +4,48 @@
     1.4  VERSION="1.8.3"
     1.5  CATEGORY="network"
     1.6  SHORT_DESC="xHTML render library."
     1.7 -MAINTAINER="mallory@sweetpeople.org"
     1.8 +MAINTAINER="devel@slitaz.org"
     1.9  LICENSE="LGPL2"
    1.10  SOURCE="webkit"
    1.11  TARBALL="$SOURCE-$VERSION.tar.xz"
    1.12  WEB_SITE="http://webkitgtk.org"
    1.13  WGET_URL="$WEB_SITE/releases/$TARBALL"
    1.14 +HOST_ARCH="i486 arm"
    1.15  
    1.16  DEPENDS="gtk+ enchant libxslt expat gtk+ jpeg libpng libxml2 sqlite \
    1.17  xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
    1.18  xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
    1.19  xorg-libXrandr xorg-libXrender xorg-libXt acl xorg-libXdamage libsoup \
    1.20  gcc-lib-base libtasn1 util-linux-uuid glib-networking"
    1.21 -BUILD_DEPENDS="gtk+-dev enchant enchant-dev gperf libxslt-dev jpeg-dev \
    1.22 -libpng-dev glib-dev autoconf automake gnutls-dev sqlite-dev libtool \
    1.23 -m4 bison flex xorg-libXdamage-dev acl-dev libsoup-dev libxml2-dev \
    1.24 -libxcb-dev xcb-util-dev util-linux-uuid-dev zlib-dev libtasn1-dev \
    1.25 -gobject-introspection-dev tar gettext glib-networking-dev gtk-doc"
    1.26 +BUILD_DEPENDS="gtk+-dev enchant-dev libxslt-dev jpeg-dev libpng-dev \
    1.27 +glib-dev sqlite-dev gnutls-dev xorg-libXdamage-dev acl-dev libsoup-dev \
    1.28 +libxml2-dev libxcb-dev xcb-util-dev util-linux-uuid-dev zlib-dev \
    1.29 +libtasn1-dev glib-networking-dev"
    1.30 +
    1.31 +# Handle cross compilation.
    1.32 +case "$ARCH" in
    1.33 +	i?86) 
    1.34 +		BUILD_DEPENDS="$BUILD_DEPENDS tar gettext m4 bison flex gperf
    1.35 +		autoconf automake gtk-doc libtool" ;;
    1.36 +esac
    1.37  
    1.38  # Rules to configure and make the package.
    1.39  compile_rules()
    1.40  {
    1.41 -	cd $src
    1.42  	# libwebkit does not like parallel builds.
    1.43  	export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/')
    1.44  	# fix Bug 84526: webkit-gtk-1.8.0 fails to build with --disable-video
    1.45  	# Build fix with newer bison 2.6
    1.46 -	for file_diff in $stuff/*.diff; do
    1.47 -		echo -n "Applying patch $(basename $file_diff)"
    1.48 -		patch -Np1 -i $file_diff > /dev/null
    1.49 -		status
    1.50 -	done
    1.51 +	if [ ! "$continue" ]; then
    1.52 +		for file_diff in $stuff/*.diff; do
    1.53 +			echo -n "Applying patch $(basename $file_diff)"
    1.54 +			patch -Np1 -i $file_diff > /dev/null
    1.55 +			status
    1.56 +		done
    1.57 +		patch -p0 < $stuff/CodeGeneratorGObject-bug-84526.patch || exit 1
    1.58 +	fi
    1.59  	# Build
    1.60 -	patch -p0 < $stuff/CodeGeneratorGObject-bug-84526.patch || exit 1
    1.61  	./configure \
    1.62 -		--prefix=/usr \
    1.63 -		--infodir=/usr/share/info \
    1.64 -		--mandir=/usr/share/man \
    1.65  		--enable-introspection=no \
    1.66  		--enable-video=no \
    1.67  		--enable-jit=yes \
    1.68 @@ -51,14 +56,14 @@
    1.69  		--disable-gtk-doc \
    1.70  		$CONFIGURE_ARGS &&
    1.71  	make all stamp-po 2>&1 | grep -v Source/WebCore/dom/testing &&
    1.72 -	make DESTDIR=$DESTDIR install 2>&1 | grep -Ev '(/usr/share/gtk-doc/html|Documentation/webkitgtk/version.xml)' &&
    1.73 +	make install 2>&1 | \
    1.74 +		grep -Ev '(/usr/share/gtk-doc/html|Documentation/webkitgtk/version.xml)' &&
    1.75  	cp -a $src/Programs/GtkLauncher $DESTDIR/usr/bin
    1.76  }
    1.77  
    1.78  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.79  genpkg_rules()
    1.80  {
    1.81 -	mkdir -p $fs/usr/lib $fs/usr/bin
    1.82 -	[ -d $install/usr/lib/girepository-1.0 ] && cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    1.83 +	mkdir -p $fs/usr/lib
    1.84  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.85  }