wok-next rev 20730

glib: up (2.56.1) with static libs and Python2
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue May 29 15:17:41 2018 +0300 (2018-05-29)
parents a9eb510ef2ad
children a3200eb95e1d
files glib/receipt glib/stuff/patches/noisy-glib-compile-schemas.diff glib/stuff/patches/series
line diff
     1.1 --- a/glib/receipt	Tue May 29 14:14:46 2018 +0300
     1.2 +++ b/glib/receipt	Tue May 29 15:17:41 2018 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="glib"
     1.7 -VERSION="2.54.3"
     1.8 +VERSION="2.56.1"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="C routines"
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -12,29 +12,21 @@
    1.13  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.14  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    1.15  
    1.16 -BUILD_DEPENDS="meson ninja locale-en-base pcre-dev libffi-dev zlib-dev gettext \
    1.17 -util-linux-mount-dev libxml2-tools elfutils-dev dbus-dev libxslt docbook-xsl"
    1.18 -SPLIT="glib-dev"
    1.19 +BUILD_DEPENDS="automake libtool zlib-dev libffi-dev gettext   elfutils-dev \
    1.20 +gtk-doc libxslt docbook-xsl dbus-dev"
    1.21 +SPLIT="glib-static glib-dev"
    1.22  
    1.23  compile_rules() {
    1.24 -	mkdir -p /usr/lib/locale
    1.25 -	localedef -i 'en_US' -c -f 'UTF-8' /usr/lib/locale/en_US.UTF-8
    1.26 -	export LC_ALL=en_US.UTF-8 LANG=en_US
    1.27 -
    1.28 -	mkdir build-glib
    1.29 -	cd    build-glib
    1.30 -
    1.31 -	meson-wrapper \
    1.32 -		-Dwith-pcre=system \
    1.33 -		-Dwith-docs=no \
    1.34 -		&&
    1.35 -	ninja &&
    1.36 -	ninja install || return 1
    1.37 -
    1.38 -	# fix -rw-rw-r-- (0664) and -rwxrwxr-x (0775)
    1.39 -	find $install -type f -perm +020 -exec chmod g-w '{}' \;
    1.40 -	# fix gdbus-codegen and glib-gettextize permissions (was 0644)
    1.41 -	find $install/usr/bin -type f -exec chmod 0755 '{}' \;
    1.42 +	# --enable-static: desktop-file-validate-static require such lib
    1.43 +	NOCONFIGURE=1 ./autogen.sh &&
    1.44 +	./configure \
    1.45 +		--enable-debug=no \
    1.46 +		--enable-static \
    1.47 +		--disable-fam \
    1.48 +		$CONFIGURE_ARGS &&
    1.49 +	fix libtool &&
    1.50 +	make &&
    1.51 +	make install
    1.52  }
    1.53  
    1.54  genpkg_rules() {
    1.55 @@ -47,9 +39,14 @@
    1.56  			rm -r $fs/usr/share
    1.57  			DEPENDS="elfutils libffi libpcre util-linux-mount zlib"
    1.58  			;;
    1.59 +		glib-static)
    1.60 +			copy *.a
    1.61 +			DEPENDS=" "
    1.62 +			CAT="development|static libraries"
    1.63 +			;;
    1.64  		glib-dev)
    1.65  			copy @std @dev @rm
    1.66 -			DEPENDS="glib glibc-dev libffi-dev pcre-dev python3 \
    1.67 +			DEPENDS="glib glibc-dev libffi-dev pcre-dev python \
    1.68  			util-linux-mount-dev zlib-dev perl"
    1.69  			;;
    1.70  	esac
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/glib/stuff/patches/noisy-glib-compile-schemas.diff	Tue May 29 15:17:41 2018 +0300
     2.3 @@ -0,0 +1,24 @@
     2.4 +diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c
     2.5 +index b8de0907248f6860..130f89b1728f7932 100644
     2.6 +--- i/gio/glib-compile-schemas.c
     2.7 ++++ w/gio/glib-compile-schemas.c
     2.8 +@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState  *state,
     2.9 +       return;
    2.10 +     }
    2.11 + 
    2.12 +-  if (path && (g_str_has_prefix (path, "/apps/") ||
    2.13 +-               g_str_has_prefix (path, "/desktop/") ||
    2.14 +-               g_str_has_prefix (path, "/system/")))
    2.15 +-    {
    2.16 +-      gchar *message = NULL;
    2.17 +-      message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”.  "
    2.18 +-                                   "Paths starting with "
    2.19 +-                                   "“/apps/”, “/desktop/” or “/system/” are deprecated."),
    2.20 +-                                 id, path);
    2.21 +-      g_printerr ("%s\n", message);
    2.22 +-      g_free (message);
    2.23 +-    }
    2.24 +-
    2.25 +   state->schema_state = schema_state_new (path, gettext_domain,
    2.26 +                                           extends, extends_name, list_of);
    2.27 + 
     3.1 --- a/glib/stuff/patches/series	Tue May 29 14:14:46 2018 +0300
     3.2 +++ b/glib/stuff/patches/series	Tue May 29 15:17:41 2018 +0300
     3.3 @@ -1,3 +1,6 @@
     3.4  # from BLFS
     3.5 -glib-2.54.3-meson_fixes-1.patch
     3.6 -glib-2.54.3-skip_warnings-1.patch
     3.7 +#glib-2.54.3-meson_fixes-1.patch
     3.8 +#glib-2.54.3-skip_warnings-1.patch
     3.9 +
    3.10 +# from https://www.archlinux.org/packages/core/x86_64/glib2/
    3.11 +noisy-glib-compile-schemas.diff