wok-next diff glib/receipt @ rev 19778

glib: no more libgio package:
As ldd show, libgio-2.0.so (from former libgio package) depends on libgobject-2.0.so.0, libgmodule-2.0.so.0, libglib-2.0.so.0 (from former glib package): libgio package depends on glib package.
In other hand, binaries from former glib package (gsettings, gapplication, gresource, gio-querymodules, glib-compile-resources, gdbus, gio) depends on libglib-2.0.so.0: glib package depends on libgio package.

Solution: packages was combined. Use 'glib' instead of 'libgio', as well as glib-dev instead of libgio-dev.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jun 16 14:56:07 2017 +0300 (2017-06-16)
parents 107066b600c7
children 5ff41aaf68d9
line diff
     1.1 --- a/glib/receipt	Sat Jun 10 12:36:39 2017 +0300
     1.2 +++ b/glib/receipt	Fri Jun 16 14:56:07 2017 +0300
     1.3 @@ -15,7 +15,7 @@
     1.4  BUILD_DEPENDS="perl indent python zlib-dev libffi-dev gettext-tools elfutils-dev \
     1.5  pcre-dev gtk-doc libxslt libxml2-tools dbus-dev util-linux-mount-dev"
     1.6  BUILD_DEPENDS_arm="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev"
     1.7 -SPLIT="libgio glib libgio-dev glib-dev"
     1.8 +SPLIT="glib-dev"
     1.9  
    1.10  # Rules to configure and make the package.
    1.11  compile_rules()
    1.12 @@ -63,27 +63,19 @@
    1.13  genpkg_rules()
    1.14  {
    1.15  	case $PACKAGE in
    1.16 -		libgio)
    1.17 -			copy libgio*.so*
    1.18 -			CAT="libs|libgio shared library"
    1.19 -			;;
    1.20  		glib)
    1.21 -			copy bin/ *.so*
    1.22 -			remove_already_packed
    1.23 +			copy @std
    1.24  			# Python codegen, tester, Perl mkenums --> glib-dev
    1.25  			cd $fs/usr/bin; rm gdbus-codegen gtester* glib-mkenums
    1.26 -			DEPENDS="pcre libffi libxml2 elfutils"
    1.27 -			;;
    1.28 -		libgio-dev)
    1.29 -			copy *-2.0/gio/ libgio*.*a gio*.pc
    1.30 -			CAT="development|libgio development files"
    1.31 -			DEPENDS="libgio"
    1.32 +			rm -r $fs/usr/share
    1.33 +			DEPENDS="elfutils libffi pcre util-linux-blkid util-linux-mount \
    1.34 +			util-linux-uuid zlib"
    1.35  			;;
    1.36  		glib-dev)
    1.37  			copy @std @dev
    1.38  			remove_already_packed
    1.39 -			DEPENDS="glib perl python libffi-dev libgio libgio-dev pcre-dev \
    1.40 -			pkg-config"
    1.41 +			DEPENDS="glib glibc-dev libffi-dev pcre-dev util-linux-blkid-dev \
    1.42 +			util-linux-mount-dev util-linux-uuid-dev zlib-dev perl python"
    1.43  			;;
    1.44  	esac
    1.45  }