# HG changeset patch # User Christophe Lincoln # Date 1396671209 -7200 # Node ID e62fe73c97ae7890c70611f71f5e7581729d808f # Parent 314808318aef57b613119aae79d7d95c4d3e57cc ARM: add webkit (cross compile in my local chroot :-) and needed deps diff -r 314808318aef -r e62fe73c97ae glib-networking-dev/receipt --- a/glib-networking-dev/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/glib-networking-dev/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -8,6 +8,7 @@ LICENSE="LGPL2" WANTED="glib-networking" WEB_SITE="http://www.gtk.org/" +HOST_ARCH="i486 arm" DEPENDS="glib-networking" diff -r 314808318aef -r e62fe73c97ae glib-networking/receipt --- a/glib-networking/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/glib-networking/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -9,14 +9,19 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WEB_SITE="http://www.gtk.org/" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="glib libgio libgnutls" -BUILD_DEPENDS="glib-dev libgio-dev gnutls-dev intltool automake autoconf git" +BUILD_DEPENDS="glib-dev libgio-dev gnutls-dev " + +# Handle cross compilation. +case "$ARCH" in + i?86) BUILD_DEPENDS="$BUILD_DEPENDS intltool automake autoconf" ;; +esac # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --prefix=/usr \ --without-ca-certificates \ diff -r 314808318aef -r e62fe73c97ae gnutls-dev/receipt --- a/gnutls-dev/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/gnutls-dev/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -8,6 +8,7 @@ LICENSE="GPL3" WANTED="gnutls" WEB_SITE="http://www.gnu.org/software/gnutls/" +HOST_ARCH="i486 arm" DEPENDS="gnutls libtasn1-dev libgcrypt-dev libgpg-error-dev p11-kit-dev \ zlib-dev pkg-config" diff -r 314808318aef -r e62fe73c97ae gnutls/receipt --- a/gnutls/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/gnutls/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -9,23 +9,38 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.gnu.org/software/gnutls/" WGET_URL="http://ftp.gnu.org/gnu/$PACKAGE/$TARBALL" +HOST_ARCH="i486 arm" -DEPENDS="nettle libgpg-error ncurses readline zlib gcc-lib-base libgnutls \ -libtasn1 p11-kit" -BUILD_DEPENDS="libtasn1-dev ncurses-dev readline-dev p11-kit-dev \ -nettle-dev libgpg-error-dev libgcrypt-dev" +DEPENDS="nettle libgpg-error ncurses readline zlib gcc-lib-base +libgnutls libcrypto libtasn1" +BUILD_DEPENDS="libtasn1-dev ncurses-dev readline-dev nettle-dev +libgpg-error-dev libgcrypt-dev libcrypto-dev" + +# Handle SliTaz arch. +case "$SLITAZ_ARCH" in + i?86) DEPENDS="$DEPENDS p11-kit" ;; +esac + +# Handle cross compilation. +case "$ARCH" in + i?86) + BUILD_DEPENDS="$BUILD_DEPENDS p11-kit-dev" ;; + arm*) + ARCH_ARGS="--with-libgcrypt-prefix=/cross/$ARCH/sysroot/usr \ + --without-p11-kit --disable-rpath" ;; +esac # Rules to configure and make the package. compile_rules() { - cd $src # Apply http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0092 fix # from https://www.gitorious.org/gnutls/gnutls/commit/6aa26f78150ccbdf0aec1878a41c17c41d358a3b patch -p1 < $stuff/CVE-2014-0092.u - ./configure --with-libgcrypt \ - --disable-guile \ - --with-zlib \ - $CONFIGURE_ARGS && + ./configure \ + --with-libgcrypt \ + --disable-guile \ + --with-zlib \ + $CONFIGURE_ARGS ${ARCH_ARGS} && make && make install } diff -r 314808318aef -r e62fe73c97ae libgnutls/receipt --- a/libgnutls/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/libgnutls/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -8,6 +8,7 @@ LICENSE="GPL3" WANTED="gnutls" WEB_SITE="http://www.gnu.org/software/gnutls/" +HOST_ARCH="i486 arm" BUILD_DEPENDS="libgcrypt-dev libgpg-error-dev" DEPENDS="p11-kit" diff -r 314808318aef -r e62fe73c97ae libsoup-dev/receipt --- a/libsoup-dev/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/libsoup-dev/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -8,6 +8,7 @@ LICENSE="LGPL2" WANTED="libsoup" WEB_SITE="http://live.gnome.org/LibSoup/" +HOST_ARCH="i486 arm" DEPENDS="libsoup libxml2-dev gnutls-dev glib-dev pkg-config" @@ -17,7 +18,10 @@ mkdir -p $fs/usr/lib $fs/usr/share cp -a $install/usr/lib/*.*a $fs/usr/lib cp -a $install/usr/lib/pkgconfig $fs/usr/lib + if [ -d "$install/usr/share/gir-1.0" ]; then + cp -a $install/usr/share/gir-1.0 $fs/usr/share + cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib + fi cp -a $install/usr/include $fs/usr - cp -a $install/usr/share/gir-1.0 $fs/usr/share } diff -r 314808318aef -r e62fe73c97ae libsoup/receipt --- a/libsoup/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/libsoup/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -9,21 +9,27 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WEB_SITE="https://live.gnome.org/LibSoup/" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" +HOST_ARCH="i486 arm" -DEPENDS="glibc-base libxml2 zlib glib glib-networking libgio gtk+ libgnutls libtasn1 libgcrypt" -BUILD_DEPENDS="gtk+-dev glib-networking-dev libgio libgio-dev libxml2-dev libgcrypt-dev libtasn1-dev gobject-introspection-dev gnutls-dev zlib-dev" +DEPENDS="glibc-base libxml2 zlib glib glib-networking libgio gtk+ \ +libgnutls libtasn1 libgcrypt" +BUILD_DEPENDS="gtk+-dev glib-networking-dev libgio libgio-dev \ +libxml2-dev libgcrypt-dev libtasn1-dev gnutls-dev zlib-dev" + +# Handle cross compilation. +case "$ARCH" in + i?86) BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;; +esac # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --with-html-dir=/usr/share/doc \ --disable-gtk-doc \ --without-gnome \ $CONFIGURE_ARGS && - make && - make install + make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -31,6 +37,5 @@ { mkdir -p $fs/usr/lib cp -a $install/usr/lib/*.so* $fs/usr/lib - cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib } diff -r 314808318aef -r e62fe73c97ae libwebkit-dev/receipt --- a/libwebkit-dev/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/libwebkit-dev/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -9,20 +9,26 @@ MAINTAINER="mallory@sweetpeople.org" LICENSE="LGPL2" WEB_SITE="http://webkitgtk.org" +HOST_ARCH="i486 arm" -DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev sqlite-dev pkg-config" +DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev sqlite-dev" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/share cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/include $fs/usr - [ -d $install/usr/share/gir-1.0 ] && - cp -a $install/usr/share/gir-1.0 $fs/usr/share - if [ -f $fs/usr/lib/pkgconfig/webkit-1.0.pc ]; then - ln -sf /usr/lib/pkgconfig/webkit-1.0.pc \ - $fs/usr/lib/pkgconfig/webkitgtk-1.0.pc - fi + # ARM: no pkg-config, include or gir files + case "$ARCH" in + i?86) + cp -a $install/usr/lib/pkgconfig $fs/usr/lib + cp -a $install/usr/include $fs/usr + cp -a $install/usr/share/gir-1.0 $fs/usr/share + cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib + # webkitgtk-1.0.pc + if [ -f $fs/usr/lib/pkgconfig/webkit-1.0.pc ]; then + ln -sf /usr/lib/pkgconfig/webkit-1.0.pc \ + $fs/usr/lib/pkgconfig/webkitgtk-1.0.pc + fi ;; + esac } diff -r 314808318aef -r e62fe73c97ae libwebkit/receipt --- a/libwebkit/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/libwebkit/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -4,43 +4,48 @@ VERSION="1.8.3" CATEGORY="network" SHORT_DESC="xHTML render library." -MAINTAINER="mallory@sweetpeople.org" +MAINTAINER="devel@slitaz.org" LICENSE="LGPL2" SOURCE="webkit" TARBALL="$SOURCE-$VERSION.tar.xz" WEB_SITE="http://webkitgtk.org" WGET_URL="$WEB_SITE/releases/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="gtk+ enchant libxslt expat gtk+ jpeg libpng libxml2 sqlite \ xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \ xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \ xorg-libXrandr xorg-libXrender xorg-libXt acl xorg-libXdamage libsoup \ gcc-lib-base libtasn1 util-linux-uuid glib-networking" -BUILD_DEPENDS="gtk+-dev enchant enchant-dev gperf libxslt-dev jpeg-dev \ -libpng-dev glib-dev autoconf automake gnutls-dev sqlite-dev libtool \ -m4 bison flex xorg-libXdamage-dev acl-dev libsoup-dev libxml2-dev \ -libxcb-dev xcb-util-dev util-linux-uuid-dev zlib-dev libtasn1-dev \ -gobject-introspection-dev tar gettext glib-networking-dev gtk-doc" +BUILD_DEPENDS="gtk+-dev enchant-dev libxslt-dev jpeg-dev libpng-dev \ +glib-dev sqlite-dev gnutls-dev xorg-libXdamage-dev acl-dev libsoup-dev \ +libxml2-dev libxcb-dev xcb-util-dev util-linux-uuid-dev zlib-dev \ +libtasn1-dev glib-networking-dev" + +# Handle cross compilation. +case "$ARCH" in + i?86) + BUILD_DEPENDS="$BUILD_DEPENDS tar gettext m4 bison flex gperf + autoconf automake gtk-doc libtool" ;; +esac # Rules to configure and make the package. compile_rules() { - cd $src # libwebkit does not like parallel builds. export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/') # fix Bug 84526: webkit-gtk-1.8.0 fails to build with --disable-video # Build fix with newer bison 2.6 - for file_diff in $stuff/*.diff; do - echo -n "Applying patch $(basename $file_diff)" - patch -Np1 -i $file_diff > /dev/null - status - done + if [ ! "$continue" ]; then + for file_diff in $stuff/*.diff; do + echo -n "Applying patch $(basename $file_diff)" + patch -Np1 -i $file_diff > /dev/null + status + done + patch -p0 < $stuff/CodeGeneratorGObject-bug-84526.patch || exit 1 + fi # Build - patch -p0 < $stuff/CodeGeneratorGObject-bug-84526.patch || exit 1 ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ --enable-introspection=no \ --enable-video=no \ --enable-jit=yes \ @@ -51,14 +56,14 @@ --disable-gtk-doc \ $CONFIGURE_ARGS && make all stamp-po 2>&1 | grep -v Source/WebCore/dom/testing && - make DESTDIR=$DESTDIR install 2>&1 | grep -Ev '(/usr/share/gtk-doc/html|Documentation/webkitgtk/version.xml)' && + make install 2>&1 | \ + grep -Ev '(/usr/share/gtk-doc/html|Documentation/webkitgtk/version.xml)' && cp -a $src/Programs/GtkLauncher $DESTDIR/usr/bin } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib $fs/usr/bin - [ -d $install/usr/lib/girepository-1.0 ] && cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib + mkdir -p $fs/usr/lib cp -a $install/usr/lib/*.so* $fs/usr/lib } diff -r 314808318aef -r e62fe73c97ae netsurf/receipt --- a/netsurf/receipt Sat Apr 05 03:24:21 2014 +0200 +++ b/netsurf/receipt Sat Apr 05 06:13:29 2014 +0200 @@ -13,9 +13,10 @@ DEPENDS="gtk+ libssl libpng jpeg lcms libparserutils hubbub libnsgif \ libcurl libglade librsvg libgsf libcss libmng zlib libxml2" -BUILD_DEPENDS="$DEPENDS gtk+-dev libglade-dev openssl-dev libpng-dev jpeg-dev lcms-dev \ -re2c lemon libparserutils-dev hubbub-dev libnsgif-dev librsvg-dev curl-dev pango-dev \ -libcss-dev libwapcaplet-dev libmng-dev zlib-dev libxml2-dev libcroco" +BUILD_DEPENDS="$DEPENDS gtk+-dev libglade-dev openssl-dev libpng-dev \ +jpeg-dev lcms-dev re2c lemon libparserutils-dev hubbub-dev libnsgif-dev \ +librsvg-dev curl-dev pango-dev libcss-dev libwapcaplet-dev libmng-dev \ +zlib-dev libxml2-dev libcroco" # Rules to configure and make the package. compile_rules() @@ -29,7 +30,6 @@ sed -i 's/cp -v/cp /' Makefile make install DESTDIR=$DESTDIR PREFIX=/usr - } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -41,7 +41,6 @@ cp -a $install/usr/bin $fs/usr cp -a $install/usr/share/netsurf $fs/usr/share - # Remove files to save some space rm -rf $fs/usr/share/netsurf/docs rm -rf $fs/usr/share/netsurf/*.xpm