wok-next diff gtk+3/receipt @ rev 20533

cairo-clock, grub4dos: fix CFLAGS
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Mar 27 12:50:45 2018 +0200 (2018-03-27)
parents 133288c02003
children 757d032c55c7
line diff
     1.1 --- a/gtk+3/receipt	Fri Aug 18 03:02:41 2017 +0300
     1.2 +++ b/gtk+3/receipt	Tue Mar 27 12:50:45 2018 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  MAINTAINER="pankso@slitaz.org"
     1.5  LICENSE="LGPL2"
     1.6  WEB_SITE="https://www.gtk.org/"
     1.7 -#HOST_ARCH="i486 arm"
     1.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gtk3.html"
     1.9  CROSS_BUGS="bug: /bin/bash: no: command not found"
    1.10  
    1.11  TARBALL="gtk+-$VERSION.tar.xz"
    1.12 @@ -18,14 +18,12 @@
    1.13  BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev gettext \
    1.14  xorg-libXinerama-dev xorg-libXi-dev xorg-libXrandr-dev xorg-libXcomposite-dev \
    1.15  xorg-libXdamage-dev libepoxy-dev at-spi2-atk-dev cups-dev colord-dev gtk-doc \
    1.16 -libxslt"
    1.17 +libxslt gobject-introspection-dev xorg-libSM-dev"
    1.18  SPLIT="gtk+3-demo gtk+3-widget-factory gtk+3-icon-browser gtk+3 gtk+3-dev"
    1.19 +COOKOPTS="skip-log-errors" # Failed to open file ?./gdk.gresource.xml?: No such file or directory
    1.20  
    1.21 -# Rules to configure and make the package.
    1.22 -compile_rules()
    1.23 -{
    1.24 -	# http://www.linuxfromscratch.org/blfs/view/stable/x/gtk3.html
    1.25 -
    1.26 +compile_rules() {
    1.27 +	fix ld
    1.28  	# Handle cross compilation.
    1.29  	case "$ARCH" in
    1.30  		arm*)
    1.31 @@ -53,59 +51,51 @@
    1.32  		--disable-broadway-backend \
    1.33  		--with-x \
    1.34  		$CONFIGURE_ARGS $ARCH_ARGS &&
    1.35 -	make $MAKEFLAGS 2>&1 | fgrep -v './gdk.gresource.xml' && # ugly fix, but alas...
    1.36 -	make DESTDIR=$DESTDIR install
    1.37 +	fix libtool &&
    1.38 +	make $MAKEFLAGS &&
    1.39 +	make DESTDIR=$DESTDIR install || return 1
    1.40  
    1.41  	cp -f $stuff/settings.ini $install/etc/gtk-3.0 &&
    1.42  	find $install -name '*.desktop' | xargs sed -i '/NoDisplay/d'
    1.43  }
    1.44  
    1.45 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.46 -genpkg_rules()
    1.47 -{
    1.48 +genpkg_rules() {
    1.49  	case $PACKAGE in
    1.50  		gtk+3-demo)
    1.51  			copy gtk3-demo* *Demo* *exampleapp*
    1.52  			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
    1.53  			CAT="development|example code and demo"
    1.54 +			DEPENDS="cairo gdk-pixbuf glib gtk+3 libepoxy libharfbuzz pango"
    1.55  			;;
    1.56  		gtk+3-widget-factory)
    1.57  			copy gtk3-widget*
    1.58  			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
    1.59  			CAT="development|widget factory"
    1.60 +			DEPENDS="atk cairo gdk-pixbuf glib gtk+3"
    1.61  			;;
    1.62  		gtk+3-icon-browser)
    1.63  			copy gtk3-icon-browser gtk3-icon-browser.desktop
    1.64  			CAT="development|icon browser"
    1.65 +			DEPENDS="glib gtk+3"
    1.66  			;;
    1.67  		gtk+3)
    1.68  			COOKOPTS="!menus"
    1.69 -			copy etc/ bin/ themes/ *.so* *.xml
    1.70 -			remove_already_packed
    1.71 -			DEPENDS="at-spi2-atk at-spi2-core atk bzlib cairo colord dbus \
    1.72 -			eudev fontconfig freetype gdk-pixbuf glib lcms2 libcups libepoxy \
    1.73 -			libffi libgnutls libharfbuzz liblzma libpng16 libxml2 pango pcre \
    1.74 -			util-linux-blkid util-linux-mount util-linux-uuid xorg-libICE \
    1.75 -			xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
    1.76 -			xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
    1.77 -			xorg-libXi xorg-libXinerama xorg-libXrandr xorg-libXrender \
    1.78 -			xorg-libxcb xorg-pixman zlib"
    1.79 +			copy etc/ bin/ themes/ *.so* *.xml @rm
    1.80 +			DEPENDS="at-spi2-atk atk cairo colord fontconfig gdk-pixbuf glib \
    1.81 +			libcups libepoxy pango xorg-libX11 xorg-libXcomposite \
    1.82 +			xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi \
    1.83 +			xorg-libXinerama xorg-libXrandr"
    1.84  			CONFIG_FILES="/etc/gtk-3.0/settings.ini"
    1.85  			SUGGESTED="cups"
    1.86  			;;
    1.87  		gtk+3-dev)
    1.88  			copy @dev *.its *.loc *.rng
    1.89  			DEPENDS="gtk+3 gtk+3-demo gtk+3-icon-browser gtk+3-widget-factory \
    1.90 -			at-spi2-atk-dev at-spi2-core-dev atk-dev bzip2-dev cairo-dev \
    1.91 -			colord-dev cups-dev dbus-dev eudev-dev fontconfig-dev freetype-dev \
    1.92 -			gdk-pixbuf-dev glib-dev gnutls-dev harfbuzz-dev lcms2-dev \
    1.93 -			libepoxy-dev libffi-dev libpng16-dev libxml2-dev pango-dev \
    1.94 -			pcre-dev util-linux-blkid-dev util-linux-mount-dev \
    1.95 -			util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
    1.96 -			xorg-libXau-dev xorg-libXcomposite-dev xorg-libXdamage-dev \
    1.97 -			xorg-libXdmcp-dev xorg-libXext-dev xorg-libXfixes-dev \
    1.98 -			xorg-libXi-dev xorg-libXinerama-dev xorg-libXrandr-dev \
    1.99 -			xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev"
   1.100 +			at-spi2-atk-dev atk-dev cairo-dev fontconfig-dev gdk-pixbuf-dev \
   1.101 +			glib-dev libepoxy-dev pango-dev xorg-libX11-dev \
   1.102 +			xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
   1.103 +			xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev \
   1.104 +			xorg-libXrandr-dev"
   1.105  			;;
   1.106  	esac
   1.107  }