bumb version glib2-2.56.3

diff --git a/make/libraries.mk b/make/libraries.mk
index cb402ab1805350b28cff193dfd68d73e6f673dd9..e297897ad997795f4c49f2369ffa59ffbdcd9043 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -1195,6 +1195,9 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz
 #
 # libglib2
 #
+GLIB2_PATCH  = libglib2-disable-tests.patch
+GLIB2_PATCH += libglib2-automake.patch
+
 ifeq ($(BOXSERIES), hd2)
 ICONV_CONF = --with-libiconv=gnu
 LIBGLIB2_DEPS = $(D)/gettext
@@ -1208,25 +1211,27 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(LIBGLIB2_DEPS) $(ARCHIVE)/glib-$(LIBGLIB2
        $(REMOVE)/glib-$(LIBGLIB2_VER)
        $(UNTAR)/glib-$(LIBGLIB2_VER).tar.xz
        set -e; cd $(BUILD_TMP)/glib-$(LIBGLIB2_VER); \
-               echo "glib_cv_va_copy=no" > config.cache; \
-               echo "glib_cv___va_copy=yes" >> config.cache; \
-               echo "glib_cv_va_val_copy=yes" >> config.cache; \
-               echo "ac_cv_func_posix_getpwuid_r=yes" >> config.cache; \
-               echo "ac_cv_func_posix_getgrgid_r=yes" >> config.cache; \
-               echo "glib_cv_stack_grows=no" >> config.cache; \
-               echo "glib_cv_uscore=no" >> config.cache; \
-               $(PATCH)/libglib2-disable-tests.patch; \
+               $(call apply_patches, $(BUSYBOX_PATCHES)); \
+               echo "ac_cv_type_long_long=yes"          > config.cache; \
+               echo "glib_cv_stack_grows=no"           >> config.cache; \
+               echo "glib_cv_uscore=no"                >> config.cache; \
+               echo "glib_cv_va_copy=no"               >> config.cache; \
+               echo "glib_cv_va_val_copy=yes"          >> config.cache; \
+               echo "ac_cv_func_posix_getpwuid_r=yes"  >> config.cache; \
+               echo "ac_cv_func_posix_getgrgid_r=yes"  >> config.cache; \
                autoreconf -fi; \
                $(CONFIGURE) \
                        --prefix= \
                        --bindir=/.remove \
                        --datarootdir=/.remove \
                        --cache-file=config.cache \
+                       --disable-debug \
                        --disable-fam \
-                       --enable-libmount=no \
+                       --disable-libmount \
                        --disable-selinux \
-                       --enable-man=no \
+                       --disable-gtk-doc \
                        --disable-gtk-doc-html \
+                       --disable-compile-warnings \
                        --with-threads="posix" \
                        --with-html-dir=/.remove \
                        --with-pcre=internal \
@@ -1235,6 +1240,7 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(LIBGLIB2_DEPS) $(ARCHIVE)/glib-$(LIBGLIB2
                ; \
                $(MAKE) all; \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
+       rm -f $(addprefix $(TARGETPREFIX)/bin/,gapplication gdbus* gio* glib* gobject-query gresource gsettings gtester*)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/glib-2.0.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gmodule-2.0.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gio-2.0.pc

diff --git a/make/versions.mk b/make/versions.mk
index 5ca40c4b0ef40eb43629c71208ae0f5d22001e96..e040fa474723fb55fea76ed9ba1c952a05c2c1b2 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -125,8 +125,8 @@ FUSE_VER = 2.9.8
 
 # GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on
 LIBGLIB2_VER_MAJOR = 2
-LIBGLIB2_VER_MINOR = 55
-LIBGLIB2_VER_MICRO = 0
+LIBGLIB2_VER_MINOR = 56
+LIBGLIB2_VER_MICRO = 3
 LIBGLIB2_VER = $(LIBGLIB2_VER_MAJOR).$(LIBGLIB2_VER_MINOR).$(LIBGLIB2_VER_MICRO)
 
 # libpng; reference library for reading and writing PNGs