From: Markham Date: Tue, 27 Mar 2018 15:05:14 +0000 (+0200) Subject: bump version libglib2-2.55.0; fix libglib2 for hd2 X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=59bd36b64f1bad6edecd005ac53da91c2636e4c5;p=bs-cst-neutrino-hd.git bump version libglib2-2.55.0; fix libglib2 for hd2 --- diff --git a/archive-patches/libglib2-2.54.0-disable-tests.patch b/archive-patches/libglib2-2.54.0-disable-tests.patch deleted file mode 100644 index 0bbcc23..0000000 --- a/archive-patches/libglib2-2.54.0-disable-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -244,7 +244,7 @@ - platform_deps += win32/libgiowin32.la - endif - --SUBDIRS += . tests -+SUBDIRS += . - - if HAVE_FAM - SUBDIRS += fam ---- a/glib/Makefile.am -+++ b/glib/Makefile.am -@@ -33,8 +33,8 @@ - MAYBE_PCRE = pcre - endif - --SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests --DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests -+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . -+DIST_SUBDIRS = libcharset gnulib pcre update-pcre - - AM_CPPFLAGS = \ - $(glib_INCLUDES) \ ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,8 +6,8 @@ - - ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} - --SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests --DIST_SUBDIRS = $(SUBDIRS) build win32 -+SUBDIRS = . m4macros glib gmodule gthread gobject gio -+DIST_SUBDIRS = $(SUBDIRS) build - - bin_SCRIPTS = glib-gettextize - ---- a/configure.ac -+++ b/configure.ac -@@ -63,7 +63,7 @@ - # Save this value here, since automake will set cflags later - cflags_set=${CFLAGS:+set} - --AM_INIT_AUTOMAKE([1.11 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar]) -+AM_INIT_AUTOMAKE([1.15 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar]) - AM_MAINTAINER_MODE([enable]) - - # Support silent build rules. Disable - diff --git a/archive-patches/libglib2-disable-tests.patch b/archive-patches/libglib2-disable-tests.patch new file mode 100644 index 0000000..523ebb3 --- /dev/null +++ b/archive-patches/libglib2-disable-tests.patch @@ -0,0 +1,60 @@ +From ee2d6609bce808ac72afdbf86db1a6e27c78171e Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Wed, 21 Jun 2017 16:37:54 -0400 +Subject: [PATCH] disable tests + +Disable tests, some of them need python and sometimes host-python +gets mixed with distro python leading to build failures. + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Adam Duskett +--- + Makefile.am | 2 +- + gio/Makefile.am | 2 +- + glib/Makefile.am | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 008ad58..007332d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk + + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} + +-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests ++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs + DIST_SUBDIRS = $(SUBDIRS) build win32 + + bin_SCRIPTS = glib-gettextize +diff --git a/gio/Makefile.am b/gio/Makefile.am +index 67db1b7..78309b5 100644 +--- a/gio/Makefile.am ++++ b/gio/Makefile.am +@@ -244,7 +244,7 @@ platform_libadd += win32/libgiowin32.la + platform_deps += win32/libgiowin32.la + endif + +-SUBDIRS += . tests ++SUBDIRS += . + + if HAVE_FAM + SUBDIRS += fam +diff --git a/glib/Makefile.am b/glib/Makefile.am +index d755853..61166e5 100644 +--- a/glib/Makefile.am ++++ b/glib/Makefile.am +@@ -33,8 +33,8 @@ else + MAYBE_PCRE = pcre + endif + +-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests +-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests ++SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . ++DIST_SUBDIRS = libcharset gnulib pcre update-pcre + + AM_CPPFLAGS = \ + $(glib_INCLUDES) \ +-- +2.9.4 + diff --git a/make/applications.mk b/make/applications.mk index 26d7194..cf3e2ed 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -753,7 +753,7 @@ $(D)/mc: $(D)/libncurses $(D)/libglib2 $(ARCHIVE)/mc-$(MC_VER).tar.xz | $(TARGET $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ - --sysconfdir=/var/etc \ + --sysconfdir=/etc \ --with-homedir=/var/tuxbox/config/mc \ --without-gpm-mouse \ --disable-doxygen-doc \ @@ -768,7 +768,7 @@ $(D)/mc: $(D)/libncurses $(D)/libglib2 $(ARCHIVE)/mc-$(MC_VER).tar.xz | $(TARGET $(MAKE) install DESTDIR=$(TARGETPREFIX) rm -rf $(TARGETPREFIX)/usr/share/mc/examples find $(TARGETPREFIX)/usr/share/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm - $(REMOVE)/mc-$(MC_VER) + $(REMOVE)/mc-$(MC_VER) $(TARGETPREFIX)/.remove $(TOUCH) # diff --git a/make/libraries.mk b/make/libraries.mk index 528a895..0bf9737 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -879,6 +879,9 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz # # libglib2 # +ifeq ($(BOXSERIES), hd2) +ICONV_CONF = --with-libiconv=gnu +endif $(D)/libglib2: $(D)/zlib $(D)/libffi $(ARCHIVE)/glib-$(LIBGLIB2_VER).tar.xz $(START_BUILD) $(REMOVE)/glib-$(LIBGLIB2_VER) @@ -891,19 +894,23 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(ARCHIVE)/glib-$(LIBGLIB2_VER).tar.xz 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-$(LIBGLIB2_VER)-disable-tests.patch; \ + $(PATCH)/libglib2-disable-tests.patch; \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --enable-static \ - --mandir=/.remove \ + --bindir=/.remove \ + --datarootdir=/.remove \ --cache-file=config.cache \ --disable-fam \ - --disable-libmount \ - --disable-gtk-doc \ + --enable-libmount=no \ + --disable-selinux \ + --enable-man=no \ --disable-gtk-doc-html \ --with-threads="posix" \ --with-html-dir=/.remove \ --with-pcre=internal \ + $(ICONV_CONF) \ ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGETPREFIX) @@ -925,7 +932,8 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(ARCHIVE)/glib-$(LIBGLIB2_VER).tar.xz $(REWRITE_LIBTOOLDEP)/libgio-2.0.la $(REWRITE_LIBTOOLDEP)/libgobject-2.0.la $(REWRITE_LIBTOOLDEP)/libgthread-2.0.la - $(REMOVE)/glib-$(LIBGLIB2_VER) + rm -rf $(TARGETLIB)/libgio* $(TARGETLIB)/libgmodule* $(TARGETLIB)/libgobject* $(TARGETLIB)/libgthread* + $(REMOVE)/glib-$(LIBGLIB2_VER) $(TARGETPREFIX)/.remove $(TOUCH) $(D)/timezone: $(ARCHIVE)/tzdata$(TZ_VER).tar.gz | find-zic $(TARGETPREFIX) diff --git a/make/versions.mk b/make/versions.mk index e363368..f812691 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -87,7 +87,7 @@ LIBFFI_VER = 3.2.1 # 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 = 54 +LIBGLIB2_VER_MINOR = 55 LIBGLIB2_VER_MICRO = 0 LIBGLIB2_VER = $(LIBGLIB2_VER_MAJOR).$(LIBGLIB2_VER_MINOR).$(LIBGLIB2_VER_MICRO)