wok-next rev 19842

Fix gtk+3; up libgudev, libxkbcommon.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Aug 18 03:02:41 2017 +0300 (2017-08-18)
parents d0308bf5ec4a
children 8c198c0388a5
files gtk+3/receipt libgudev/receipt libxkbcommon/receipt
line diff
     1.1 --- a/gtk+3/receipt	Thu Aug 17 16:45:06 2017 +0300
     1.2 +++ b/gtk+3/receipt	Fri Aug 18 03:02:41 2017 +0300
     1.3 @@ -36,12 +36,10 @@
     1.4  			;;
     1.5  	esac
     1.6  
     1.7 -	touch gdk/gdk.gresource.xml
     1.8 -
     1.9  	./configure \
    1.10  		--sysconfdir=/etc \
    1.11  		--localstatedir=/var \
    1.12 -		--enable-debug=no \
    1.13 +		--disable-debug \
    1.14  		--enable-xkb \
    1.15  		--enable-xinerama \
    1.16  		--enable-xrandr \
    1.17 @@ -55,7 +53,7 @@
    1.18  		--disable-broadway-backend \
    1.19  		--with-x \
    1.20  		$CONFIGURE_ARGS $ARCH_ARGS &&
    1.21 -	make $MAKEFLAGS &&
    1.22 +	make $MAKEFLAGS 2>&1 | fgrep -v './gdk.gresource.xml' && # ugly fix, but alas...
    1.23  	make DESTDIR=$DESTDIR install
    1.24  
    1.25  	cp -f $stuff/settings.ini $install/etc/gtk-3.0 &&
    1.26 @@ -97,7 +95,6 @@
    1.27  			;;
    1.28  		gtk+3-dev)
    1.29  			copy @dev *.its *.loc *.rng
    1.30 -#			copy *.h *.la *.pc *.typelib *.gir *.m4 *.its *.loc *.rng
    1.31  			DEPENDS="gtk+3 gtk+3-demo gtk+3-icon-browser gtk+3-widget-factory \
    1.32  			at-spi2-atk-dev at-spi2-core-dev atk-dev bzip2-dev cairo-dev \
    1.33  			colord-dev cups-dev dbus-dev eudev-dev fontconfig-dev freetype-dev \
     2.1 --- a/libgudev/receipt	Thu Aug 17 16:45:06 2017 +0300
     2.2 +++ b/libgudev/receipt	Fri Aug 18 03:02:41 2017 +0300
     2.3 @@ -1,7 +1,7 @@
     2.4 -# SliTaz package receipt.
     2.5 +# SliTaz package receipt v2.
     2.6  
     2.7  PACKAGE="libgudev"
     2.8 -VERSION="230"
     2.9 +VERSION="231"
    2.10  CATEGORY="libdevel"
    2.11  SHORT_DESC="GObject bindings for libudev"
    2.12  MAINTAINER="gokhlayeh@slitaz.org"
    2.13 @@ -12,17 +12,24 @@
    2.14  TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.15  WGET_URL="$GNOME_MIRROR/$PACKAGE/$VERSION/$TARBALL"
    2.16  
    2.17 -DEPENDS="eudev glib libffi pcre zlib"
    2.18  BUILD_DEPENDS="gtk-doc gobject-introspection-dev eudev-dev glib-dev"
    2.19 +SPLIT="libgudev-dev"
    2.20  
    2.21  # Rules to configure and make the package.
    2.22  compile_rules()
    2.23  {
    2.24 -	./configure $CONFIGURE_ARGS && make && make install
    2.25 +	./configure \
    2.26 +		--disable-umockdev \
    2.27 +		$CONFIGURE_ARGS &&
    2.28 +	make && make install
    2.29  }
    2.30  
    2.31  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.32  genpkg_rules()
    2.33  {
    2.34 -	copy *.so*
    2.35 +	case $PACKAGE in
    2.36 +		libgudev) copy @std; DEPENDS="eudev glib libffi pcre zlib";;
    2.37 +		*-dev)    copy @dev; DEPENDS="libgudev eudev-dev glib-dev glibc-dev \
    2.38 +			libffi-dev pcre-dev zlib-dev";;
    2.39 +	esac
    2.40  }
     3.1 --- a/libxkbcommon/receipt	Thu Aug 17 16:45:06 2017 +0300
     3.2 +++ b/libxkbcommon/receipt	Fri Aug 18 03:02:41 2017 +0300
     3.3 @@ -1,23 +1,28 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="libxkbcommon"
     3.8 -VERSION="0.4.1"
     3.9 +VERSION="0.7.1"
    3.10  CATEGORY="x-window"
    3.11 -SHORT_DESC="Keyboard handling library using XKB data."
    3.12 +SHORT_DESC="Keyboard handling library using XKB data"
    3.13  MAINTAINER="pankso@slitaz.org"
    3.14  LICENSE="custom"
    3.15 +WEB_SITE="http://xkbcommon.org"
    3.16 +
    3.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
    3.18 -WEB_SITE="http://xkbcommon.org"
    3.19  WGET_URL="http://xkbcommon.org/download/$TARBALL"
    3.20  
    3.21 -DEPENDS="xorg-xkeyboard-config libxcb"
    3.22 -BUILD_DEPENDS="libxcb-dev xorg-util-macros xorg-xkeyboard-config-dev bison"
    3.23 +BUILD_DEPENDS="xorg-libxcb-dev xorg-util-macros xorg-xkeyboard-config-dev bison"
    3.24 +SPLIT="libxkbcommon-dev"
    3.25  
    3.26  # Rules to configure and make the package.
    3.27  compile_rules()
    3.28  {
    3.29 +	# http://www.linuxfromscratch.org/blfs/view/stable/general/libxkbcommon.html
    3.30  	./configure \
    3.31 +		--sysconfdir=/etc \
    3.32 +		--localstatedir=/var \
    3.33  		--with-xkb-config-root=/usr/share/X11/xkb \
    3.34 +		--docdir=/usr/share/doc/libxkbcommon-$VERSION \
    3.35  		$CONFIGURE_ARGS &&
    3.36  	make && make install
    3.37  }
    3.38 @@ -25,6 +30,16 @@
    3.39  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.40  genpkg_rules()
    3.41  {
    3.42 -	mkdir -p $fs/usr/lib
    3.43 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    3.44 +	case $PACKAGE in
    3.45 +		libxkbcommon)
    3.46 +			copy @std
    3.47 +			DEPENDS="xorg-libXau xorg-libXdmcp xorg-libxcb   \
    3.48 +			xorg-xkeyboard-config"
    3.49 +			;;
    3.50 +		*-dev)
    3.51 +			copy @dev
    3.52 +			DEPENDS="libxkbcommon \
    3.53 +			xorg-libXau-dev xorg-libXdmcp-dev xorg-libxcb-dev"
    3.54 +			;;
    3.55 +	esac
    3.56  }