wok-undigest rev 1228

updated glib and glib-dev (2.43.3 -> 2.62.4)
author Hans-G?nter Theisgen
date Wed Sep 09 13:48:24 2020 +0100 (2020-09-09)
parents fe65d1f71c17
children 0b7d57696041
files glib-dev/receipt glib/receipt
line diff
     1.1 --- a/glib-dev/receipt	Fri Nov 15 17:49:31 2019 +0100
     1.2 +++ b/glib-dev/receipt	Wed Sep 09 13:48:24 2020 +0100
     1.3 @@ -1,48 +1,58 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="glib-dev"
     1.7 -VERSION="2.43.3"
     1.8 +VERSION="2.62.4"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="C routines devel files and utilities (with Python codegen)."
    1.11 +SHORT_DESC="C routines development files and utilities (with Python codegen)."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 -WANTED="glib"
    1.15 -WEB_SITE="http://www.gtk.org/"
    1.16 -HOST_ARCH="i486 arm"
    1.17 +WEB_SITE="https://www.gtk.org/"
    1.18  
    1.19  DEPENDS="glib perl python libffi-dev libgio libgio-dev pcre-dev pkg-config"
    1.20 +WANTED="glib"
    1.21 +
    1.22 +HOST_ARCH="i486 arm"
    1.23  
    1.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.25  genpkg_rules()
    1.26  {
    1.27 -	mkdir -p $fs/usr/lib $fs/usr/bin $fs/usr/share
    1.28 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.29 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.30 -	cp -a $install/usr/lib/glib* $fs/usr/lib
    1.31 -	cp -a $install/usr/include $fs/usr
    1.32 -	cp -a $install/usr/share/aclocal $fs/usr/share
    1.33 -	cp -a $install/usr/share/glib-2.0 $fs/usr/share
    1.34 -	cp -a $install/usr/share/gdb $fs/usr/share
    1.35 +	mkdir -p $fs/usr/lib
    1.36 +	mkdir -p $fs/usr/bin
    1.37 +	mkdir -p $fs/usr/share
    1.38 +
    1.39 +#	cp -a $install/usr/lib/*.*a $fs/usr/lib	not supported in 2.62.4
    1.40 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    1.41 +	cp -a $install/usr/lib/glib*	$fs/usr/lib
    1.42 +	cp -a $install/usr/include	$fs/usr
    1.43 +	cp -a $install/usr/share/aclocal	$fs/usr/share
    1.44 +	cp -a $install/usr/share/glib-2.0	$fs/usr/share
    1.45 +	cp -a $install/usr/share/gdb	$fs/usr/share
    1.46  
    1.47  	# Python codegen, tester, compile, Perl mkenums
    1.48  	#cp -a $install/usr/lib/gdbus-2.0 $fs/usr/lib
    1.49  	for bin in gdbus-codegen gtester* glib-mkenums
    1.50 -	do
    1.51 +	  do
    1.52  		cp -a $install/usr/bin/$bin $fs/usr/bin
    1.53 -	done
    1.54 +	  done
    1.55  
    1.56  	# Remove libgio-dev
    1.57 -	rm -rf $fs/usr/lib/libgio*.*a
    1.58 -	rm -rf $fs/usr/include/gio-unix-2.0
    1.59 -	rm $fs/usr/lib/pkgconfig/gio*.pc
    1.60 +#	rm -rf	$fs/usr/lib/libgio*.*a		not supported in 2.62.4
    1.61 +	rm -rf				$fs/usr/include/gio-unix-2.0
    1.62 +	rm				$fs/usr/lib/pkgconfig/gio*.pc
    1.63  
    1.64  	# exclude from files.list (for tazpkg-find-depends)
    1.65  	cd $fs/usr/share/gdb/auto-load
    1.66 -	for i in $(ls *.py);do mv -f $i ${i//./-.-};done
    1.67 +	for i in $(ls *.py)
    1.68 +	  do
    1.69 +		mv -f $i ${i//./-.-}
    1.70 +	  done
    1.71  }
    1.72 +
    1.73  post_install()
    1.74  {
    1.75  	cd $1/usr/share/gdb/auto-load
    1.76 -	for i in $(ls *.-py);do mv -f $i ${i//-.-/.};done
    1.77 +	for i in $(ls *.-py)
    1.78 +	  do
    1.79 +		mv -f $i ${i//-.-/.}
    1.80 +	  done
    1.81  }
    1.82 -
     2.1 --- a/glib/receipt	Fri Nov 15 17:49:31 2019 +0100
     2.2 +++ b/glib/receipt	Wed Sep 09 13:48:24 2020 +0100
     2.3 @@ -1,41 +1,44 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="glib"
     2.7 -VERSION="2.43.3"
     2.8 +VERSION="2.62.4"
     2.9  CATEGORY="x-window"
    2.10  SHORT_DESC="C routines."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12  LICENSE="GPL2"
    2.13 +WEB_SITE="https://www.gtk.org/"
    2.14 +
    2.15  TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.16 -WEB_SITE="http://www.gtk.org/"
    2.17  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    2.18 +
    2.19 +DEPENDS="elfutils libffi libxml2 pcre"
    2.20 +BUILD_DEPENDS="cmake elfutils-dev gettext libffi-dev libxml2-dev
    2.21 +	libxml2-tools meson ninja pcre-dev perl python-dev
    2.22 +	util-linux-mount-dev zlib-dev"
    2.23 +
    2.24  HOST_ARCH="i486 arm"
    2.25  
    2.26 -DEPENDS="pcre libffi libxml2 elfutils"
    2.27 -BUILD_DEPENDS="pcre-dev libffi-dev gettext zlib-dev perl python-dev \
    2.28 -elfutils-dev libxml2-dev libxml2-tools automake"
    2.29 -
    2.30  # Handle cross comilation. Use host Perl, Python, etc
    2.31  case "$ARCH" in
    2.32  	arm*)
    2.33  		BUILD_DEPENDS="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev" ;;
    2.34  esac
    2.35  
    2.36 +# @maintainer:	Please update also libgio and libgio-dev
    2.37 +
    2.38  # Rules to configure and make the package.
    2.39  compile_rules()
    2.40  {
    2.41  	case "$ARCH" in
    2.42  		i?86)
    2.43 -			./configure \
    2.44 -				--sysconfdir=/etc \
    2.45 -				--with-pcre=system \
    2.46 -				$CONFIGURE_ARGS ;;
    2.47 +			meson . _build --prefix=/usr ;;
    2.48  		arm*)
    2.49 +			# not updated for 2.62.4 !
    2.50  			# Native ARM build --> if ARCH != SLITAZ_ARCH ?
    2.51  			export LD_LIBRARY_PATH=/cross/$ARCH/sysroot/usr/lib:/usr/lib:/lib
    2.52  			export PKG_CONFIG_PATH=/cross/$ARCH/sysroot/usr/lib/pkgconfig
    2.53  			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib -Wl,-rpath=/cross/$ARCH/sysroot/usr/lib"
    2.54 -			
    2.55 +
    2.56  			# Glib
    2.57  			export glib_cv_stack_grows=${glib_cv_stack_grows=no}
    2.58  			export glib_cv_uscore=${glib_cv_uscore=no}
    2.59 @@ -52,30 +55,24 @@
    2.60  				--enable-shared=yes \
    2.61  				--enable-static=yes \
    2.62  				--disable-rpath ;;
    2.63 -	esac && 
    2.64 -	make && make install
    2.65 +	esac &&
    2.66 +	ninja -C _build &&
    2.67 +	ninja -C _build install
    2.68  }
    2.69  
    2.70  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.71  genpkg_rules()
    2.72  {
    2.73  	mkdir -p $fs/usr/lib
    2.74 -	cp -a $install/usr/bin $fs/usr
    2.75 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.76 -	
    2.77 +	cp -a $install/usr/bin		$fs/usr
    2.78 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
    2.79 +
    2.80  	# Split gio --> libgio
    2.81 -	rm $fs/usr/lib/libgio*
    2.82 -	
    2.83 +	rm				$fs/usr/lib/libgio*
    2.84 +
    2.85  	# Python codegen, tester, Perl mkenums --> glib-dev
    2.86  	for bin in gdbus-codegen gtester* glib-mkenums
    2.87 -	do
    2.88 +	  do
    2.89  		rm $fs/usr/bin/$bin
    2.90 -	done
    2.91 -	
    2.92 -	# Cook packages that want glib.
    2.93 -	for w in libgio libgio-dev
    2.94 -	do
    2.95 -		[ -x "/usr/bin/cook" ] && echo cook $w
    2.96 -	done
    2.97 +	  done
    2.98  }
    2.99 -