# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1502977506 -10800
# Node ID d0308bf5ec4ac5f40a639abac4e78c656361238a
# Parent  802ae6f847e28c31bff4be9e70079aa2a09b35f3
Up adwaita-icon-theme, at-spi2-atk, at-spi2-core, elementary-icon-theme, gtk+, gtk+3, hydroxygen-iconset, libepoxy, paper-icon-theme, slitaz-icons-elementary, slitaz-icons-hydroxygen, slitaz-icons-paper. Add faience-icon-theme.

diff -r 802ae6f847e2 -r d0308bf5ec4a adwaita-icon-theme/receipt
--- a/adwaita-icon-theme/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/adwaita-icon-theme/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,8 +1,7 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="adwaita-icon-theme"
-VERSION="3.23.91"
-SERIES="$(echo $VERSION | cut -d. -f1,2)"
+VERSION="3.22.0" # please, synchronize with the gtk+3 version (3.22.x)
 CATEGORY="customization"
 SHORT_DESC="A collection of icons used at the basis for GNOME themes"
 MAINTAINER="al.bobylev@gmail.com"
@@ -10,20 +9,31 @@
 WEB_SITE="https://github.com/GNOME/adwaita-icon-theme"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="$GNOME_MIRROR/$PACKAGE/$SERIES/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	# http://www.linuxfromscratch.org/blfs/view/stable/x/adwaita-icon-theme.html
+
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make && make install &&
+
+	# fix icons
+	sed -i 's|-inkscape-font-specification:&apos;Cantarell Bold&apos;;||' \
+		$install/usr/share/icons/Adwaita/scalable/actions/address-book-new-symbolic.svg &&
+	sed -i 's|-inkscape-font-specification:&apos;Bitstream Vera Sans&apos;;||' \
+		$install/usr/share/icons/Adwaita/scalable/actions/call-stop-symbolic.svg &&
+	sed -i '/<<<<<<< HEAD/,/=======/d; />>>>>>>/d' \
+		$install/usr/share/icons/Adwaita/scalable/actions/send-to-symbolic.svg &&
+	sed -i 's|-inkscape-font-specification:&apos;Andale Mono&apos;;||' \
+		$install/usr/share/icons/Adwaita/scalable/places/folder-download-symbolic.svg
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
-	rm -r $fs/usr/share/pkgconfig
+	copy @std
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a at-spi2-atk/receipt
--- a/at-spi2-atk/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/at-spi2-atk/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,11 +1,11 @@
 # SliTaz package receipt v2.
 
 PACKAGE="at-spi2-atk"
-VERSION="2.20.1"
+VERSION="2.22.0"
 CATEGORY="libdevel"
-LICENSE="GPL3"
 SHORT_DESC="Bridges ATK to At-Spi2 D-Bus service"
 MAINTAINER="yuripourre@gmail.com"
+LICENSE="GPL3"
 WEB_SITE="https://www.gnome.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
@@ -17,6 +17,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	# http://www.linuxfromscratch.org/blfs/view/stable/x/at-spi2-atk.html
 	./configure $CONFIGURE_ARGS && make && make install
 }
 
@@ -25,14 +26,16 @@
 	case $PACKAGE in
 		at-spi2-atk)
 			copy @std
-			DEPENDS="at-spi2-core atk dbus glib libffi libxcb pcre xorg-libX11 \
-			xorg-libXau xorg-libXdmcp"
+			DEPENDS="at-spi2-core atk dbus glib libffi pcre util-linux-uuid \
+			xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
+			xorg-libxcb"
 			;;
 		at-spi2-atk-dev)
 			copy @dev
-			DEPENDS="at-spi2-atk gobject-introspection-dev at-spi2-core-dev \
-			glib-dev atk-dev libffi-dev xorg-libX11-dev libxcb-dev \
-			xorg-libXau-dev xorg-libXdmcp-dev dbus-dev pcre-dev"
+			DEPENDS="at-spi2-atk \
+			at-spi2-core-dev atk-dev dbus-dev glib-dev libffi-dev pcre-dev \
+			util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
+			xorg-libXau-dev xorg-libXdmcp-dev xorg-libxcb-dev"
 			;;
 	esac
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a at-spi2-core/receipt
--- a/at-spi2-core/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/at-spi2-core/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,23 +1,24 @@
 # SliTaz package receipt v2.
 
 PACKAGE="at-spi2-core"
-VERSION="2.20.2"
+VERSION="2.22.0"
 CATEGORY="libdevel"
-LICENSE="GPL3"
 SHORT_DESC="Service Provider Interface for the Assistive Technologies"
 MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
 WEB_SITE="https://www.gnome.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool dbus-dev xorg-libX11-dev xorg-libXtst-dev \
-gobject-introspection-dev"
+BUILD_DEPENDS="intltool dbus-dev xorg-libX11-dev xorg-libICE-dev \
+xorg-libXtst-dev xorg-libSM-dev gobject-introspection-dev"
 SPLIT="at-spi2-core-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	# http://www.linuxfromscratch.org/blfs/view/stable/x/at-spi2-core.html
 	./configure \
 		--sysconfdir=/etc \
 		$CONFIGURE_ARGS &&
