# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1599655704 -3600
# Node ID 94f3f54e446de9f312249b6a3067b200e6c1cfde
# Parent  fe65d1f71c17eb043777936c16684797932ba9ae
updated glib and glib-dev (2.43.3 -> 2.62.4)

diff -r fe65d1f71c17 -r 94f3f54e446d glib-dev/receipt
--- a/glib-dev/receipt	Fri Nov 15 17:49:31 2019 +0100
+++ b/glib-dev/receipt	Wed Sep 09 13:48:24 2020 +0100
@@ -1,48 +1,58 @@
 # SliTaz package receipt.
 
 PACKAGE="glib-dev"
-VERSION="2.43.3"
+VERSION="2.62.4"
 CATEGORY="development"
-SHORT_DESC="C routines devel files and utilities (with Python codegen)."
+SHORT_DESC="C routines development files and utilities (with Python codegen)."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="glib"
-WEB_SITE="http://www.gtk.org/"
-HOST_ARCH="i486 arm"
+WEB_SITE="https://www.gtk.org/"
 
 DEPENDS="glib perl python libffi-dev libgio libgio-dev pcre-dev pkg-config"
+WANTED="glib"
+
+HOST_ARCH="i486 arm"
 
 # 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
+	mkdir -p $fs/usr/lib
+	mkdir -p $fs/usr/bin
+	mkdir -p $fs/usr/share
+
+#	cp -a $install/usr/lib/*.*a $fs/usr/lib	not supported in 2.62.4
+	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
+	  do
 		cp -a $install/usr/bin/$bin $fs/usr/bin
-	done
+	  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
+#	rm -rf	$fs/usr/lib/libgio*.*a		not supported in 2.62.4
+	rm -rf				$fs/usr/include/gio-unix-2.0
+	rm				$fs/usr/lib/pkgconfig/gio*.pc
 
 	# exclude from files.list (for tazpkg-find-depends)
 	cd $fs/usr/share/gdb/auto-load
-	for i in $(ls *.py);do mv -f $i ${i//./-.-};done
+	for i in $(ls *.py)
+	  do
+		mv -f $i ${i//./-.-}
+	  done
 }
+
 post_install()
 {
 	cd $1/usr/share/gdb/auto-load
-	for i in $(ls *.-py);do mv -f $i ${i//-.-/.};done
+	for i in $(ls *.-py)
+	  do
+		mv -f $i ${i//-.-/.}
+	  done
 }
-
diff -r fe65d1f71c17 -r 94f3f54e446d glib/receipt
--- a/glib/receipt	Fri Nov 15 17:49:31 2019 +0100
+++ b/glib/receipt	Wed Sep 09 13:48:24 2020 +0100
@@ -1,41 +1,44 @@
 # SliTaz package receipt.
 
 PACKAGE="glib"
-VERSION="2.43.3"
+VERSION="2.62.4"
 CATEGORY="x-window"
 SHORT_DESC="C routines."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.gtk.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://www.gtk.org/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
+
+DEPENDS="elfutils libffi libxml2 pcre"
+BUILD_DEPENDS="cmake elfutils-dev gettext libffi-dev libxml2-dev
+	libxml2-tools meson ninja pcre-dev perl python-dev
+	util-linux-mount-dev zlib-dev"
+
 HOST_ARCH="i486 arm"
 
-DEPENDS="pcre libffi libxml2 elfutils"
-BUILD_DEPENDS="pcre-dev libffi-dev gettext zlib-dev perl python-dev \
-elfutils-dev libxml2-dev libxml2-tools automake"
-
 # 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
 
+# @maintainer:	Please update also libgio and libgio-dev
+
 # Rules to configure and make the package.
 compile_rules()
 {
 	case "$ARCH" in
 		i?86)
-			./configure \
-				--sysconfdir=/etc \
-				--with-pcre=system \
-				$CONFIGURE_ARGS ;;
+			meson . _build --prefix=/usr ;;
 		arm*)
+			# not updated for 2.62.4 !
 			# Native ARM build --> if ARCH != SLITAZ_ARCH ?
 			export LD_LIBRARY_PATH=/cross/$ARCH/sysroot/usr/lib:/usr/lib:/lib
 			export PKG_CONFIG_PATH=/cross/$ARCH/sysroot/usr/lib/pkgconfig
 			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib -Wl,-rpath=/cross/$ARCH/sysroot/usr/lib"
-			
+
 			# Glib
 			export glib_cv_stack_grows=${glib_cv_stack_grows=no}
 			export glib_cv_uscore=${glib_cv_uscore=no}
@@ -52,30 +55,24 @@
 				--enable-shared=yes \
 				--enable-static=yes \
 				--disable-rpath ;;
-	esac && 
-	make && make install
+	esac &&
+	ninja -C _build &&
+	ninja -C _build install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	
+	cp -a $install/usr/bin		$fs/usr
+	cp -a $install/usr/lib/*.so*	$fs/usr/lib
+
 	# Split gio --> libgio
-	rm $fs/usr/lib/libgio*
-	
+	rm				$fs/usr/lib/libgio*
+
 	# Python codegen, tester, Perl mkenums --> glib-dev
 	for bin in gdbus-codegen gtester* glib-mkenums
-	do
+	  do
 		rm $fs/usr/bin/$bin
-	done
-	
-	# Cook packages that want glib.
-	for w in libgio libgio-dev
-	do
-		[ -x "/usr/bin/cook" ] && echo cook $w
-	done
+	  done
 }
-