# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1497077327 -10800
# Node ID b147959187956e9ff066427235b541f230ab6160
# Parent  0abbdf485a8db073eefc22362fd384ae80061c3c
Up glib.

diff -r 0abbdf485a8d -r b14795918795 glib-dev/receipt
--- a/glib-dev/receipt	Sat Jun 10 08:37:51 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="glib-dev"
-VERSION="2.48.2"
-CATEGORY="development"
-SHORT_DESC="C routines devel files and utilities (with Python codegen)."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://www.gtk.org/"
-HOST_ARCH="i486 arm"
-
-WANTED="glib"
-DEPENDS="glib perl python libffi-dev libgio libgio-dev pcre-dev pkg-config"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib $fs/usr/bin $fs/usr/share
-	cp -a $install/usr/lib/*.*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $install/usr/lib/glib* $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/share/aclocal $fs/usr/share
-	cp -a $install/usr/share/glib-2.0 $fs/usr/share
-	cp -a $install/usr/share/gdb $fs/usr/share
-
-	# Python codegen, tester, compile, Perl mkenums
-	#cp -a $install/usr/lib/gdbus-2.0 $fs/usr/lib
-	for bin in gdbus-codegen gtester* glib-mkenums
-	do
-		cp -a $install/usr/bin/$bin $fs/usr/bin
-	done
-
-	# Remove libgio-dev
-	rm -rf $fs/usr/lib/libgio*.*a
-	rm -rf $fs/usr/include/gio-unix-2.0
-	rm $fs/usr/lib/pkgconfig/gio*.pc
-}
diff -r 0abbdf485a8d -r b14795918795 glib/receipt
--- a/glib/receipt	Sat Jun 10 08:37:51 2017 +0300
+++ b/glib/receipt	Sat Jun 10 09:48:47 2017 +0300
@@ -1,28 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="glib"
-VERSION="2.48.2"
-series=$(echo $VERSION | cut -d. -f1,2)
+VERSION="2.50.3"
 CATEGORY="x-window"
-SHORT_DESC="C routines."
+SHORT_DESC="C routines"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gtk.org/"
 HOST_ARCH="i486 arm"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="$GNOME_MIRROR/$PACKAGE/$series/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-DEPENDS="pcre libffi libxml2 elfutils"
 BUILD_DEPENDS="perl indent python zlib-dev libffi-dev gettext-tools elfutils-dev \
-pcre-dev gtk-doc libxslt libxml2-tools dbus-dev"
-SPLIT="libgio libgio-dev"
-
-# Handle cross comilation. Use host Perl, Python, etc
-case "$ARCH" in
-	arm*)
-		BUILD_DEPENDS="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev" ;;
-esac
+pcre-dev gtk-doc libxslt libxml2-tools dbus-dev util-linux-mount-dev"
+BUILD_DEPENDS_arm="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev"
+SPLIT="libgio libgio-dev glib-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -63,14 +56,34 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin
-	cook_copy_files *.so*
-
-	# Split gio --> libgio
-	rm $fs/usr/lib/libgio*
-
-	# Python codegen, tester, Perl mkenums --> glib-dev
-	for bin in gdbus-codegen gtester* glib-mkenums; do
-		rm $fs/usr/bin/$bin
-	done
+	case $PACKAGE in
+		glib)
+			copy bin/ *.so*
+			# Split gio --> libgio
+			rm $fs/usr/lib/libgio*
+			# Python codegen, tester, Perl mkenums --> glib-dev
+			cd $fs/usr/bin; rm gdbus-codegen gtester* glib-mkenums
+			DEPENDS="pcre libffi libxml2 elfutils"
+			;;
+		libgio)
+			copy libgio*.so*
+			CAT="libs|libgio shared library"
+			;;
+		libgio-dev)
+			copy gio/ libgio*.*a gio*.pc
+			rm -rf $fs/usr/share
+			CAT="development|libgio development files"
+			DEPENDS="libgio"
+			;;
+		glib-dev)
+			# Python codegen, tester, compile, Perl mkenums
+			copy @dev gdbus-codegen gtester* glib-mkenums
+			# Remove libgio-dev
+			rm -rf $fs/usr/lib/libgio*.*a
+			rm -rf $fs/usr/include/gio-unix-2.0
+			rm $fs/usr/lib/pkgconfig/gio*.pc
+			DEPENDS="glib perl python libffi-dev libgio libgio-dev pcre-dev \
+			pkg-config"
+			;;
+	esac
 }
diff -r 0abbdf485a8d -r b14795918795 libgio-dev/receipt
--- a/libgio-dev/receipt	Sat Jun 10 08:37:51 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libgio-dev"
-VERSION="2.48.2"
-CATEGORY="development"
-SHORT_DESC="Glib libgio devel files."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://www.gtk.org/"
-HOST_ARCH="i486 arm"
-
-WANTED="glib"
-DEPENDS="libgio"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_folders gio
-	rm -rf $fs/usr/share
-	cook_copy_files libgio*.*a gio*.pc
-}
diff -r 0abbdf485a8d -r b14795918795 libgio/receipt
--- a/libgio/receipt	Sat Jun 10 08:37:51 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libgio"
-VERSION="2.48.2"
-CATEGORY="libs"
-SHORT_DESC="Glib libgio shared library."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://www.gtk.org/"
-HOST_ARCH="i486 arm"
-
-WANTED="glib"
-DEPENDS="glib"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files libgio*.so*
-}