@@ -30,14 +31,16 @@
 	case $PACKAGE in
 		at-spi2-core)
 			copy @std
-			DEPENDS="dbus glib libffi libxcb pcre xorg-libX11 \
-			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXtst zlib"
+			DEPENDS="dbus glib libffi pcre util-linux-blkid util-linux-mount \
+			util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
+			xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXtst xorg-libxcb zlib"
 			;;
 		at-spi2-core-dev)
 			copy @dev
-			DEPENDS="at-spi2-core dbus-dev glib-dev gobject-introspection-dev \
-			libffi-dev xorg-libX11-dev libxcb-dev xorg-libXau-dev \
-			xorg-libXdmcp-dev pcre-dev"
+			DEPENDS="at-spi2-core \
+			dbus-dev glib-dev gobject-introspection-dev libffi-dev pcre-dev \
+			util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
+			xorg-libXau-dev xorg-libXdmcp-dev xorg-libxcb-dev"
 			;;
 	esac
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a elementary-icon-theme/receipt
--- a/elementary-icon-theme/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/elementary-icon-theme/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,27 +1,33 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="elementary-icon-theme"
-VERSION="4.0.2"
+VERSION="4.2.0"
 CATEGORY="customization"
 SHORT_DESC="Smooth modern theme designed to be intuitive"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="https://launchpad.net/elementaryicons"
+WEB_SITE="https://github.com/elementary/icons"
 
-TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="$WEB_SITE/${VERSION%%.*}.x/$VERSION/+download/$TARBALL"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
 #BUILD_DEPENDS="wget cacerts"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	mkdir -p $install/usr/share/icons/elementary
