# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1547299439 -7200
# Node ID 1ff2f2b5df1d2d5aead3ee9547e318328a19171e
# Parent  95afb7884ec0b11e556fc93cca95e02625569dde
Update gtk2

diff -r 95afb7884ec0 -r 1ff2f2b5df1d gtk2/receipt
--- a/gtk2/receipt	Sat Jan 12 13:31:42 2019 +0200
+++ b/gtk2/receipt	Sat Jan 12 15:23:59 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="gtk2"
-VERSION="2.24.31"
+VERSION="2.24.32"
 CATEGORY="x-window"
 SHORT_DESC="The GIMP Toolkit"
 MAINTAINER="devel@slitaz.org"
@@ -11,61 +11,42 @@
 
 TARBALL="gtk+-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gtk+/${VERSION:0:4}/$TARBALL"
+TARBALL_SHA1="c885ade62b06854590822c8eb906daf7dd15d90a"
 
 COOKOPTS="force-arch" # different .pc
 
-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-dev libxinerama-dev"
 BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
 gobject-introspection-dev gtk-doc gettext-dev libxinerama-dev \
 shared-mime-info-dev"
 SPLIT="$PACKAGE-demo $PACKAGE $PACKAGE-dev"
 
+COPY_demo="gtk-demo demo/ *.desktop"
+CAT_demo="development|example code and demo"
+
+DEPENDS_demo="$PACKAGE gdk-pixbuf glib libcairo pango"
+DEPENDS_std="atk fontconfig gdk-pixbuf glib libcairo libcups libx11 libxext \
+libxinerama libxrender pango"
+DEPENDS_dev="$PACKAGE atk-dev cairo-dev gdk-pixbuf-dev glib-dev pango-dev"
+
+CONFIG_FILES_std="/etc/gtk-2.0/im-multipress.conf"
+
+COOKOPTS="!menus"
+
 compile_rules() {
-#	. $stuff/replace-icons-paper; cd $src
-
-#	find $src -type f -name 'Makefile.in' -exec sed -i 's|1.15|1.15.1|' '{}' \;
-# or
-#	autoreconf -fi && # fix 'version mismatch' between 1.15 and 1.15.1
 	./configure \
 		--enable-debug=no \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make $MAKEFLAGS $LIBTOOL &&
+	make &&
 	make install || return 1
 
-	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
+	touch $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+	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
+	install -Dm644 $stuff/gtk2-demo.desktop \
+		$install/usr/share/applications/gtk2-demo.desktop
 }
 
-genpkg_rules() {
-	case $PACKAGE in
-		*-demo)
-			copy gtk-demo demo/ *.desktop
-			CAT="development|example code and demo"
-			DEPENDS="libcairo gdk-pixbuf glib gtk2 pango"
-			;;
-		gtk2)
-			COOKOPTS="!menus"
-			copy @std @rm
-			DEPENDS="atk libcairo fontconfig gdk-pixbuf glib libcups pango \
-			libx11 libxext libxinerama libxrender"
-			CONFIG_FILES="/etc/gtk-2.0/im-multipress.conf"
-			SUGGESTED="cups gnutls libgcrypt libgpg-error"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="gtk2 \
-			atk-dev cairo-dev gdk-pixbuf-dev glib-dev pango-dev"
-			;;
-	esac
-}
-
-post_install_gtk_() {
+post_install_gtk2() {
 	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 --update-cache
 }
diff -r 95afb7884ec0 -r 1ff2f2b5df1d gtk2/stuff/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk2/stuff/README	Sat Jan 12 15:23:59 2019 +0200
@@ -0,0 +1,19 @@
+Attempt to replace default stock icons with the icons from the currently used
+icon theme (paper-icon-theme) will allow to slim down the icon theme removing
+these icons from there leaving them only inside gtk.
+
+To try:
+
+  1. Add to BUILD_DEPENDS:
+     * paper-icon-theme
+     * rsvg-convert
+     * optipng-static
+     * pngquant-static
+     * symlinks
+     * automake
+  2. Call the script in the beginning of compile_rules():
+     . $stuff/replace-icons-paper
+     cd $src
+  3. Regenerate the sources using:
+     autoreconf -fi
+  4. Then, as usual, configure - make - make install
diff -r 95afb7884ec0 -r 1ff2f2b5df1d gtk2/stuff/gtk+-demo.desktop
--- a/gtk2/stuff/gtk+-demo.desktop	Sat Jan 12 13:31:42 2019 +0200
+++ /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 95afb7884ec0 -r 1ff2f2b5df1d gtk2/stuff/gtk2-demo.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk2/stuff/gtk2-demo.desktop	Sat Jan 12 15:23:59 2019 +0200
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=GTK+ Code demo
+Exec=gtk-demo
+Icon=gtk
+Categories=GTK;Development;
diff -r 95afb7884ec0 -r 1ff2f2b5df1d retawq/receipt
--- a/retawq/receipt	Sat Jan 12 13:31:42 2019 +0200
+++ b/retawq/receipt	Sat Jan 12 15:23:59 2019 +0200
@@ -10,6 +10,7 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+TARBALL_SHA1="ac99979e99ae3b3edba547dd23d54c8f5fb3c6f5"
 
 BUILD_DEPENDS="ncurses-dev openssl-dev gettext-dev"
 DEPENDS="ncurses openssl"