# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1431508480 -10800
# Node ID 06146445ad613fda27b4eeb7e847c55c450e91c8
# Parent  1615f4391fb06a8c3366ff7954f4e078ddd8f000
Add yad-html, write "provide" variables for yad-html, yad-gtk3.

diff -r 1615f4391fb0 -r 06146445ad61 yad-gtk3/receipt
--- a/yad-gtk3/receipt	Tue May 12 19:26:09 2015 -0400
+++ b/yad-gtk3/receipt	Wed May 13 12:14:40 2015 +0300
@@ -1,16 +1,17 @@
 # SliTaz package receipt.
 
 PACKAGE="yad-gtk3"
-VERSION="0.22.1"
+VERSION="0.28.1"
 CATEGORY="utilities"
 SHORT_DESC="Display graphical dialogs from shell scripts or command line (GTK+3)"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL3"
-TARBALL="yad-$VERSION.tar.xz"
-WEB_SITE="http://code.google.com/p/yad/"
-WGET_URL="http://yad.googlecode.com/files/$TARBALL"
+SOURCE="yad"
+PROVIDE="yad:gtk+3"
+TARBALL="$SOURCE-$VERSION.tar.xz"
+WEB_SITE="http://sourceforge.net/projects/yad-dialog/"
+WGET_URL="$SF_MIRROR/yad-dialog/$TARBALL"
 TAGS="gtk3"
-VERSION_NOTE="latest"
 
 DEPENDS="gtk+3"
 BUILD_DEPENDS="gtk+3-dev optipng"
@@ -18,12 +19,11 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch -p1 < $stuff/ru.patch
+	#patch -p1 < $stuff/ru.patch
 	./configure \
 		--with-gtk=gtk3 \
 		--enable-icon-browser &&
-	make &&
-	make install
+	make && make install
 	optipng -quiet -zc1-9 -zm1-9 -zs0-3 -f0-5 \
 		$install/usr/share/icons/hicolor/48x48/apps/yad.png
 }
diff -r 1615f4391fb0 -r 06146445ad61 yad-html/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/yad-html/description.txt	Wed May 13 12:14:40 2015 +0300
@@ -0,0 +1,2 @@
+Yad (yet another dialog) is a fork of Zenity with many improvements, such as 
+custom buttons, additional dialogs, pop-up menu in notification icon and more. 
diff -r 1615f4391fb0 -r 06146445ad61 yad-html/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/yad-html/receipt	Wed May 13 12:14:40 2015 +0300
@@ -0,0 +1,38 @@
+# SliTaz package receipt.
+
+PACKAGE="yad-html"
+VERSION="0.28.1"
+CATEGORY="utilities"
+SHORT_DESC="Display graphical dialogs from shell scripts or command line (with HTML widget)"
+MAINTAINER="devl547@gmail.com"
+LICENSE="GPL3"
+SOURCE="yad"
+PROVIDE="yad:libwebkit"
+TARBALL="$SOURCE-$VERSION.tar.xz"
+WEB_SITE="http://sourceforge.net/projects/yad-dialog/"
+WGET_URL="$SF_MIRROR/yad-dialog/$TARBALL"
+TAGS="gtk2"
+
+DEPENDS="gtk+ libwebkit"
+BUILD_DEPENDS="gtk+-dev optipng libwebkit-dev"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	./configure \
+		--enable-icon-browser \
+		--enable-html \
+		$CONFIGURE_ARGS &&
+	make && make install &&
+	optipng -quiet -strip all -o7 -zm1-9 \
+		$install/usr/share/icons/hicolor/48x48/apps/yad.png
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	usih=/usr/share/icons/hicolor
+	mkdir -p ${fs}$usih
+	cp -a $install/usr/bin $fs/usr
+	cp -a ${install}$usih/48x48 ${fs}$usih
+}
diff -r 1615f4391fb0 -r 06146445ad61 yad/receipt
--- a/yad/receipt	Tue May 12 19:26:09 2015 -0400
+++ b/yad/receipt	Wed May 13 12:14:40 2015 +0300
@@ -12,12 +12,11 @@
 TAGS="gtk2"
 HOST_ARCH="i486 arm"
 
-DEPENDS="gtk+ libwebkit"
+DEPENDS="gtk+"
 BUILD_DEPENDS="gtk+-dev"
 
 case "$ARCH" in
-	i?86) BUILD_DEPENDS="$BUILD_DEPENDS optipng libwebkit-dev"
-		DEPENDS="$DEPENDS libwebkit" ;;
+	i?86) BUILD_DEPENDS="$BUILD_DEPENDS optipng";;
 esac
 
 # Rules to configure and make the package.
@@ -26,10 +25,10 @@
 	#patch -p1 < $stuff/ru.patch
 	./configure \
 		--enable-icon-browser \
-		--enable-html \
 		$CONFIGURE_ARGS &&
-	make && make install &&
-	optipng -quiet -strip all -o7 -zm1-9 \
+	make && make install
+	# Skip optipng for arm arch
+	[ -x '/usr/bin/optipng' ] && optipng -quiet -strip all -o7 -zm1-9 \
 		$install/usr/share/icons/hicolor/48x48/apps/yad.png
 }