-	cp -a $src/* $install/usr/share/icons/elementary
+	icodir=$install/usr/share/icons/elementary
+	mkdir -p $icodir
+	cp -r $src/* $icodir
+
+	docdir=$install/usr/share/doc/$PACKAGE-$VERSION
+	mkdir -p $docdir
+	cd $icodir
+	mv AUTHORS *.md CONTRIBUTORS COPYING *.gpl pre-commit $docdir
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
+	copy @std
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a faience-icon-theme/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/faience-icon-theme/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -0,0 +1,28 @@
+# SliTaz package receipt v2.
+
+PACKAGE="faience-icon-theme"
+VERSION="0.5.1"
+CATEGORY="customization"
+SHORT_DESC="Icon theme based on Faenza"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="https://tiheum.deviantart.com/art/Faience-icon-theme-255099649"
+HOST_ARCH="any"
+
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
+WGET_URL="http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/$PACKAGE/$TARBALL"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $install/usr/share/icons
+	cp -r Faience* $install/usr/share/icons
+	find $install -name '*.theme' -exec chmod 0644 '{}' \;
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cp -a $install/* $fs
+	DEPENDS="faenza-icon-theme"
+}
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+-demo/receipt
--- a/gtk+-demo/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gtk+-demo"
-VERSION="2.24.30"
-CATEGORY="development"
-SHORT_DESC="The GIMP Toolkit (example code and demo)"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="https://www.gtk.org/"
-HOST_ARCH="i486 arm"
-
-WANTED="gtk+"
-DEPENDS="gtk+"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy gtk-demo demo/
-}
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+-demo/stuff/gtk+-demo.desktop
--- a/gtk+-demo/stuff/gtk+-demo.desktop	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GTK+ Code demo
-Exec=gtk-demo
-Icon=gtk
-Categories=GTK;Development;
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+-dev/receipt
--- a/gtk+-dev/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gtk+-dev"
-VERSION="2.24.30"
-CATEGORY="development"
-SHORT_DESC="The GIMP Toolkit."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://www.gtk.org/"
-HOST_ARCH="i486 arm"
-
-WANTED="gtk+"
-DEPENDS="gtk+ atk-dev bzip2-dev cairo-dev cups-dev fontconfig-dev freetype-dev \
-gdk-pixbuf-dev glib-dev glibc-dev gnutls-dev harfbuzz-dev libffi-dev \
-liblzma-dev libpng-dev libxcb-dev libxml2-dev pango-dev pcre-dev \
-pixman-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
-xorg-libXrender-dev zlib-dev"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy *.h *.la *.pc *.m4 *.typelib *.gir
-}
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+/receipt
--- a/gtk+/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/gtk+/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,71 +1,101 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gtk+"
-VERSION="2.24.30"
+VERSION="2.24.31"
 CATEGORY="x-window"
-SHORT_DESC="The GIMP Toolkit."
+SHORT_DESC="The GIMP Toolkit"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gtk.org/"
 HOST_ARCH="i486 arm"
-CONF_FILES="/etc/gtk-2.0/im-multipress.conf"
-SUGGESTED="cups gnutls libgcrypt libgpg-error"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
-DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib harfbuzz libcups \
-libffi libgnutls liblzma libpng libxcb libxml2 pango pcre pixman \
-xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender zlib"
-BUILD_DEPENDS="faenza-icon-theme optipng glib-dev atk-dev pango-dev cairo-dev \
-gdk-pixbuf-dev cups-dev gobject-introspection-dev gtk-doc automake gettext"
 BUILD_DEPENDS_arm="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
 xorg-inputproto libxcb-dev fontconfig-dev freetype-dev pixman-dev libxml2-dev \
 libpng-dev libffi-dev xorg-xextproto harfbuzz-dev faenza-icon-theme optipng \
 xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev automake"
-SPLIT="gtk+-demo gtk+-dev"
-
-# Handle cross compilation.
-case "$ARCH" in
-	arm*)
-		BUILD_DEPENDS=$BUILD_DEPENDS_arm
-		ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \
-		--disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes"
-		export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
-		export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include"
-		export LIBTOOL=${HOST_SYSTEM}-libtool
-		;;
-esac
-
+BUILD_DEPENDS="paper-icon-theme rsvg-convert optipng-static pngquant-static \
+symlinks \
+glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
+gobject-introspection-dev gtk-doc automake gettext xorg-libXinerama-dev"
+SPLIT="gtk+-demo gtk+ gtk+-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	while read i; do patch -p1 -i $stuff/patches/$i; done < $stuff/patches/series
-	. $stuff/replace-icons; cd $src
+	# http://www.linuxfromscratch.org/blfs/view/stable/x/gtk2.html
+
+	# Handle cross compilation.
+	case "$ARCH" in
+		arm*)
+			BUILD_DEPENDS=$BUILD_DEPENDS_arm
+			ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \
+			--disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes"
+			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
+			export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include"
+			export LIBTOOL=${HOST_SYSTEM}-libtool
+			;;
+	esac
+
+	. $stuff/replace-icons-paper; cd $src
 
 	./configure \
-		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-html-dir=/usr/share/doc \
-		$CONFIGURE_ARGS ${ARCH_ARGS} &&
+		--enable-debug=no \
+		$CONFIGURE_ARGS $ARCH_ARGS &&
 	make $MAKEFLAGS $LIBTOOL &&
-	make install
+	make install &&
+
+	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
+		$install/etc/gtk-2.0/gdk-pixbuf.loaders &&
+
+	mkdir -p $install/usr/share/applications &&
+	cp $stuff/*.desktop $install/usr/share/applications
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	copy etc/ bin/ themes/
-	find $fs -name gtk-demo -delete
-	copy *.so*
-
-	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
-		$fs/etc/gtk-2.0/gdk-pixbuf.loaders
+	case $PACKAGE in
+		gtk+-demo)
+			copy gtk-demo demo/ *.desktop
+			CAT="development|example code and demo"
+			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ \
+			libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \
+			util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \
+			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXinerama \
+			xorg-libXrender xorg-libxcb xorg-pixman zlib"
+			;;
+		gtk+)
+			COOKOPTS="!menus"
+			copy @std
+			remove_already_packed
+			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib \
+			libcups libffi libgnutls libharfbuzz liblzma libpng16 libxml2 \
+			pango pcre util-linux-blkid util-linux-mount util-linux-uuid \
+			xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \
+			xorg-libXinerama xorg-libXrender xorg-libxcb xorg-pixman zlib"
+			CONFIG_FILES="/etc/gtk-2.0/im-multipress.conf"
+			SUGGESTED="cups gnutls libgcrypt libgpg-error"
+			;;
+		gtk+-dev)
+			copy @dev
+			DEPENDS="gtk+ \
+			atk-dev bzip2-dev cairo-dev cups-dev fontconfig-dev \
+			freetype-dev gdk-pixbuf-dev glib-dev glibc-dev gnutls-dev \
+			harfbuzz-dev libffi-dev liblzma-dev libpng16-dev libxml2-dev \
+			pango-dev pcre-dev util-linux-blkid-dev util-linux-mount-dev \
+			util-linux-uuid-dev xorg-libX11-dev xorg-libXau-dev \
+			xorg-libXdmcp-dev xorg-libXext-dev xorg-libXinerama-dev \
+			xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev"
+			;;
+	esac
 }
 
 # Pre and post install commands for Tazpkg.
-post_install()
-{
+post_install_gtk_() {
 	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 --update-cache
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+/stuff/gtk+-demo.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk+/stuff/gtk+-demo.desktop	Thu Aug 17 16:45:06 2017 +0300
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=GTK+ Code demo
+Exec=gtk-demo
+Icon=gtk
+Categories=GTK;Development;
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+/stuff/patches/series
--- a/gtk+/stuff/patches/series	Mon Aug 14 15:53:27 2017 +0300
+++ b/gtk+/stuff/patches/series	Thu Aug 17 16:45:06 2017 +0300
@@ -1,1 +1,1 @@
-undo_gen_icons.patch
+undo_link_icons.patch
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+/stuff/patches/undo_gen_icons.patch
--- a/gtk+/stuff/patches/undo_gen_icons.patch	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1347,10 +1347,6 @@
-         fi &&								\
- 	for i in 16 24; do						\
- 	   (cd stock-icons/$$i						\
--	   && $(RM) document-save.png 					\
--	   && $(LN_S) media-floppy.png document-save.png 		\
--	   && $(RM) folder-remote.png 					\
--	   && $(LN_S) folder.png folder-remote.png 			\
- 	   && $(RM) go-first-rtl.png 					\
- 	   && $(LN_S) go-last-ltr.png go-first-rtl.png 			\
- 	   && $(RM) go-last-rtl.png 					\
-@@ -1367,10 +1363,6 @@
- 	   && $(LN_S) media-skip-forward-ltr.png media-skip-backward-rtl.png \
- 	   && $(RM) media-skip-forward-rtl.png 				\
- 	   && $(LN_S) media-skip-backward-ltr.png media-skip-forward-rtl.png \
--	   && $(RM) user-desktop.png 					\
--	   && $(LN_S) folder.png user-desktop.png 			\
--	   && $(RM) user-home.png 					\
--	   && $(LN_S) folder.png user-home.png 				\
- 	) done 								\
- 	&& touch stamp-icons
- 
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+/stuff/patches/undo_link_icons.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk+/stuff/patches/undo_link_icons.patch	Thu Aug 17 16:45:06 2017 +0300
@@ -0,0 +1,38 @@
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1409,34 +1409,7 @@
+ 	  done;								\
+ 	  chmod -R u+w stock-icons;					\
+         fi &&								\
+-	for i in 16 24; do						\
+-	   (cd stock-icons/$$i						\
+-	   && $(RM) document-save.png 					\
+-	   && $(LN_S) media-floppy.png document-save.png 		\
+-	   && $(RM) folder-remote.png 					\
+-	   && $(LN_S) folder.png folder-remote.png 			\
+-	   && $(RM) go-first-rtl.png 					\
+-	   && $(LN_S) go-last-ltr.png go-first-rtl.png 			\
+-	   && $(RM) go-last-rtl.png 					\
+-	   && $(LN_S) go-first-ltr.png go-last-rtl.png 			\
+-	   && $(RM) go-next-rtl.png 					\
+-	   && $(LN_S) go-previous-ltr.png go-next-rtl.png 		\
+-	   && $(RM) go-previous-rtl.png 				\
+-	   && $(LN_S) go-next-ltr.png go-previous-rtl.png 		\
+-	   && $(RM) media-seek-backward-rtl.png 			\
+-	   && $(LN_S) media-seek-forward-ltr.png media-seek-backward-rtl.png \
+-	   && $(RM) media-seek-forward-rtl.png 				\
+-	   && $(LN_S) media-seek-backward-ltr.png media-seek-forward-rtl.png \
+-	   && $(RM) media-skip-backward-rtl.png 			\
+-	   && $(LN_S) media-skip-forward-ltr.png media-skip-backward-rtl.png \
+-	   && $(RM) media-skip-forward-rtl.png 				\
+-	   && $(LN_S) media-skip-backward-ltr.png media-skip-forward-rtl.png \
+-	   && $(RM) user-desktop.png 					\
+-	   && $(LN_S) folder.png user-desktop.png 			\
+-	   && $(RM) user-home.png 					\
+-	   && $(LN_S) folder.png user-home.png 				\
+-	) done 								\
+-	&& touch stamp-icons
++	touch stamp-icons
+ 
+ if CROSS_COMPILING
+ gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+/stuff/replace-icons-paper
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk+/stuff/replace-icons-paper	Thu Aug 17 16:45:06 2017 +0300
@@ -0,0 +1,132 @@
+# Replace GTK+ stock icons by Paper icons
+# in order to strip icon theme and save some space.
+
+
+# Return shortest line
+shortest_line() {
+	S=$1; shift
+	for L in $@; do
+		[ "${#L}" -lt "${#S}" ] && S="$L"
+	done
+	echo "$S"
+}
+
+# Replace the same files by symlinks, $@ - list of identical files
+make_symlinks() {
+	S=$(shortest_line $@)
+	for file in $@; do
+		[ "$S" != "$file" ] && ln -sf $S $file
+	done
+}
+
+
+echo -n "Replacing icons... "
+
+F=/usr/share/icons/Paper
+
+# copy icon
+ci() {
+	icon=$(basename $1 .png)
+	size="$2"
+	sub=''
+	case $icon in
+		*-ltr) sub=${icon%-*};;
+		*-rtl)
+			case ${icon%-*} in
+				edit-redo)				sub='edit-undo';;
+				edit-undo)				sub='edit-redo';;
+				format-indent-less)		sub='format-indent-more';;
+				format-indent-more)		sub='format-indent-less';;
+				go-first)				sub='go-last';;
+				go-last)				sub='go-first';;
+				go-next)				sub='go-previous';;
+				go-previous)			sub='go-next';;
+				media-seek-backward)	sub='media-seek-forward';;
+				media-seek-forward)		sub='media-seek-backward';;
+				media-skip-backward)	sub='media-skip-forward';;
+				media-skip-forward)		sub='media-skip-backward';;
+			esac
+			sub="$sub $sub-ltr"
+			;;
+		gtk-caps-lock-warning)		sub='dialog-warning';;
+		gtk-color-picker)			sub='color-picker';;
+		gtk-connect)				sub='network-transmit-receive';;
+		gtk-disconnect)				sub='network-offline';;
+		gtk-edit)					sub='edit';;
+		gtk-font)					sub='font-x-generic';;
+		gtk-page-setup)				sub='document-page-setup';;
+		gtk-preferences)			sub='preferences-desktop';;
+		gtk-select-color)			sub='color-select';;
+		gtk-select-font)			sub='font-select';;
+		gtk-apply)					sub='object-select';;
+		gtk-no)						sub='emblem-unreadable';;
+		gtk-yes)					sub='emblem-default';;
+		gtk-ok)						sub='object-select';;
+	esac
+
+	found=''
+	for i in png svg; do
+		for j in actions apps categories devices emblems emotes mimetypes places status; do
+			for k in $icon $sub; do
+				if [ -f "$F/$size/$j/$k.$i" ]; then
+					found="$F/$size/$j/$k.$i"
+					break 3
+				fi
+			done
+		done
+	done
+	case $found in
+		*.png) cp -f $found $1;;
+		*.svg) rm $1; rsvg-convert $found -o $1;;
+	esac
+}
+
+cd $src/gtk/stock-icons/16; for a in $(ls); do ci $a 16x16; done
+cd $src/gtk/stock-icons/20; for a in $(ls); do ci $a 16x16; done # yes, using 16x16 for 20
+cd $src/gtk/stock-icons/24; for a in $(ls); do ci $a 16x16; done # too
+cd $src/gtk/stock-icons/32; for a in $(ls); do ci $a 32x32; done
+cd $src/gtk/stock-icons/48; for a in $(ls); do ci $a 48x48; done
+
+echo "Done"
+
+for folder in 16 20 24 32 48; do
+	echo -n "Optimizing folder icons $folder... "
+	cd $src/gtk/stock-icons/$folder
+	for icon in ./*.png; do
+		pngquant -f --skip-if-larger --ext .png --speed 1 "$icon"
+		optipng -quiet -o7 -zm1-9 "$icon"
+	done
+	echo "Done"
+done
+
+
+# replace the same icons by symlinks
+
+MD5FILE=$(mktemp)
+find $src/gtk/stock-icons -type f -exec md5sum '{}' \; | sort > $MD5FILE
+for md in $(uniq -d -w32 $MD5FILE | cut -c1-32); do
+	make_symlinks $(grep $md $MD5FILE | cut -c35-)
+done
+rm "$MD5FILE"
+# make all symlinks relative
+symlinks -crs $src/gtk/stock-icons >/dev/null 2>&1
+
+
+
+# missing icons:
+# 16, 24
+# ==============================================================================
+# gtk-convert
+# gtk-index
+# gtk-orientation-landscape
+# gtk-orientation-portrait
+# gtk-orientation-reverse-landscape
+# gtk-orientation-reverse-portrait
+# gtk-undelete-ltr
+# gtk-undelete-rtl
+# printer-paused
+# printer-warning
+# 32
+# ==============================================================================
+# gtk-dnd
+# gtk-dnd-multiple
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+3-demo/receipt
--- a/gtk+3-demo/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gtk+3-demo"
-VERSION="3.20.9"
-CATEGORY="development"
-SHORT_DESC="The GIMP Toolkit 3.x (example code and demo)"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="LGPL2"
-WEB_SITE="https://www.gtk.org/"
-
-WANTED="gtk+3"
-DEPENDS="gtk+3"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy gtk3-demo* *Demo* *exampleapp*
-
-	rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
-}
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+3-dev/receipt
--- a/gtk+3-dev/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gtk+3-dev"
-VERSION="3.20.9"
-CATEGORY="development"
-SHORT_DESC="The GIMP Toolkit 3.x (development files)"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="LGPL2"
-WEB_SITE="https://www.gtk.org/"
-
-WANTED="gtk+3"
-DEPENDS="gtk+3 gtk+3-demo gtk+3-icon-browser gtk+3-widget-factory \
-at-spi2-atk-dev at-spi2-core-dev atk-dev bzip2-dev cairo-dev \
-colord-dev cups-dev dbus-dev eudev-dev fontconfig-dev freetype-dev \
-gdk-pixbuf-dev glib-dev glibc-dev gnutls-dev harfbuzz-dev lcms2-dev \
-libepoxy-dev libffi-dev liblzma-dev libpng-dev libxcb-dev \
-libxml2-dev pango-dev pcre-dev pixman-dev xorg-libX11-dev xorg-libXau-dev \
-xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXdmcp-dev xorg-libXext-dev \
-xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev xorg-libXrandr-dev \
-xorg-libXrender-dev zlib-dev"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy *.h *.la *.pc *.typelib *.gir *.m4 *.its *.loc *.rng
-}
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+3-icon-browser/receipt
--- a/gtk+3-icon-browser/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gtk+3-icon-browser"
-VERSION="3.20.9"
-CATEGORY="development"
-SHORT_DESC="The GIMP Toolkit 3.x (icon browser)"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="LGPL2"
-WEB_SITE="https://www.gtk.org/"
-
-WANTED="gtk+3"
-DEPENDS="gtk+3"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy gtk3-icon-browser gtk3-icon-browser.desktop
-}
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+3-widget-factory/receipt
--- a/gtk+3-widget-factory/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gtk+3-widget-factory"
-VERSION="3.20.9"
-CATEGORY="development"
-SHORT_DESC="The GIMP Toolkit 3.x (widget factory)"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="LGPL2"
-WEB_SITE="https://www.gtk.org/"
-
-WANTED="gtk+3"
-DEPENDS="gtk+3"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy gtk3-widget*
-
-	rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
-}
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+3/receipt
--- a/gtk+3/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/gtk+3/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,48 +1,43 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gtk+3"
-VERSION="3.20.9"
+VERSION="3.22.8"
 CATEGORY="x-window"
 SHORT_DESC="The GIMP Toolkit 3.x"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.gtk.org/"
-CONFIG_FILES="/etc/gtk-3.0/settings.ini"
-SUGGESTED="cups"
-COOKOPTS="!menus"
-
-TARBALL="gtk+-$VERSION.tar.xz"
-WGET_URL="$GNOME_MIRROR/gtk+/${VERSION:0:4}/$TARBALL"
-
 #HOST_ARCH="i486 arm"
 CROSS_BUGS="bug: /bin/bash: no: command not found"
 
-DEPENDS="colord at-spi2-atk at-spi2-core atk bzlib cairo dbus eudev fontconfig \
-freetype gdk-pixbuf glib harfbuzz lcms2 libcups libepoxy libffi \
-libgnutls liblzma libpng libxcb libxml2 pango pcre pixman xorg-libX11 \
-xorg-libXau xorg-libXcomposite xorg-libXdamage xorg-libXdmcp xorg-libXext \
-xorg-libXfixes xorg-libXi xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
+TARBALL="gtk+-$VERSION.tar.xz"
+WGET_URL="$GNOME_MIRROR/gtk+/${VERSION%.*}/$TARBALL"
+
+BUILD_DEPENDS_arm="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
+xorg-inputproto"
 BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev gettext \
 xorg-libXinerama-dev xorg-libXi-dev xorg-libXrandr-dev xorg-libXcomposite-dev \
 xorg-libXdamage-dev libepoxy-dev at-spi2-atk-dev cups-dev colord-dev gtk-doc \
 libxslt"
-BUILD_DEPENDS_arm="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
-xorg-inputproto"
-SPLIT="gtk+3-demo gtk+3-widget-factory gtk+3-icon-browser gtk+3-dev"
-
-# Handle cross compilation.
-case "$ARCH" in
-	arm*)
-		BUILD_DEPENDS="$BUILD_DEPENDS_arm"
-		ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \
---disable-papi --with-xinput gio_can_sniff=yes"
-		export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
-		export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include" ;;
-esac
+SPLIT="gtk+3-demo gtk+3-widget-factory gtk+3-icon-browser gtk+3 gtk+3-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	# http://www.linuxfromscratch.org/blfs/view/stable/x/gtk3.html
+
+	# Handle cross compilation.
+	case "$ARCH" in
+		arm*)
+			ARCH_ARGS="--enable-introspection=no --disable-glibtest \
+			--disable-cups --disable-papi --with-xinput gio_can_sniff=yes"
+			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
+			export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include"
+			;;
+	esac
+
+	touch gdk/gdk.gresource.xml
+
 	./configure \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
@@ -63,20 +58,61 @@
 	make $MAKEFLAGS &&
 	make DESTDIR=$DESTDIR install
 
+	cp -f $stuff/settings.ini $install/etc/gtk-3.0 &&
 	find $install -name '*.desktop' | xargs sed -i '/NoDisplay/d'
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	copy etc/ bin/ themes/ *.so* *.xml
-
-	cp -f $stuff/settings.ini $fs/etc/gtk-3.0
-	find $fs \( -name '*demo*' -o -name 'gtk3-icon*' -o -name '*widget*' \
-		-o -name '*Demo*' -o -name '*exampleapp*' \) -delete
+	case $PACKAGE in
+		gtk+3-demo)
+			copy gtk3-demo* *Demo* *exampleapp*
+			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
+			CAT="development|example code and demo"
+			;;
+		gtk+3-widget-factory)
+			copy gtk3-widget*
+			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
+			CAT="development|widget factory"
+			;;
+		gtk+3-icon-browser)
+			copy gtk3-icon-browser gtk3-icon-browser.desktop
+			CAT="development|icon browser"
+			;;
+		gtk+3)
+			COOKOPTS="!menus"
+			copy etc/ bin/ themes/ *.so* *.xml
+			remove_already_packed
+			DEPENDS="at-spi2-atk at-spi2-core atk bzlib cairo colord dbus \
+			eudev fontconfig freetype gdk-pixbuf glib lcms2 libcups libepoxy \
+			libffi libgnutls libharfbuzz liblzma libpng16 libxml2 pango pcre \
+			util-linux-blkid util-linux-mount util-linux-uuid xorg-libICE \
+			xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
+			xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
+			xorg-libXi xorg-libXinerama xorg-libXrandr xorg-libXrender \
+			xorg-libxcb xorg-pixman zlib"
+			CONFIG_FILES="/etc/gtk-3.0/settings.ini"
+			SUGGESTED="cups"
+			;;
+		gtk+3-dev)
+			copy @dev *.its *.loc *.rng
+#			copy *.h *.la *.pc *.typelib *.gir *.m4 *.its *.loc *.rng
+			DEPENDS="gtk+3 gtk+3-demo gtk+3-icon-browser gtk+3-widget-factory \
+			at-spi2-atk-dev at-spi2-core-dev atk-dev bzip2-dev cairo-dev \
+			colord-dev cups-dev dbus-dev eudev-dev fontconfig-dev freetype-dev \
+			gdk-pixbuf-dev glib-dev gnutls-dev harfbuzz-dev lcms2-dev \
+			libepoxy-dev libffi-dev libpng16-dev libxml2-dev pango-dev \
+			pcre-dev util-linux-blkid-dev util-linux-mount-dev \
+			util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
+			xorg-libXau-dev xorg-libXcomposite-dev xorg-libXdamage-dev \
+			xorg-libXdmcp-dev xorg-libXext-dev xorg-libXfixes-dev \
+			xorg-libXi-dev xorg-libXinerama-dev xorg-libXrandr-dev \
+			xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev"
+			;;
+	esac
 }
 
-post_install()
-{
+post_install_gtk_3() {
 	chroot "$1/" /usr/bin/gtk-query-immodules-3.0 --update-cache
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+3/stuff/patches/gtk3-misc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk+3/stuff/patches/gtk3-misc.patch	Thu Aug 17 16:45:06 2017 +0300
@@ -0,0 +1,14 @@
+--- a/gtk/gtktextview.h
++++ b/gtk/gtktextview.h
+@@ -56,9 +56,9 @@
+  */
+ typedef enum
+ {
+-  /*< private >*/
++  /* < private > */
+   GTK_TEXT_WINDOW_PRIVATE,
+-  /*< public >*/
++  /* < public > */
+   GTK_TEXT_WINDOW_WIDGET,
+   GTK_TEXT_WINDOW_TEXT,
+   GTK_TEXT_WINDOW_LEFT,
diff -r 802ae6f847e2 -r d0308bf5ec4a gtk+3/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk+3/stuff/patches/series	Thu Aug 17 16:45:06 2017 +0300
@@ -0,0 +1,1 @@
+gtk3-misc.patch
diff -r 802ae6f847e2 -r d0308bf5ec4a hydroxygen-iconset/receipt
--- a/hydroxygen-iconset/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/hydroxygen-iconset/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="hydroxygen-iconset"
 VERSION="20090119"
@@ -14,7 +14,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Source Zip zrchive contains Tar.Bz2 archive inside
+	# Source Zip archive contains Tar.Bz2 archive inside
 	echo 'Extract sources'
 	busybox tar -xjf hydroxygen_iconset.tar.bz2 || return 1
 	rm $src/*.tar.bz2
diff -r 802ae6f847e2 -r d0308bf5ec4a libepoxy-dev/receipt
--- a/libepoxy-dev/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libepoxy-dev"
-VERSION="1.3.1"
-CATEGORY="x-window"
-SHORT_DESC="Library for handling OpenGL function pointer management (development files)"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="https://github.com/anholt/libepoxy/"
-
-WANTED="libepoxy"
-DEPENDS="libepoxy"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy *.h *.la *.pc
-}
diff -r 802ae6f847e2 -r d0308bf5ec4a libepoxy/receipt
--- a/libepoxy/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/libepoxy/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,26 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="libepoxy"
-VERSION="1.3.1"
+VERSION="1.4.0"
 CATEGORY="x-window"
 SHORT_DESC="Library for handling OpenGL function pointer management"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://github.com/anholt/libepoxy/"
 
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="${WEB_SITE}releases/download/v$VERSION/$TARBALL"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+WGET_URL="https://github.com/anholt/libepoxy/releases/download/v${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros python mesa-dev"
+SPLIT="libepoxy-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	# http://www.linuxfromscratch.org/blfs/view/stable/x/libepoxy.html
 	./configure $CONFIGURE_ARGS && make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	copy *.so*
+	case $PACKAGE in
+		libepoxy) copy @std;;
+		*-dev)    copy @dev;;
+	esac
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a paper-icon-theme/receipt
--- a/paper-icon-theme/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/paper-icon-theme/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,8 +1,8 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="paper-icon-theme"
-VERSION="1.4.0.11"
-COMMIT="579e9aa"
+VERSION="1.4.0.28"	# released v.1.4.0 + 28 commits since it
+COMMIT="0411510"
 CATEGORY="customization"
 SHORT_DESC="Simple and modern icon theme with material design influences"
 MAINTAINER="al.bobylev@gmail.com"
@@ -12,13 +12,13 @@
 TARBALL="$PACKAGE-$COMMIT.tar.gz"
 WGET_URL="$GITHUB/snwh/paper-icon-theme/tarball/${COMMIT:-$VERSION}"
 
-DEPENDS="librsvg"
-BUILD_DEPENDS="autoconf automake svgcleaner"
+BUILD_DEPENDS="automake" # svgcleaner"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	./autogen.sh &&
+	sed -i 's|-Rv|-R|' Makefile &&
 	make && make install
 
 	# remove hdpi icons, and huge sizes
@@ -32,17 +32,21 @@
 	done
 	sed -i '/HiDPi/,$d' $it
 
-	# remove duplicates (keep <name>.png, remove <name>.svg)
-	for svg in $(find $install -name '*.svg'); do
-		if [ -e "${svg%svg}png" ]; then
-			echo "Remove duplicate: ${svg#*Paper/}"
-			rm "$svg"
-		fi
-	done
+	cp $install/usr/share/icons/Paper/scalable/actions/action-unavailable-symbolic.svg \
+		$install/usr/share/icons/Paper/scalable/actions/action\ unavailable\ symbolic.svg
+
+#	# remove duplicates (keep <name>.png, remove <name>.svg)
+#	for svg in $(find $install -name '*.svg'); do
+#		if [ -e "${svg%svg}png" ]; then
+#			echo "Remove duplicate: ${svg#*Paper/}"
+#			rm "$svg"
+#		fi
+#	done
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	cp -a $install/* $fs
+	DEPENDS="librsvg"
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a slitaz-icons-elementary/receipt
--- a/slitaz-icons-elementary/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/slitaz-icons-elementary/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,26 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-icons-elementary"
-VERSION="4.0.2"
+VERSION="4.2.0"
 CATEGORY="customization"
 SHORT_DESC="SliTaz icon set based on the elementary icons"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="elementary-icon-theme"
-BUILD_DEPENDS="make-slitaz-icons"
+BUILD_DEPENDS="elementary-icon-theme make-slitaz-icons"
 
 # Rules to compile and makethe package.
 compile_rules() {
 	mksit.sh \
-		-f $install/usr/share/icons/elementary \
-		-t $fs/usr/share/icons/SliTaz-Elementary \
-		-opmax -nocolor
+		-f /usr/share/icons/elementary \
+		-t $install/usr/share/icons/SliTaz-Elementary \
+		-opmax
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	:
+	cp -r $install/* $fs
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a slitaz-icons-hydroxygen/receipt
--- a/slitaz-icons-hydroxygen/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/slitaz-icons-hydroxygen/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-icons-hydroxygen"
 VERSION="20090119"
@@ -8,19 +8,18 @@
 LICENSE="CC GPL"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="hydroxygen-iconset"
-BUILD_DEPENDS="make-slitaz-icons"
+BUILD_DEPENDS="hydroxygen-iconset make-slitaz-icons"
 
 # Rules to compile and makethe package.
 compile_rules() {
 	mksit.sh \
-		-f $install/usr/share/icons/hydroxygen \
+		-f /usr/share/icons/hydroxygen \
 		-t $fs/usr/share/icons/SliTaz-Hydroxygen \
-		-opmax -nocolor
+		-opmax
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	:
+	copy @std
 }
diff -r 802ae6f847e2 -r d0308bf5ec4a slitaz-icons-paper/receipt
--- a/slitaz-icons-paper/receipt	Mon Aug 14 15:53:27 2017 +0300
+++ b/slitaz-icons-paper/receipt	Thu Aug 17 16:45:06 2017 +0300
@@ -1,26 +1,25 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-icons-paper"
-VERSION="1.3.4"
+VERSION="1.4.0.28"
 CATEGORY="customization"
 SHORT_DESC="SliTaz icon set based on the Paper icons"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="CC-BY-SA-4"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="paper-icon-theme"
-BUILD_DEPENDS="make-slitaz-icons"
+BUILD_DEPENDS="paper-icon-theme make-slitaz-icons"
 
-# Rules to compile and makethe package.
+# Rules to compile and make the package.
 compile_rules() {
 	mksit.sh \
-		-f $install/usr/share/icons/Paper \
-		-t $fs/usr/share/icons/SliTaz-Paper \
-		-opmax -nocolor
+		-f /usr/share/icons/Paper \
+		-t $install/usr/share/icons/SliTaz-Paper \
+		-opmax
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	:
+	cp -r $install/* $fs
 }