wok diff gtk+/receipt @ rev 16369
Up: vlc(2.1.4)
author | Richard Dunbar <mojo@slitaz.org> |
---|---|
date | Mon Apr 14 09:08:06 2014 +0000 (2014-04-14) |
parents | 04d06b4d19e8 |
children | 0058a2fc42a9 |
line diff
1.1 --- a/gtk+/receipt Sun Mar 30 19:03:27 2014 +0200 1.2 +++ b/gtk+/receipt Mon Apr 14 09:08:06 2014 +0000 1.3 @@ -11,28 +11,27 @@ 1.4 WEB_SITE="http://www.gtk.org/" 1.5 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL" 1.6 CONFIG_FILES="/etc/gtk-2.0/gtk.immodules" 1.7 - 1.8 HOST_ARCH="i486 arm" 1.9 -CROSS_BUGS="/bin/bash: no: command not found" 1.10 1.11 DEPENDS="glibc-base expat libxcb xcb-util zlib glib cairo pango atk libpng \ 1.12 jpeg tiff gdk-pixbuf fontconfig freetype pixman libgio xorg-libX11 xorg-libXau \ 1.13 xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \ 1.14 xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXrandr" 1.15 -BUILD_DEPENDS="bash pkg-config xorg-xextproto cups-dev libcomerr3 \ 1.16 -dbus-dev gobject-introspection-dev libffi-dev perl atk-dev pango-dev \ 1.17 -cairo-dev gdk-pixbuf-dev libxml2-dev" 1.18 +BUILD_DEPENDS="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \ 1.19 +xorg-inputproto libxcb-dev fontconfig-dev freetype-dev pixman-dev libxml2-dev \ 1.20 +libpng-dev libffi-dev xorg-xextproto" 1.21 1.22 # Handle cross compilation. 1.23 case "$ARCH" in 1.24 - arm*) 1.25 - BUILD_DEPENDS="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \ 1.26 -xorg-inputproto" 1.27 + i?86) 1.28 + BUILD_DEPENDS="$BUILD_DEPENDS bash pkg-config cups-dev perl 1.29 + gobject-introspection-dev" ;; 1.30 + arm*) 1.31 ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \ 1.32 ---disable-papi --with-gdktarget=x11 --with-xinput --enable-display-migration \ 1.33 -gio_can_sniff=yes" 1.34 - export LDFLAGS=-L/cross/$ARCH/sysroot/usr/lib 1.35 - export CPPFLAGS=-I/cross/$ARCH/sysroot/usr/include ;; 1.36 + --disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes" 1.37 + export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib" 1.38 + export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include" 1.39 + export LIBTOOL=${HOST_SYSTEM}-libtool ;; 1.40 esac 1.41 1.42 # Rules to configure and make the package. 1.43 @@ -42,7 +41,7 @@ 1.44 --prefix=/usr \ 1.45 --sysconfdir=/etc \ 1.46 --with-html-dir=/usr/share/doc \ 1.47 - $CONFIGURE_ARGS $ARCH_ARGS && 1.48 + $CONFIGURE_ARGS ${ARCH_ARGS} && 1.49 # https://bugzilla.gnome.org/show_bug.cgi?id=655517 1.50 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool && 1.51 make $MAKEFLAGS &&