wok-next rev 19814

Up gpicview, libunique, lxappearance-obconf, lxde-icon-theme, lxinput, lxrandr, lxsession, lxtask, openbox, pcre, pcre2, tazpkg, tcc, vte. Add lsb-release, lxde-common. Remove libunique-gtk3 (break build, no one depends on it, and deprecated by gnome itself), lguest (part of "linux" receipt), libmysqlclient (part of "mysql" receipt).
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jul 21 14:44:00 2017 +0300 (2017-07-21)
parents 511f2f28cee1
children 3f2372059c9e
files gpicview/description.txt gpicview/receipt lguest/receipt libmysqlclient/receipt libunique-dev/receipt libunique-doc/receipt libunique-gtk3-dev/receipt libunique-gtk3/receipt libunique/receipt lsb-release/description.txt lsb-release/receipt lsb-release/stuff/lsb-release lxappearance-obconf/receipt lxde-common/receipt lxde-icon-theme/receipt lxinput/receipt lxrandr/receipt lxsession/receipt lxsession/stuff/desktop.conf lxtask/receipt lxtask/stuff/lxtask.png openbox/receipt pcre-apps/receipt pcre-dev/receipt pcre/receipt pcre2-dev/receipt pcre2/receipt tazpkg/receipt tcc-arm/receipt tcc-c67/receipt tcc-common/receipt tcc-win32/receipt tcc-x86_64/receipt tcc/receipt vte-dev/receipt vte-terminal/receipt vte/receipt vte/stuff/AltKey.patch
line diff
     1.1 --- a/gpicview/description.txt	Thu Jul 20 13:40:52 2017 +0300
     1.2 +++ b/gpicview/description.txt	Fri Jul 21 14:44:00 2017 +0300
     1.3 @@ -1,4 +1,5 @@
     1.4  GPicView is a lightweight GTK+ 2.x based image viewer with following features:
     1.5 +
     1.6    * Extremely lightweight and fast with low memory usage
     1.7    * Very suitable for default image viewer of desktop system
     1.8    * Simple and intuitive interface
     2.1 --- a/gpicview/receipt	Thu Jul 20 13:40:52 2017 +0300
     2.2 +++ b/gpicview/receipt	Fri Jul 21 14:44:00 2017 +0300
     2.3 @@ -1,23 +1,25 @@
     2.4 -# SliTaz package receipt.
     2.5 +# SliTaz package receipt v2.
     2.6  
     2.7  PACKAGE="gpicview"
     2.8 -VERSION="0.2.4"
     2.9 +VERSION="0.2.5"
    2.10  CATEGORY="graphics"
    2.11  SHORT_DESC="Lightweight image viewer"
    2.12  MAINTAINER="pankso@slitaz.org"
    2.13  LICENSE="GPL2"
    2.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.15  WEB_SITE="http://lxde.sourceforge.net/gpicview/"
    2.16 -WGET_URL="$SF_MIRROR/lxde/$TARBALL"
    2.17 -TAGS="LXDE"
    2.18  HOST_ARCH="i486 arm"
    2.19  
    2.20 -DEPENDS="gtk+ expat glib libpng jpeg zlib"
    2.21 -BUILD_DEPENDS="gtk+-dev expat-dev glib-dev libpng-dev jpeg-dev"
    2.22 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.23 +WGET_URL="$SF_MIRROR/lxde/$TARBALL"
    2.24 +
    2.25 +BUILD_DEPENDS="intltool gtk+-dev"
    2.26  
    2.27  # Rules to configure and make the package.
    2.28  compile_rules()
    2.29  {
    2.30 +	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/gpicview.html
    2.31 +	sed -i 's|Utility;||' gpicview.desktop.in
    2.32 +
    2.33  	./configure \
    2.34  		$CONFIGURE_ARGS &&
    2.35  	make && make install
    2.36 @@ -26,7 +28,9 @@
    2.37  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.38  genpkg_rules()
    2.39  {
    2.40 -	mkdir -p $fs/usr/share
    2.41 -	cp -a $install/usr/bin $fs/usr
    2.42 -	cp -a $install/usr/share/$PACKAGE $fs/usr/share
    2.43 +	# skip pixmaps and icons (found in the icon theme)
    2.44 +	copy bin/ *.desktop *.ui
    2.45 +	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libjpeg-turbo \
    2.46 +	pango xorg-libX11"
    2.47 +	TAGS="LXDE"
    2.48  }
     3.1 --- a/lguest/receipt	Thu Jul 20 13:40:52 2017 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,18 +0,0 @@
     3.4 -# SliTaz package receipt.
     3.5 -
     3.6 -PACKAGE="lguest"
     3.7 -VERSION="4.9.4"
     3.8 -CATEGORY="base-system"
     3.9 -SHORT_DESC="The Linux Kernel paravirtualization tool"
    3.10 -MAINTAINER="devel@slitaz.org"
    3.11 -LICENSE="GPL2"
    3.12 -WEB_SITE="https://www.kernel.org/"
    3.13 -
    3.14 -WANTED="linux"
    3.15 -
    3.16 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.17 -genpkg_rules()
    3.18 -{
    3.19 -	mkdir -p $fs/usr/sbin
    3.20 -	cp -a $src/tools/lguest/lguest $fs/usr/sbin
    3.21 -}
     4.1 --- a/libmysqlclient/receipt	Thu Jul 20 13:40:52 2017 +0300
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,19 +0,0 @@
     4.4 -# SliTaz package receipt.
     4.5 -
     4.6 -PACKAGE="libmysqlclient"
     4.7 -VERSION="5.5.27"
     4.8 -CATEGORY="misc"
     4.9 -SHORT_DESC="SQL database system client libraries."
    4.10 -MAINTAINER="pascal.bellard@slitaz.org"
    4.11 -LICENSE="GPL2"
    4.12 -WEB_SITE="https://www.mysql.com/"
    4.13 -
    4.14 -WANTED="mysql"
    4.15 -DEPENDS="libcrypto libssl zlib"
    4.16 -
    4.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
    4.18 -genpkg_rules()
    4.19 -{
    4.20 -	mkdir -p $fs/usr/lib
    4.21 -	cp -a $install/usr/lib/libmysqlclient*so* $fs/usr/lib
    4.22 -}
     5.1 --- a/libunique-dev/receipt	Thu Jul 20 13:40:52 2017 +0300
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,23 +0,0 @@
     5.4 -# SliTaz package receipt.
     5.5 -
     5.6 -PACKAGE="libunique-dev"
     5.7 -VERSION="1.1.6"
     5.8 -CATEGORY="development"
     5.9 -SHORT_DESC="Library for writing single instance application (development files)"
    5.10 -MAINTAINER="erjo@slitaz.org"
    5.11 -LICENSE="LGPL2.1"
    5.12 -WEB_SITE="https://wiki.gnome.org/Attic/LibUnique"
    5.13 -HOST_ARCH="i486 arm"
    5.14 -
    5.15 -WANTED="libunique"
    5.16 -DEPENDS="libunique atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \
    5.17 -gdk-pixbuf-dev glib-dev glibc-dev gtk+-dev harfbuzz-dev libffi-dev \
    5.18 -liblzma-dev libpng-dev libxcb-dev libxml2-dev pango-dev pcre-dev pixman-dev \
    5.19 -xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
    5.20 -xorg-libXrender-dev zlib-dev"
    5.21 -
    5.22 -# Rules to gen a SliTaz package suitable for Tazpkg.
    5.23 -genpkg_rules()
    5.24 -{
    5.25 -	copy *.h *.la *.pc *.typelib *.gir
    5.26 -}
     6.1 --- a/libunique-doc/receipt	Thu Jul 20 13:40:52 2017 +0300
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,20 +0,0 @@
     6.4 -# SliTaz package receipt.
     6.5 -
     6.6 -PACKAGE="libunique-doc"
     6.7 -VERSION="1.1.6"
     6.8 -CATEGORY="development"
     6.9 -SHORT_DESC="Libunique documentation."
    6.10 -MAINTAINER="erjo@slitaz.org"
    6.11 -LICENSE="LGPL2.1"
    6.12 -WEB_SITE="http://live.gnome.org/LibUnique"
    6.13 -WANTED="libunique"
    6.14 -
    6.15 -DEPENDS="libunique"
    6.16 -
    6.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
    6.18 -genpkg_rules()
    6.19 -{
    6.20 -	mkdir -p $fs/usr/share
    6.21 -	cp -a $install/usr/share/gtk-doc $fs/usr/share
    6.22 -}
    6.23 -
     7.1 --- a/libunique-gtk3-dev/receipt	Thu Jul 20 13:40:52 2017 +0300
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,25 +0,0 @@
     7.4 -# SliTaz package receipt.
     7.5 -
     7.6 -PACKAGE="libunique-gtk3-dev"
     7.7 -VERSION="3.0.2"
     7.8 -CATEGORY="development"
     7.9 -SHORT_DESC="Development files for LibUnique"
    7.10 -MAINTAINER="erjo@slitaz.org"
    7.11 -LICENSE="LGPL2.1"
    7.12 -WEB_SITE="http://live.gnome.org/LibUnique"
    7.13 -
    7.14 -WANTED="libunique-gtk3"
    7.15 -DEPENDS="libunique-gtk3 gtk+3-dev dbus-glib-dev pkg-config"
    7.16 -
    7.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
    7.18 -genpkg_rules()
    7.19 -{
    7.20 -	mkdir -p \
    7.21 -		$fs/usr/lib \
    7.22 -		$fs/usr/share
    7.23 -	cp -a $install/usr/include $fs/usr
    7.24 -	cp -a $install/usr/lib/girepository* $fs/usr/lib
    7.25 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    7.26 -	cp -a $install/usr/lib/*.la $fs/usr/lib
    7.27 -	cp -a $install/usr/share/gir* $fs/usr/share
    7.28 -}
     8.1 --- a/libunique-gtk3/receipt	Thu Jul 20 13:40:52 2017 +0300
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,37 +0,0 @@
     8.4 -# SliTaz package receipt.
     8.5 -
     8.6 -PACKAGE="libunique-gtk3"
     8.7 -VERSION="3.0.2"
     8.8 -CATEGORY="development"
     8.9 -SHORT_DESC="Create single instance applications"
    8.10 -MAINTAINER="erjo@slitaz.org"
    8.11 -LICENSE="LGPL2.1"
    8.12 -WEB_SITE="http://live.gnome.org/LibUnique"
    8.13 -SOURCE="libunique"
    8.14 -TARBALL="$SOURCE-$VERSION.tar.xz"
    8.15 -WGET_URL="$GNOME_MIRROR/$SOURCE/${VERSION%.*}/$TARBALL"
    8.16 -TAGS="gtk3"
    8.17 -
    8.18 -DEPENDS="dbus-glib gtk+3"
    8.19 -BUILD_DEPENDS="glib-dev gtk+3-dev dbus-glib-dev gobject-introspection-dev \
    8.20 -libxml2-dev"
    8.21 -
    8.22 -# Rules to configure and make the package.
    8.23 -compile_rules()
    8.24 -{
    8.25 -	./configure \
    8.26 -		--disable-static \
    8.27 -		--enable-debug=no \
    8.28 -		--disable-gtk-doc \
    8.29 -		$CONFIGURE_ARGS &&
    8.30 -	make &&
    8.31 -	make install
    8.32 -}
    8.33 -
    8.34 -# Rules to gen a SliTaz package suitable for Tazpkg.
    8.35 -genpkg_rules()
    8.36 -{
    8.37 -	mkdir -p $fs/usr/lib
    8.38 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    8.39 -}
    8.40 -
     9.1 --- a/libunique/receipt	Thu Jul 20 13:40:52 2017 +0300
     9.2 +++ b/libunique/receipt	Fri Jul 21 14:44:00 2017 +0300
     9.3 @@ -1,4 +1,4 @@
     9.4 -# SliTaz package receipt.
     9.5 +# SliTaz package receipt v2.
     9.6  
     9.7  PACKAGE="libunique"
     9.8  VERSION="1.1.6"
     9.9 @@ -12,26 +12,20 @@
    9.10  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    9.11  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    9.12  
    9.13 -DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ harfbuzz \
    9.14 -libffi liblzma libpng libxcb libxml2 pango pcre pixman xorg-libX11 \
    9.15 -xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender zlib"
    9.16 -BUILD_DEPENDS="automake glib-dev gettext libtool gtk+-dev xorg-libICE-dev \
    9.17 -gobject-introspection-dev gtk-doc"
    9.18  BUILD_DEPENDS_arm="cairo-dev gtk+-dev glib-dev expat-dev"
    9.19 -
    9.20 -case "$ARCH" in
    9.21 -	arm*) BUILD_DEPENDS="$BUILD_DEPENDS_arm";;
    9.22 -esac
    9.23 +BUILD_DEPENDS="patch automake glib-dev gettext libtool gtk+-dev \
    9.24 +xorg-libICE-dev gobject-introspection-dev gtk-doc"
    9.25 +SPLIT="libunique-dev"
    9.26  
    9.27  # Rules to configure and make the package.
    9.28  compile_rules()
    9.29  {
    9.30 -	while read i; do patch -p1 -i $stuff/patches/$i; done < $stuff/patches/series
    9.31 -
    9.32 +	# http://www.linuxfromscratch.org/blfs/view/stable/general/libunique.html
    9.33  	autoreconf -fi &&
    9.34  	./configure \
    9.35  		--disable-dbus \
    9.36  		--disable-static \
    9.37 +		--disable-debug \
    9.38  		$CONFIGURE_ARGS &&
    9.39  	make && make install
    9.40  }
    9.41 @@ -39,5 +33,23 @@
    9.42  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.43  genpkg_rules()
    9.44  {
    9.45 -	copy *.so*
    9.46 +	case $PACKAGE in
    9.47 +		libunique)
    9.48 +			copy @std
    9.49 +			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ \
    9.50 +			libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \
    9.51 +			util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \
    9.52 +			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb \
    9.53 +			xorg-pixman zlib"
    9.54 +			;;
    9.55 +		*-dev)
    9.56 +			copy @dev
    9.57 +			DEPENDS="libunique atk-dev bzip2-dev cairo-dev fontconfig-dev \
    9.58 +			freetype-dev gdk-pixbuf-dev glib-dev gtk+-dev harfbuzz-dev \
    9.59 +			libffi-dev libpng16-dev libxml2-dev pango-dev pcre-dev \
    9.60 +			util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \
    9.61 +			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
    9.62 +			xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev"
    9.63 +			;;
    9.64 +	esac
    9.65  }
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/lsb-release/description.txt	Fri Jul 21 14:44:00 2017 +0300
    10.3 @@ -0,0 +1,2 @@
    10.4 +The lsb_release script gives information about the Linux Standards Base (LSB)
    10.5 +status of the distribution.
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/lsb-release/receipt	Fri Jul 21 14:44:00 2017 +0300
    11.3 @@ -0,0 +1,40 @@
    11.4 +# SliTaz package receipt v2.
    11.5 +
    11.6 +PACKAGE="lsb-release"
    11.7 +VERSION="1.4"
    11.8 +CATEGORY="base-system"
    11.9 +SHORT_DESC="Linux Standards Base (LSB) status of the distribution"
   11.10 +MAINTAINER="al.bobylev@gmail.com"
   11.11 +LICENSE="OSI"
   11.12 +WEB_SITE="https://sourceforge.net/projects/lsb/"
   11.13 +
   11.14 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.15 +WGET_URL="$SF_MIRROR/lsb/$TARBALL"
   11.16 +
   11.17 +BUILD_DEPENDS="help2man"
   11.18 +
   11.19 +# Rules to configure and make the package.
   11.20 +compile_rules()
   11.21 +{
   11.22 +	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/lsb-release.html
   11.23 +	sed -i "s|n/a|unavailable|" lsb_release
   11.24 +	./help2man -N \
   11.25 +		--include ./lsb_release.examples \
   11.26 +		--alt_version_key=program_version \
   11.27 +		./lsb_release > lsb_release.1
   11.28 +
   11.29 +	mkdir -p $install/usr/share/man/man1/
   11.30 +	install -v -m644 lsb_release.1 $install/usr/share/man/man1/
   11.31 +
   11.32 +	mkdir -p $install/usr/bin/
   11.33 +	install -v -m755 lsb_release   $install/usr/bin/
   11.34 +
   11.35 +	mkdir -p $install/etc/
   11.36 +	cp $stuff/lsb-release $install/etc/
   11.37 +}
   11.38 +
   11.39 +# Rules to gen a SliTaz package suitable for Tazpkg.
   11.40 +genpkg_rules()
   11.41 +{
   11.42 +	copy @std
   11.43 +}
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/lsb-release/stuff/lsb-release	Fri Jul 21 14:44:00 2017 +0300
    12.3 @@ -0,0 +1,4 @@
    12.4 +DISTRIB_ID="SliTaz"
    12.5 +DISTRIB_RELEASE="6.0"
    12.6 +DISTRIB_CODENAME="Freefall"
    12.7 +DISTRIB_DESCRIPTION="SliTaz GNU/Linux"
    13.1 --- a/lxappearance-obconf/receipt	Thu Jul 20 13:40:52 2017 +0300
    13.2 +++ b/lxappearance-obconf/receipt	Fri Jul 21 14:44:00 2017 +0300
    13.3 @@ -1,27 +1,26 @@
    13.4 -# SliTaz package receipt.
    13.5 +# SliTaz package receipt v2.
    13.6  
    13.7  PACKAGE="lxappearance-obconf"
    13.8 -VERSION="0.2.2"
    13.9 +VERSION="0.2.3"
   13.10  CATEGORY="x-window"
   13.11  SHORT_DESC="LXDE GTK+ theme switcher (plugin)"
   13.12  MAINTAINER="pankso@slitaz.org"
   13.13  LICENSE="GPL2"
   13.14 +WEB_SITE="http://lxde.org/"
   13.15 +HOST_ARCH="i486 arm"
   13.16 +
   13.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
   13.18  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   13.19 -WEB_SITE="http://lxde.org/"
   13.20 -TAGS="LXDE"
   13.21 -HOST_ARCH="i486 arm"
   13.22  
   13.23 -DEPENDS="openbox lxappearance"
   13.24 -BUILD_DEPENDS="openbox-dev libxcb-dev glib-dev libxml2-dev \
   13.25 -fontconfig-dev gtk+-dev expat-dev util-linux-uuid-dev lxappearance-dev \
   13.26 -xorg-libXft-dev xorg-libSM-dev xorg-libXinerama-dev xorg-libXrandr-dev"
   13.27 +BUILD_DEPENDS="intltool openbox-dev gtk+-dev lxappearance-dev"
   13.28  
   13.29  # Rules to configure and make the package.
   13.30  compile_rules()
   13.31  {
   13.32 +	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxappearance-obconf.html
   13.33  	./configure \
   13.34  		--sysconfdir=/etc \
   13.35 +		--disable-static \
   13.36  		$CONFIGURE_ARGS &&
   13.37  	make && make install
   13.38  }
   13.39 @@ -29,8 +28,7 @@
   13.40  # Rules to gen a SliTaz package suitable for Tazpkg.
   13.41  genpkg_rules()
   13.42  {
   13.43 -    mkdir -p $fs/usr/share
   13.44 -    cp -a $install/usr/lib $fs/usr
   13.45 -    cp -a $install/usr/share/lxappearance $fs/usr/share
   13.46 -    rm -f $fs/usr/lib/lxappearance/plugins/*.*a
   13.47 +	copy @std
   13.48 +	DEPENDS="openbox lxappearance"
   13.49 +	TAGS="LXDE"
   13.50  }
    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/lxde-common/receipt	Fri Jul 21 14:44:00 2017 +0300
    14.3 @@ -0,0 +1,31 @@
    14.4 +# SliTaz package receipt v2.
    14.5 +
    14.6 +PACKAGE="lxde-common"
    14.7 +VERSION="0.99.2"
    14.8 +CATEGORY="base-system"
    14.9 +SHORT_DESC="Set of default configuration for LXDE"
   14.10 +MAINTAINER="al.bobylev@gmail.com"
   14.11 +LICENSE="LGPL3"
   14.12 +WEB_SITE="http://www.lxde.org/"
   14.13 +
   14.14 +TARBALL="$PACKAGE-$VERSION.tar.xz"
   14.15 +WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   14.16 +
   14.17 +BUILD_DEPENDS="intltool"
   14.18 +
   14.19 +# Rules to configure and make the package.
   14.20 +compile_rules()
   14.21 +{
   14.22 +	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxde-common.html
   14.23 +	./configure \
   14.24 +		--sysconfdir=/etc \
   14.25 +		$CONFIGURE_ARGS &&
   14.26 +	make && make install
   14.27 +}
   14.28 +
   14.29 +# Rules to gen a SliTaz package suitable for Tazpkg.
   14.30 +genpkg_rules()
   14.31 +{
   14.32 +	TAGS="LXDE"
   14.33 +	copy @std
   14.34 +}
    15.1 --- a/lxde-icon-theme/receipt	Thu Jul 20 13:40:52 2017 +0300
    15.2 +++ b/lxde-icon-theme/receipt	Fri Jul 21 14:44:00 2017 +0300
    15.3 @@ -1,4 +1,4 @@
    15.4 -# SliTaz package receipt.
    15.5 +# SliTaz package receipt v2.
    15.6  
    15.7  PACKAGE="lxde-icon-theme"
    15.8  VERSION="0.5.1"
    15.9 @@ -7,21 +7,33 @@
   15.10  MAINTAINER="al.bobylev@gmail.com"
   15.11  LICENSE="LGPL3"
   15.12  WEB_SITE="http://www.lxde.org/"
   15.13 +
   15.14  TARBALL="$PACKAGE-$VERSION.tar.xz"
   15.15  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   15.16 -TAGS="LXDE"
   15.17  
   15.18 -DEPENDS=""
   15.19 -BUILD_DEPENDS="coreutils"
   15.20 +BUILD_DEPENDS="coreutils-operations"
   15.21 +SPLIT="lxde-icon-theme-base lxde-icon-theme"
   15.22  
   15.23  # Rules to configure and make the package.
   15.24  compile_rules()
   15.25  {
   15.26 +	# http://www.linuxfromscratch.org/blfs/view/stable/x/lxde-icon-theme.html
   15.27  	./configure $CONFIGURE_ARGS && make && make install
   15.28  }
   15.29  
   15.30  # Rules to gen a SliTaz package suitable for Tazpkg.
   15.31  genpkg_rules()
   15.32  {
   15.33 -	cp -a $install/* $fs
   15.34 +	TAGS="LXDE"
   15.35 +	case $PACKAGE in
   15.36 +		*-base)
   15.37 +			copy 16x16/ 48x48/ icon.theme
   15.38 +			CAT="customization|16 and 48 sizes only"
   15.39 +			;;
   15.40 +		*-theme)
   15.41 +			copy @std
   15.42 +			remove_already_packed
   15.43 +			DEPENDS="lxde-icon-theme-base"
   15.44 +			;;
   15.45 +	esac
   15.46  }
    16.1 --- a/lxinput/receipt	Thu Jul 20 13:40:52 2017 +0300
    16.2 +++ b/lxinput/receipt	Fri Jul 21 14:44:00 2017 +0300
    16.3 @@ -1,24 +1,27 @@
    16.4  # SliTaz package receipt.
    16.5  
    16.6  PACKAGE="lxinput"
    16.7 -VERSION="0.3.4"
    16.8 +VERSION="0.3.5"
    16.9  CATEGORY="x-window"
   16.10  SHORT_DESC="LXDE keyboard and mouse configuration"
   16.11  MAINTAINER="pankso@slitaz.org"
   16.12  LICENSE="GPL3"
   16.13  WEB_SITE="http://lxde.org"
   16.14 +HOST_ARCH="i486 arm"
   16.15 +
   16.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
   16.17  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   16.18 -TAGS="LXDE keyboard mouse"
   16.19 -HOST_ARCH="i486 arm"
   16.20 -GENERIC_MENUS="no"
   16.21  
   16.22 -DEPENDS="gtk+ xorg-xset"
   16.23 -BUILD_DEPENDS="gtk+-dev"
   16.24 +BUILD_DEPENDS="intltool gtk+-dev"
   16.25  
   16.26  # Rules to configure and make the package.
   16.27  compile_rules()
   16.28  {
   16.29 +	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxinput.html
   16.30 +
   16.31 +	sed -i 's|^Icon=.*$|Icon=preferences-desktop-keyboard|' \
   16.32 +		data/lxinput.desktop.in
   16.33 +
   16.34  	./configure \
   16.35  		$CONFIGURE_ARGS &&
   16.36  	make && make install
   16.37 @@ -27,9 +30,9 @@
   16.38  # Rules to gen a SliTaz package suitable for Tazpkg.
   16.39  genpkg_rules()
   16.40  {
   16.41 -	cp -a $install/* $fs
   16.42 -	rm -r $fs/usr/share/locale $fs/usr/share/man
   16.43 -	rm -r $fs/usr/share/lxinput/*.png
   16.44 -	sed -i 's|^Icon=.*$|Icon=preferences-desktop-keyboard|' \
   16.45 -		$fs/usr/share/applications/lxinput.desktop
   16.46 +	# skip icons (found in the icon theme)
   16.47 +	copy bin/ *.ui
   16.48 +	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango \
   16.49 +	xorg-libX11   xorg-xset"
   16.50 +	TAGS="LXDE keyboard mouse"
   16.51  }
    17.1 --- a/lxrandr/receipt	Thu Jul 20 13:40:52 2017 +0300
    17.2 +++ b/lxrandr/receipt	Fri Jul 21 14:44:00 2017 +0300
    17.3 @@ -1,4 +1,4 @@
    17.4 -# SliTaz package receipt.
    17.5 +# SliTaz package receipt v2.
    17.6  
    17.7  PACKAGE="lxrandr"
    17.8  VERSION="0.3.1"
    17.9 @@ -6,21 +6,23 @@
   17.10  SHORT_DESC="LXDE monitor configuration tool"
   17.11  MAINTAINER="gokhlayeh@slitaz.org"
   17.12  LICENSE="GPL2"
   17.13 -TARBALL="$PACKAGE-$VERSION.tar.xz"
   17.14  WEB_SITE="http://lxde.org"
   17.15 -WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   17.16 -TAGS="LXDE"
   17.17  HOST_ARCH="i486 arm"
   17.18  
   17.19 -DEPENDS="gtk+ xorg-xrandr"
   17.20 -BUILD_DEPENDS="gtk+-dev xorg-libXrandr-dev"
   17.21 +TARBALL="$PACKAGE-$VERSION.tar.xz"
   17.22 +WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   17.23 +
   17.24 +BUILD_DEPENDS="intltool gtk+-dev"
   17.25  
   17.26  # Rules to configure and make the package.
   17.27  compile_rules()
   17.28  {
   17.29 -	# Fix sources.
   17.30 -	echo "Icon=video-display" >> data/lxrandr.desktop.in 
   17.31 -	touch po/stamp-it 
   17.32 +	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxrandr.html
   17.33 +
   17.34 +	# change icon and remove keywords from desktop file
   17.35 +	sed -i 's|^Icon=.*$|Icon=preferences-desktop-display|;
   17.36 +		/^_Keywords=/d' data/lxrandr.desktop.in
   17.37 +
   17.38  	./configure \
   17.39  		$CONFIGURE_ARGS &&
   17.40  	make && make install
   17.41 @@ -29,14 +31,7 @@
   17.42  # Rules to gen a SliTaz package suitable for Tazpkg.
   17.43  genpkg_rules()
   17.44  {
   17.45 -	mkdir -p $fs/usr
   17.46 -	cp -a $install/usr/bin $fs/usr
   17.47 -	cp -a $install/usr/share $fs/usr
   17.48 -
   17.49 -	# Remove man & locales
   17.50 -	rm -rf $fs/usr/share/man
   17.51 -	rm -rf $fs/usr/share/locale
   17.52 -
   17.53 -	sed -i 's|^Icon=.*$|Icon=preferences-desktop-display|' \
   17.54 -		$fs/usr/share/applications/lxrandr.desktop
   17.55 +	copy @std
   17.56 +	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango"
   17.57 +	TAGS="LXDE"
   17.58  }
    18.1 --- a/lxsession/receipt	Thu Jul 20 13:40:52 2017 +0300
    18.2 +++ b/lxsession/receipt	Fri Jul 21 14:44:00 2017 +0300
    18.3 @@ -1,34 +1,57 @@
    18.4 -# SliTaz package receipt.
    18.5 +# SliTaz package receipt v2.
    18.6  
    18.7  PACKAGE="lxsession"
    18.8 -VERSION="0.4.6.1"
    18.9 +VERSION="0.5.3"
   18.10  CATEGORY="x-window"
   18.11 -SHORT_DESC="LXDE X session manager."
   18.12 +SHORT_DESC="LXDE X session manager"
   18.13  MAINTAINER="pankso@slitaz.org"
   18.14  LICENSE="GPL2"
   18.15  WEB_SITE="http://wiki.lxde.org/en/LXSession"
   18.16 -TARBALL="$PACKAGE-$VERSION.tar.gz"
   18.17 -WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   18.18  HOST_ARCH="i486 arm"
   18.19  
   18.20 -DEPENDS="gtk+ dbus"
   18.21 -BUILD_DEPENDS="gtk+-dev dbus-dev"
   18.22 +TARBALL="$PACKAGE-$VERSION.tar.xz"
   18.23 +WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   18.24 +
   18.25 +BUILD_DEPENDS="intltool xorg-libX11-dev libunique-dev polkit-dev vala libxslt \
   18.26 +docbook-xsl"
   18.27  
   18.28  # Rules to configure and make the package.
   18.29  compile_rules()
   18.30  {
   18.31 +	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxsession.html
   18.32 +	# Additional keys: --enable-buildin-clipboard, --enable-buildin-polkit
   18.33  	./configure \
   18.34  		--sysconfdir=/etc \
   18.35 +		--enable-buildin-clipboard \
   18.36 +		--enable-buildin-polkit \
   18.37  		$CONFIGURE_ARGS &&
   18.38 -	make && make install
   18.39 +	make && make install &&
   18.40 +
   18.41 +	# customize desktop.conf for SliTaz
   18.42 +	mkdir -p $install/etc/xdg/lxsession/LXDE/ &&
   18.43 +	cp $src/data/desktop.conf.example $install/etc/xdg/lxsession/LXDE/desktop.conf &&
   18.44 +	sed -i '
   18.45 +		s|^\(terminal_manager/command\).*|\1=terminal|;
   18.46 +		s|^\(launcher_manager/command\).*|\1=lxpanelctl|;
   18.47 +		s|^\(window_manager\).*|\1=openbox|;
   18.48 +		s|^#*\(iXft/Hinting\)|\1=1|;
   18.49 +		s|^\(sNet/ThemeName\).*|\1=Clearlooks Human|;
   18.50 +		s|^\(sNet/IconThemeName\).*|\1=SliTaz-Faenza-Dark|;
   18.51 +		s|^\(sGtk/FontName\).*|\1=DejaVu Sans 10|;
   18.52 +		s|^#*\(iGtk/ToolbarIconSize\).*|\1=2|;
   18.53 +		s|^#*\(sGtk/CursorThemeName\).*|\1=slitaz-polar|;
   18.54 +		' $install/etc/xdg/lxsession/LXDE/desktop.conf &&
   18.55 +
   18.56 +	# change icon
   18.57 +	sed -i 's|^Icon=.*$|Icon=session-properties|' \
   18.58 +		$install/usr/share/applications/lxsession-edit.desktop
   18.59  }
   18.60  
   18.61  # Rules to gen a SliTaz package suitable for Tazpkg.
   18.62  genpkg_rules()
   18.63  {
   18.64 -	mkdir -p $fs/usr/share $fs/etc/xdg/lxsession/LXDE
   18.65 -	cp -a $install/usr/bin $fs/usr
   18.66 -	# Use SliTaz Icon them for lxsession-logout
   18.67 -	cp -a $stuff/desktop.conf $fs/etc/xdg/lxsession/LXDE
   18.68 -	chown -R 0.0 $fs
   18.69 +	copy @std
   18.70 +	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libunique \
   18.71 +	pango polkit xorg-libX11   dbus-glib lsb-release"
   18.72 +	PROVIDE="lxsession-edit"
   18.73  }
    19.1 --- a/lxsession/stuff/desktop.conf	Thu Jul 20 13:40:52 2017 +0300
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,51 +0,0 @@
    19.4 -[Session]
    19.5 -disable_autostart=no
    19.6 -polkit/command=lxpolkit
    19.7 -clipboard/command=lxclipboard
    19.8 -xsettings_manager/command=build-in
    19.9 -proxy_manager/command=build-in
   19.10 -keyring/command=ssh-agent
   19.11 -quit_manager/command=lxsession-logout
   19.12 -quit_manager/image=/usr/share/lxde/images/logout-banner.png
   19.13 -quit_manager/layout=top
   19.14 -lock_manager/command=lxlock
   19.15 -terminal_manager/command=terminal
   19.16 -launcher_manager/command=lxpanelctl
   19.17 -window_manager=openbox
   19.18 -
   19.19 -[GTK]
   19.20 -iXft/Antialias=1
   19.21 -iXft/Hinting=1
   19.22 -sXft/HintStyle=hintfull
   19.23 -sXft/RGBA=none
   19.24 -sNet/ThemeName=Clearlooks Human
   19.25 -sNet/IconThemeName=SliTaz-Faenza-Dark
   19.26 -iNet/EnableEventSounds=0
   19.27 -iNet/EnableInputFeedbackSounds=0
   19.28 -sGtk/ColorScheme=
   19.29 -sGtk/FontName=DejaVu Sans 10
   19.30 -iGtk/ToolbarStyle=3
   19.31 -iGtk/ToolbarIconSize=2
   19.32 -iGtk/ButtonImages=1
   19.33 -iGtk/MenuImages=1
   19.34 -iGtk/CursorThemeSize=18
   19.35 -sGtk/CursorThemeName=slitaz-polar
   19.36 -
   19.37 -[Mouse]
   19.38 -AccFactor=20
   19.39 -AccThreshold=10
   19.40 -LeftHanded=0
   19.41 -
   19.42 -[Keyboard]
   19.43 -Delay=500
   19.44 -Interval=30
   19.45 -Beep=1
   19.46 -
   19.47 -[State]
   19.48 -guess_default=true
   19.49 -
   19.50 -[Dbus]
   19.51 -lxde=true
   19.52 -
   19.53 -[Environment]
   19.54 -menu_prefix=lxde-
    20.1 --- a/lxtask/receipt	Thu Jul 20 13:40:52 2017 +0300
    20.2 +++ b/lxtask/receipt	Fri Jul 21 14:44:00 2017 +0300
    20.3 @@ -1,31 +1,34 @@
    20.4 -# SliTaz package receipt.
    20.5 +# SliTaz package receipt v2.
    20.6  
    20.7  PACKAGE="lxtask"
    20.8 -VERSION="0.1.6"
    20.9 +VERSION="0.1.8"
   20.10  CATEGORY="system-tools"
   20.11  SHORT_DESC="LXDE task manager"
   20.12  MAINTAINER="pankso@slitaz.org"
   20.13  LICENSE="GPL2"
   20.14 -TARBALL="$PACKAGE-$VERSION.tar.xz"
   20.15  WEB_SITE="http://lxde.sourceforge.net/"
   20.16 -WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   20.17 -TAGS="LXDE"
   20.18  HOST_ARCH="i486 arm"
   20.19  
   20.20 -DEPENDS="gtk+ xorg-libXdamage"
   20.21 -BUILD_DEPENDS="gtk+-dev xorg-libXdamage-dev xorg-xproto"
   20.22 +TARBALL="$PACKAGE-$VERSION.tar.xz"
   20.23 +WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   20.24 +
   20.25 +BUILD_DEPENDS="gtk+-dev intltool"
   20.26  
   20.27  # Rules to configure and make the package.
   20.28  compile_rules()
   20.29  {
   20.30 -	./configure \
   20.31 -		$CONFIGURE_ARGS &&
   20.32 -	make && make install
   20.33 +	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxtask.html
   20.34 +
   20.35 +	# remove keywords from desktop file
   20.36 +	sed -i '/^_Keywords=/d' data/lxtask.desktop.in
   20.37 +
   20.38 +	./configure $CONFIGURE_ARGS && make && make install
   20.39  }
   20.40  
   20.41  # Rules to gen a SliTaz package suitable for Tazpkg.
   20.42  genpkg_rules()
   20.43  {
   20.44 -	mkdir -p $fs/usr
   20.45 -	cp -a $install/usr/bin $fs/usr
   20.46 +	copy @std
   20.47 +	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango"
   20.48 +	TAGS="LXDE"
   20.49  }
    21.1 Binary file lxtask/stuff/lxtask.png has changed
    22.1 --- a/openbox/receipt	Thu Jul 20 13:40:52 2017 +0300
    22.2 +++ b/openbox/receipt	Fri Jul 21 14:44:00 2017 +0300
    22.3 @@ -18,7 +18,7 @@
    22.4  xorg-libXi-dev"
    22.5  BUILD_DEPENDS_arm="pango-dev glib-dev xorg-libXft-dev util-linux-uuid-dev \
    22.6  libxml2-dev xcb-util-dev"
    22.7 -SPLIT="openbox-themes openbox-dev" # openbox-python?
    22.8 +SPLIT="openbox-themes openbox-python openbox-dev"
    22.9  SIBLINGS="openbox-max"
   22.10  
   22.11  # Rules to configure and make the package.
   22.12 @@ -70,7 +70,7 @@
   22.13  			;;
   22.14  		openbox-dev)
   22.15  			copy @dev
   22.16 -			DEPENDS="openbox openbox-python openbox-themes bzip2-dev \
   22.17 +			DEPENDS="openbox openbox-themes bzip2-dev \
   22.18  			fontconfig-dev freetype-dev glib-dev harfbuzz-dev libffi-dev \
   22.19  			liblzma-dev libpng16-dev libxcb-dev libxml2-dev pango-dev pcre-dev \
   22.20  			util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
    23.1 --- a/pcre-apps/receipt	Thu Jul 20 13:40:52 2017 +0300
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,19 +0,0 @@
    23.4 -# SliTaz package receipt.
    23.5 -
    23.6 -PACKAGE="pcre-apps"
    23.7 -VERSION="8.39"
    23.8 -CATEGORY="development"
    23.9 -SHORT_DESC="Perl Compatible Regular Expressions (applications)"
   23.10 -MAINTAINER="al.bobylev@gmail.com"
   23.11 -LICENSE="BSD"
   23.12 -WEB_SITE="http://www.pcre.org/"
   23.13 -HOST_ARCH="i486 arm"
   23.14 -
   23.15 -WANTED="pcre"
   23.16 -DEPENDS="bzlib ncurses pcre readline zlib"
   23.17 -
   23.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   23.19 -genpkg_rules()
   23.20 -{
   23.21 -	copy pcregrep pcretest
   23.22 -}
    24.1 --- a/pcre-dev/receipt	Thu Jul 20 13:40:52 2017 +0300
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,19 +0,0 @@
    24.4 -# SliTaz package receipt.
    24.5 -
    24.6 -PACKAGE="pcre-dev"
    24.7 -VERSION="8.39"
    24.8 -CATEGORY="development"
    24.9 -SHORT_DESC="Perl Compatible Regular Expressions (development files)"
   24.10 -MAINTAINER="pankso@slitaz.org"
   24.11 -LICENSE="BSD"
   24.12 -WEB_SITE="http://www.pcre.org/"
   24.13 -HOST_ARCH="i486 arm"
   24.14 -
   24.15 -WANTED="pcre"
   24.16 -DEPENDS="pcre pcre-apps"
   24.17 -
   24.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   24.19 -genpkg_rules()
   24.20 -{
   24.21 -	copy pcre-config *.h *.la *.pc
   24.22 -}
    25.1 --- a/pcre/receipt	Thu Jul 20 13:40:52 2017 +0300
    25.2 +++ b/pcre/receipt	Fri Jul 21 14:44:00 2017 +0300
    25.3 @@ -1,9 +1,9 @@
    25.4 -# SliTaz package receipt.
    25.5 +# SliTaz package receipt v2.
    25.6  
    25.7  PACKAGE="pcre"
    25.8 -VERSION="8.39"
    25.9 +VERSION="8.40"
   25.10  CATEGORY="system-tools"
   25.11 -SHORT_DESC="Perl 5 Compatible Regular Expression, library"
   25.12 +SHORT_DESC="Perl 5 Compatible Regular Expression"
   25.13  MAINTAINER="pankso@slitaz.org"
   25.14  LICENSE="BSD"
   25.15  WEB_SITE="http://www.pcre.org/"
   25.16 @@ -12,11 +12,13 @@
   25.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   25.18  WGET_URL="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$TARBALL"
   25.19  
   25.20 -BUILD_DEPENDS="zlib-dev bzip2-dev readline-dev"
   25.21 +BUILD_DEPENDS="zlib-dev bzip2-dev readline-dev valgrind-dev"
   25.22 +SPLIT="pcre-apps pcre-dev"
   25.23  
   25.24  # Rules to configure and make the package.
   25.25  compile_rules()
   25.26  {
   25.27 +	# http://www.linuxfromscratch.org/blfs/view/stable/general/pcre.html
   25.28  	./configure \
   25.29  		--docdir=/usr/share/doc/pcre-$VERSION \
   25.30  		--enable-unicode-properties \
   25.31 @@ -27,6 +29,7 @@
   25.32  		--enable-pcretest-libreadline \
   25.33  		--disable-static \
   25.34  		--enable-jit \
   25.35 +		--enable-valgrind \
   25.36  		$CONFIGURE_ARGS &&
   25.37  	make && make install &&
   25.38  
   25.39 @@ -39,5 +42,17 @@
   25.40  # Rules to gen a SliTaz package suitable for Tazpkg.
   25.41  genpkg_rules()
   25.42  {
   25.43 -	copy *.so*
   25.44 +	case $PACKAGE in
   25.45 +		pcre)
   25.46 +			copy *.so*
   25.47 +			CAT="system-tools|library"
   25.48 +			;;
   25.49 +		*-apps)
   25.50 +			copy @std
   25.51 +			remove_already_packed
   25.52 +			DEPENDS="pcre bzlib ncurses readline zlib"
   25.53 +			CAT="development|applications"
   25.54 +			;;
   25.55 +		*-dev) copy @dev;;
   25.56 +	esac
   25.57  }
    26.1 --- a/pcre2-dev/receipt	Thu Jul 20 13:40:52 2017 +0300
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,21 +0,0 @@
    26.4 -# SliTaz package receipt.
    26.5 -
    26.6 -PACKAGE="pcre2-dev"
    26.7 -VERSION="10.21"
    26.8 -CATEGORY="development"
    26.9 -SHORT_DESC="Perl Compatible Regular Expressions 2, development files"
   26.10 -MAINTAINER="al.bobylev@gmail.com"
   26.11 -LICENSE="BSD"
   26.12 -WEB_SITE="http://www.pcre.org/"
   26.13 -HOST_ARCH="i486 arm"
   26.14 -
   26.15 -WANTED="pcre2"
   26.16 -DEPENDS="pcre2 pkg-config"
   26.17 -
   26.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   26.19 -genpkg_rules()
   26.20 -{
   26.21 -	cp -a $install/* $fs
   26.22 -	rm $fs/usr/lib/*.so*
   26.23 -	rm -r $fs/usr/share
   26.24 -}
    27.1 --- a/pcre2/receipt	Thu Jul 20 13:40:52 2017 +0300
    27.2 +++ b/pcre2/receipt	Fri Jul 21 14:44:00 2017 +0300
    27.3 @@ -1,37 +1,61 @@
    27.4 -# SliTaz package receipt.
    27.5 +# SliTaz package receipt v2.
    27.6  
    27.7  PACKAGE="pcre2"
    27.8 -VERSION="10.21"
    27.9 +VERSION="10.23"
   27.10  CATEGORY="system-tools"
   27.11 -SHORT_DESC="Perl 5 Compatible Regular Expression 2, library"
   27.12 +SHORT_DESC="Perl 5 Compatible Regular Expression 2"
   27.13  MAINTAINER="al.bobylev@gmail.com"
   27.14  LICENSE="BSD"
   27.15 +WEB_SITE="http://www.pcre.org/"
   27.16 +HOST_ARCH="i486 arm"
   27.17 +
   27.18  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   27.19 -WEB_SITE="http://www.pcre.org/"
   27.20  WGET_URL="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$TARBALL"
   27.21 -HOST_ARCH="i486 arm"
   27.22 +
   27.23 +BUILD_DEPENDS="zlib-dev bzip2-dev readline-dev valgrind-dev"
   27.24 +SPLIT="pcre2-apps pcre2-dev"
   27.25  
   27.26  # Rules to configure and make the package.
   27.27  compile_rules()
   27.28  {
   27.29 +	# http://www.linuxfromscratch.org/blfs/view/stable/general/pcre2.html
   27.30  	./configure \
   27.31 -		--prefix=/usr \
   27.32 +		--docdir=/usr/share/doc/pcre2-$VERSION \
   27.33 +		--enable-unicode \
   27.34  		--enable-pcre2-16 \
   27.35  		--enable-pcre2-32 \
   27.36 +		--enable-pcre2grep-libz \
   27.37 +		--enable-pcre2grep-libbz2 \
   27.38 +		--enable-pcre2test-libreadline \
   27.39 +		--disable-static \
   27.40  		--enable-jit \
   27.41 +		--enable-valgrind \
   27.42  		$CONFIGURE_ARGS &&
   27.43  	make && make install
   27.44  
   27.45 -	find $install/usr/share/man -type f -exec gzip -9 \{\} \;
   27.46 -	for i in $(find $install/usr/share/man -type l); do
   27.47 -		dest=$(readlink $i)
   27.48 -		rm $i; ln -s $dest.gz $i.gz
   27.49 -	done
   27.50 +#	find $install/usr/share/man -type f -exec gzip -9 \{\} \;
   27.51 +#	for i in $(find $install/usr/share/man -type l); do
   27.52 +#		dest=$(readlink $i)
   27.53 +#		rm $i; ln -s $dest.gz $i.gz
   27.54 +#	done
   27.55  }
   27.56  
   27.57  # Rules to gen a SliTaz package suitable for Tazpkg.
   27.58  genpkg_rules()
   27.59  {
   27.60 -	mkdir -p $fs/usr/lib
   27.61 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
   27.62 +	case $PACKAGE in
   27.63 +		pcre2)
   27.64 +			copy *.so*
   27.65 +			CAT="system-tools|library"
   27.66 +			;;
   27.67 +		*-apps)
   27.68 +			copy @std
   27.69 +			remove_already_packed
   27.70 +			DEPENDS="pcre2 bzlib ncurses readline zlib"
   27.71 +			CAT="development|applications"
   27.72 +			;;
   27.73 +		*-dev)
   27.74 +			copy @dev
   27.75 +			;;
   27.76 +	esac
   27.77  }
    28.1 --- a/tazpkg/receipt	Thu Jul 20 13:40:52 2017 +0300
    28.2 +++ b/tazpkg/receipt	Fri Jul 21 14:44:00 2017 +0300
    28.3 @@ -1,7 +1,7 @@
    28.4  # SliTaz package receipt.
    28.5  
    28.6  PACKAGE="tazpkg"
    28.7 -VERSION="948"
    28.8 +VERSION="949"
    28.9  CATEGORY="base-system"
   28.10  SHORT_DESC="SliTaz packages manager"
   28.11  MAINTAINER="pankso@slitaz.org"
    29.1 --- a/tcc-arm/receipt	Thu Jul 20 13:40:52 2017 +0300
    29.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.3 @@ -1,20 +0,0 @@
    29.4 -# SliTaz package receipt.
    29.5 -
    29.6 -PACKAGE="tcc-arm"
    29.7 -VERSION=20170515
    29.8 -CATEGORY="development"
    29.9 -SHORT_DESC="fast Tiny C cross Compiler to ARM target."
   29.10 -MAINTAINER="pascal.bellard@slitaz.org"
   29.11 -LICENSE="LGPL2.1"
   29.12 -WEB_SITE="http://bellard.org/tcc/"
   29.13 -DEPENDS="tcc-common"
   29.14 -WANTED="tcc"
   29.15 -TAGS="compiler C arm"
   29.16 -
   29.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
   29.18 -genpkg_rules()
   29.19 -{
   29.20 -	mkdir -p $fs/usr/bin
   29.21 -	cp -a $install/usr/bin/arm-*-tcc $fs/usr/bin
   29.22 -}
   29.23 -
    30.1 --- a/tcc-c67/receipt	Thu Jul 20 13:40:52 2017 +0300
    30.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.3 @@ -1,20 +0,0 @@
    30.4 -# SliTaz package receipt.
    30.5 -
    30.6 -PACKAGE="tcc-c67"
    30.7 -VERSION=20170515
    30.8 -CATEGORY="development"
    30.9 -SHORT_DESC="fast Tiny C cross Compiler to C67 target."
   30.10 -MAINTAINER="pascal.bellard@slitaz.org"
   30.11 -LICENSE="LGPL2.1"
   30.12 -WEB_SITE="http://bellard.org/tcc/"
   30.13 -DEPENDS="tcc-common"
   30.14 -WANTED="tcc"
   30.15 -TAGS="compiler C c67"
   30.16 -
   30.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
   30.18 -genpkg_rules()
   30.19 -{
   30.20 -	mkdir -p $fs/usr/bin
   30.21 -	cp -a $install/usr/bin/c67-tcc $fs/usr/bin
   30.22 -}
   30.23 -
    31.1 --- a/tcc-common/receipt	Thu Jul 20 13:40:52 2017 +0300
    31.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.3 @@ -1,21 +0,0 @@
    31.4 -# SliTaz package receipt.
    31.5 -
    31.6 -PACKAGE="tcc-common"
    31.7 -VERSION=20170515
    31.8 -CATEGORY="development"
    31.9 -SHORT_DESC="fast Tiny C Compiler, common files."
   31.10 -MAINTAINER="pascal.bellard@slitaz.org"
   31.11 -LICENSE="LGPL2.1"
   31.12 -WEB_SITE="http://bellard.org/tcc/"
   31.13 -WANTED="tcc"
   31.14 -#HOST_ARCH="i486 arm"
   31.15 -
   31.16 -# Rules to gen a SliTaz package suitable for Tazpkg.
   31.17 -genpkg_rules()
   31.18 -{
   31.19 -	mkdir -p $fs/usr/include
   31.20 -	cp -a $install/usr/lib $fs/usr
   31.21 -	mv $fs/usr/lib/tcc/include/tcclib.h $fs/usr/include
   31.22 -	rm -rf $fs/usr/lib/tcc/win32
   31.23 -}
   31.24 -
    32.1 --- a/tcc-win32/receipt	Thu Jul 20 13:40:52 2017 +0300
    32.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.3 @@ -1,22 +0,0 @@
    32.4 -# SliTaz package receipt.
    32.5 -
    32.6 -PACKAGE="tcc-win32"
    32.7 -VERSION=20170515
    32.8 -CATEGORY="development"
    32.9 -SHORT_DESC="fast Tiny C cross Compiler to win32 target."
   32.10 -MAINTAINER="pascal.bellard@slitaz.org"
   32.11 -LICENSE="LGPL2.1"
   32.12 -WEB_SITE="http://bellard.org/tcc/"
   32.13 -DEPENDS="tcc-common"
   32.14 -SUGGESTED="mingw32-w32api"
   32.15 -WANTED="tcc"
   32.16 -TAGS="compiler C"
   32.17 -
   32.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   32.19 -genpkg_rules()
   32.20 -{
   32.21 -	mkdir -p $fs/usr/bin $fs/usr/lib/tcc
   32.22 -	cp -a $install/usr/bin/*-win32-tcc $fs/usr/bin
   32.23 -	cp -a $install/usr/lib/tcc/win32 $fs/usr/lib/tcc
   32.24 -}
   32.25 -
    33.1 --- a/tcc-x86_64/receipt	Thu Jul 20 13:40:52 2017 +0300
    33.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.3 @@ -1,20 +0,0 @@
    33.4 -# SliTaz package receipt.
    33.5 -
    33.6 -PACKAGE="tcc-x86_64"
    33.7 -VERSION=20170515
    33.8 -CATEGORY="development"
    33.9 -SHORT_DESC="fast Tiny C cross Compiler to x86_64 target."
   33.10 -MAINTAINER="pascal.bellard@slitaz.org"
   33.11 -LICENSE="LGPL2.1"
   33.12 -WEB_SITE="http://bellard.org/tcc/"
   33.13 -DEPENDS="tcc-common"
   33.14 -WANTED="tcc"
   33.15 -TAGS="compiler C"
   33.16 -
   33.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
   33.18 -genpkg_rules()
   33.19 -{
   33.20 -	mkdir -p $fs/usr/bin
   33.21 -	cp -a $install/usr/bin/x86_64-tcc $fs/usr/bin
   33.22 -}
   33.23 -
    34.1 --- a/tcc/receipt	Thu Jul 20 13:40:52 2017 +0300
    34.2 +++ b/tcc/receipt	Fri Jul 21 14:44:00 2017 +0300
    34.3 @@ -1,40 +1,33 @@
    34.4 -# SliTaz package receipt.
    34.5 +# SliTaz package receipt v2.
    34.6  
    34.7  PACKAGE="tcc"
    34.8 -GITHASH="307b7b183d4ee56e74090b0e525d6a587840e31f" # 15/5/2017
    34.9 -VERSION=20170515
   34.10 +GITHASH="0cc24d0e8487eaf53bb2849fef7e438a8e8fc94d" # 21/7/2017
   34.11 +VERSION="20170721"
   34.12  CATEGORY="development"
   34.13 -SHORT_DESC="Fast Tiny C Compiler."
   34.14 +SHORT_DESC="Fast Tiny C Compiler"
   34.15  MAINTAINER="pascal.bellard@slitaz.org"
   34.16 -TARBALL="$PACKAGE-$VERSION.tar.gz"
   34.17  LICENSE="LGPL2.1 MIT"
   34.18  WEB_SITE="http://bellard.org/tcc/"
   34.19 -WGET_URL="http://repo.or.cz/tinycc.git/snapshot/$GITHASH.tar.gz"
   34.20 -TAGS="compiler C assembler"
   34.21  #HOST_ARCH="i486 arm"
   34.22  
   34.23 -DEPENDS="tcc-common"
   34.24 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   34.25 +WGET_URL="http://repo.or.cz/tinycc.git/snapshot/$GITHASH.tar.gz"
   34.26 +
   34.27 +BUILD_DEPENDS_arm=" " # Perl is installed in a cross env.
   34.28  BUILD_DEPENDS="perl texinfo diffutils"
   34.29 -
   34.30 -# Perl is installed in a cross env.
   34.31 -case "$ARCH" in
   34.32 -	arm) BUILD_DEPENDS="" ;;
   34.33 -esac
   34.34 +SPLIT="tcc-arm tcc-c67 tcc-i386 tcc-x86_64 tcc-win tcc-osx"
   34.35  
   34.36  # Rules to configure and make the package.
   34.37  compile_rules()
   34.38  {
   34.39  	case "$ARCH" in
   34.40 -		arm)
   34.41 -			./configure \
   34.42 -				--prefix=/usr \
   34.43 -				--cross-prefix=arm-slitaz-linux-gnueabi- \
   34.44 -				--cpu=armv4l ;;
   34.45 -		*)
   34.46 -			./configure \
   34.47 -				--prefix=/usr \
   34.48 -				--enable-cross ;;
   34.49 -	esac &&
   34.50 +		arm) ARCH_ARGS="--cross-prefix=arm-slitaz-linux-gnueabi- --cpu=armv4l";;
   34.51 +		*)   ARCH_ARGS="--enable-cross";;
   34.52 +	esac
   34.53 +
   34.54 +	./configure \
   34.55 +		--prefix=/usr \
   34.56 +		$ARCH_ARGS &&
   34.57  	make && make test &&
   34.58  	make DESTDIR=$DESTDIR install
   34.59  }
   34.60 @@ -42,7 +35,41 @@
   34.61  # Rules to gen a SliTaz package suitable for Tazpkg.
   34.62  genpkg_rules()
   34.63  {
   34.64 -	mkdir -p $fs/usr/bin
   34.65 -	cp -a $install/usr/bin/tcc $fs/usr/bin
   34.66 +	case $PACKAGE in
   34.67 +		tcc)
   34.68 +			copy tcc libtcc.a libtcc1.a libtcc.h /usr/lib/tcc/include/
   34.69 +			TAGS="compiler C assembler"
   34.70 +			;;
   34.71 +		tcc-arm)
   34.72 +			copy arm-tcc arm64-tcc libtcc1-arm.a libtcc1-arm64.a
   34.73 +			CAT="development|to ARM Hard Float Linux, AArch64 Linux targets"
   34.74 +			TAGS="compiler C arm"
   34.75 +			;;
   34.76 +		tcc-c67)
   34.77 +			copy c67-tcc
   34.78 +			CAT="development|to C67 Linux target"
   34.79 +			TAGS="compiler C c67"
   34.80 +			;;
   34.81 +		tcc-win)
   34.82 +			copy i386-win32-tcc x86_64-win32-tcc arm-wince-tcc win32/
   34.83 +			CAT="development|to i386 Windows, x86_64 Windows, ARM Hard Float Windows targets"
   34.84 +			SUGGESTED="mingw32-w32api"
   34.85 +			TAGS="compiler C"
   34.86 +			;;
   34.87 +		tcc-i386)
   34.88 +			copy i386-tcc libtcc1-i386.a
   34.89 +			CAT="development|to i386 Linux target"
   34.90 +			TAGS="compiler C"
   34.91 +			;;
   34.92 +		tcc-x86_64)
   34.93 +			copy x86_64-tcc libtcc1-x86_64.a
   34.94 +			CAT="development|to x86_64 Linux target"
   34.95 +			TAGS="compiler C"
   34.96 +			;;
   34.97 +		tcc-osx)
   34.98 +			copy x86_64-osx-tcc libtcc1-x86_64-osx.a
   34.99 +			CAT="development|to x86_64 Darwin target"
  34.100 +			TAGS="compiler C"
  34.101 +			;;
  34.102 +	esac
  34.103  }
  34.104 -
    35.1 --- a/vte-dev/receipt	Thu Jul 20 13:40:52 2017 +0300
    35.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.3 @@ -1,26 +0,0 @@
    35.4 -# SliTaz package receipt.
    35.5 -
    35.6 -PACKAGE="vte-dev"
    35.7 -VERSION="0.28.2"
    35.8 -CATEGORY="development"
    35.9 -SHORT_DESC="Terminal capabilities for GTK+ widgets devel files."
   35.10 -WANTED="vte"
   35.11 -MAINTAINER="pankso@slitaz.org"
   35.12 -LICENSE="GPL2"
   35.13 -WEB_SITE="http://www.gnome.org/"
   35.14 -HOST_ARCH="i486 arm"
   35.15 -
   35.16 -DEPENDS="vte"
   35.17 -
   35.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   35.19 -genpkg_rules()
   35.20 -{
   35.21 -	mkdir -p $fs/usr/lib
   35.22 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
   35.23 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   35.24 -	[ -d "$install/usr/lib/girepository-1.0" ] && 
   35.25 -		cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
   35.26 -	[ -d "$install/usr/share/gir-1.0" ] && \
   35.27 -		cp -a $install/usr/share/gir-1.0 $fs/usr/share
   35.28 -	cp -a $install/usr/include $fs/usr
   35.29 -}
    36.1 --- a/vte-terminal/receipt	Thu Jul 20 13:40:52 2017 +0300
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,21 +0,0 @@
    36.4 -# SliTaz package receipt.
    36.5 -
    36.6 -PACKAGE="vte-terminal"
    36.7 -VERSION="0.28.2"
    36.8 -CATEGORY="development"
    36.9 -SHORT_DESC="X Terminal from the vte package."
   36.10 -WANTED="vte"
   36.11 -MAINTAINER="pankso@slitaz.org"
   36.12 -LICENSE="GPL2"
   36.13 -WEB_SITE="http://www.gnome.org/"
   36.14 -TAGS="terminal"
   36.15 -HOST_ARCH="i486 arm"
   36.16 -
   36.17 -DEPENDS="expat vte"
   36.18 -
   36.19 -# Rules to gen a SliTaz package suitable for Tazpkg.
   36.20 -genpkg_rules()
   36.21 -{
   36.22 -	mkdir -p $fs/usr
   36.23 -	cp -a $install/usr/bin $fs/usr
   36.24 -}
    37.1 --- a/vte/receipt	Thu Jul 20 13:40:52 2017 +0300
    37.2 +++ b/vte/receipt	Fri Jul 21 14:44:00 2017 +0300
    37.3 @@ -1,40 +1,44 @@
    37.4 -# SliTaz package receipt.
    37.5 +# SliTaz package receipt v2.
    37.6  
    37.7  PACKAGE="vte"
    37.8 -VERSION="0.28.2" # Also --> python-vte
    37.9 +VERSION="0.46.1"
   37.10  CATEGORY="utilities"
   37.11 -SHORT_DESC="Terminal capabilities for GTK+ widgets."
   37.12 +SHORT_DESC="Terminal capabilities for GTK+ widgets"
   37.13  MAINTAINER="pankso@slitaz.org"
   37.14  LICENSE="GPL2"
   37.15 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
   37.16  WEB_SITE="http://www.gnome.org/"
   37.17 -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   37.18  HOST_ARCH="i486 arm"
   37.19  
   37.20 -DEPENDS="gtk+ ncurses xorg-libXdamage"
   37.21 -BUILD_DEPENDS="gtk+-dev ncurses-dev"
   37.22 +TARBALL="$PACKAGE-$VERSION.tar.xz"
   37.23 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   37.24 +
   37.25 +BUILD_DEPENDS="pygtk-dev python-dev gobject-introspection-dev perl \
   37.26 +perl-xml-parser ncurses-dev"
   37.27 +BUILD_DEPENDS_arm="gtk+-dev ncurses-dev"
   37.28 +SPLIT="vte-terminal python-vte vte-dev"
   37.29 +
   37.30 +BUILD_DEPENDS="automake gettext gobject-introspection-dev vala intltool \
   37.31 +pango-dev gtk+3-dev pcre2-dev gnutls-dev"
   37.32  
   37.33  # Handle cross compilation.
   37.34  case "$ARCH" in
   37.35 -	i?86) 
   37.36 -		BUILD_DEPENDS="pygtk-dev python-dev gobject-introspection-dev
   37.37 -		perl perl-xml-parser ncurses-dev"
   37.38 -		ARCH_ARGS="--enable-introspection=yes" ;;
   37.39 -	arm) 
   37.40 -		ARCH_ARGS="--enable-introspection=no" ;;
   37.41 +	i?86) ARCH_ARGS="--enable-introspection=yes";;
   37.42 +	arm)  ARCH_ARGS="--enable-introspection=no";;
   37.43  esac
   37.44  
   37.45  # Rules to configure and make the package.
   37.46  compile_rules()
   37.47  {
   37.48 -	patch -p1 -i $stuff/AltKey.patch
   37.49 +	# http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html
   37.50 +	sed -i '/Werror/d' configure.ac &&
   37.51 +	autoreconf &&
   37.52 +
   37.53  	./configure \
   37.54 -		--libexecdir=/usr/lib/vte \
   37.55 -		--with-html-dir=/usr/share/doc \
   37.56 -		--with-pcre \
   37.57 +		--sysconfdir=/etc \
   37.58  		--disable-static \
   37.59 -		$CONFIGURE_ARGS &&
   37.60 -	make && make install
   37.61 +		$CONFIGURE_ARGS $ARCH_ARGS &&
   37.62 +	make -j1 && make install
   37.63 +
   37.64  	# add 'Home' and 'End' keys
   37.65  	#sed -i '9i\ \ \ \ :kh=\\E[H:@7=\\E[F:\\' $install/usr/share/vte/termcap-0.0/xterm
   37.66  }
   37.67 @@ -42,8 +46,21 @@
   37.68  # Rules to gen a SliTaz package suitable for Tazpkg.
   37.69  genpkg_rules()
   37.70  {
   37.71 -	mkdir -p $fs/usr/lib $fs/usr/share
   37.72 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
   37.73 -	cp -a $install/usr/lib/vte $fs/usr/lib
   37.74 -	cp -a $install/usr/share/vte $fs/usr/share
   37.75 +	case $PACKAGE in
   37.76 +		vte)
   37.77 +			copy @std
   37.78 +			DEPENDS="gtk+ ncurses xorg-libXdamage"
   37.79 +			;;
   37.80 +		vte-terminal)
   37.81 +			copy bin/
   37.82 +			CAT="development|X Terminal"
   37.83 +			DEPENDS="expat vte"
   37.84 +			;;
   37.85 +		python-vte)
   37.86 +			copy python*/ pygtk/
   37.87 +			CAT="development|terminal capabilities for GTK+ widgets"
   37.88 +			DEPENDS="vte"
   37.89 +			;;
   37.90 +		vte-dev) copy @dev;;
   37.91 +	esac
   37.92  }
    38.1 --- a/vte/stuff/AltKey.patch	Thu Jul 20 13:40:52 2017 +0300
    38.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.3 @@ -1,50 +0,0 @@
    38.4 -From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
    38.5 -From: Christian Persch <chpe@gnome.org>
    38.6 -Date: Sat, 12 May 2012 18:48:05 +0200
    38.7 -Subject: [PATCH] keymap: Treat ALT as META
    38.8 -
    38.9 -https://bugzilla.gnome.org/show_bug.cgi?id=663779
   38.10 ----
   38.11 - src/vte.c |   23 ++++++++++++++---------
   38.12 - 1 files changed, 14 insertions(+), 9 deletions(-)
   38.13 -
   38.14 -diff --git a/src/vte.c b/src/vte.c
   38.15 -index dd27e9a..0657921 100644
   38.16 ---- a/src/vte.c
   38.17 -+++ b/src/vte.c
   38.18 -@@ -5170,19 +5170,24 @@ static void
   38.19 - vte_terminal_read_modifiers (VteTerminal *terminal,
   38.20 - 			     GdkEvent *event)
   38.21 - {
   38.22 -+        GdkKeymap *keymap;
   38.23 - 	GdkModifierType modifiers;
   38.24 - 
   38.25 - 	/* Read the modifiers. */
   38.26 --	if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
   38.27 --		GdkKeymap *keymap;
   38.28 --#if GTK_CHECK_VERSION (2, 90, 8)
   38.29 --                keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
   38.30 --#else
   38.31 --                keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
   38.32 -+	if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
   38.33 -+                return;
   38.34 -+
   38.35 -+        keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
   38.36 -+
   38.37 -+        gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
   38.38 -+
   38.39 -+#if 1
   38.40 -+        /* HACK! Treat ALT as META; see bug #663779. */
   38.41 -+        if (modifiers & GDK_MOD1_MASK)
   38.42 -+                modifiers |= VTE_META_MASK;
   38.43 - #endif
   38.44 --                gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
   38.45 --		terminal->pvt->modifiers = modifiers;
   38.46 --	}
   38.47 -+
   38.48 -+        terminal->pvt->modifiers = modifiers;
   38.49 - }
   38.50 - 
   38.51 - /* Read and handle a keypress event. */
   38.52 --- 
   38.53 -1.7.5.1.217.g4e3aa.dirty
   38.54 \ No newline at end of file