Merge branch 'update-glib'

[Lluixhi Scura]
- Update glib and glibmm to 2.41.2

[Timothy Gu]
- Update glib and glibmm to 2.42.0

This merges pull request #453.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

4 files changed, 44 insertions, 101 deletions

diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch
index 5325ca1..60273c9 100644
--- a/src/glib-1-fixes.patch
+++ b/src/glib-1-fixes.patch
@@ -131,27 +131,22 @@ Subject: [PATCH 4/8] Allow building without inotify support
 diff -ur a/configure.ac b/configure.ac
 --- a/configure.ac	2013-06-10 00:53:13.000000000 +0200
 +++ b/configure.ac	2013-06-29 05:23:45.264680443 +0200
-@@ -1726,11 +1726,17 @@
+@@ -1672,9 +1672,15 @@
  dnl ** Check for inotify (GIO) **
  dnl *****************************
  inotify_support=no
--AC_CHECK_HEADERS([sys/inotify.h],
--[
-+AC_ARG_ENABLE(inotify,
-+              AC_HELP_STRING([--disable-inotify],
-+                             [build without inotify support]))
++ AC_ARG_ENABLE(inotify,
++               AC_HELP_STRING([--disable-inotify],
++                              [build without inotify support]))
 +
-+if test "x$enable_inotify" != "xno"; then
-+  AC_CHECK_HEADERS([sys/inotify.h],
-+  [
- 	inotify_support=yes
- 	AC_CHECK_FUNCS(inotify_init1)
--])
-+  ])
++ if test "x$enable_inotify" != "xno"; then
+ AC_CHECK_HEADERS([sys/inotify.h],
+ [
+   AC_CHECK_FUNCS(inotify_init1, [inotify_support=yes], [inotify_support=no])
+ ])
 +fi
  
  AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"])
- 
 
 
 From 5ec5d101cb75c096f39228da85d2caba52b9002f Mon Sep 17 00:00:00 2001
@@ -184,13 +179,13 @@ Subject: [PATCH 6/8] Link with dnsapi
 diff -ur a/gio-2.0.pc.in b/gio-2.0.pc.in
 --- a/gio-2.0.pc.in	2013-01-20 20:48:44.000000000 +0100
 +++ b/gio-2.0.pc.in	2013-06-29 05:25:16.328684390 +0200
-@@ -13,6 +13,6 @@
+@@ -16,6 +16,6 @@
  Version: @VERSION@
  Requires: glib-2.0 gobject-2.0
  Requires.private: gmodule-no-export-2.0
 -Libs: -L${libdir} -lgio-2.0
 +Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi
- Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@
+ Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@
  Cflags:
 
 
@@ -602,24 +597,24 @@ diff -urN a/autogen.sh b/autogen.sh
 diff -urN a/configure.ac b/configure.ac
 --- a/configure.ac	2013-10-15 21:14:26.000000000 +0200
 +++ b/configure.ac	2013-11-09 06:18:17.274631022 +0100
-@@ -2710,13 +2710,6 @@
+@@ -2579,13 +2579,6 @@
  dnl **************************
  dnl *** Checks for gtk-doc ***
  dnl **************************
 -# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
 -# it on it's own line.
 -m4_ifdef([GTK_DOC_CHECK], [
--GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+-GTK_DOC_CHECK([1.20], [--flavour no-tmpl])
 -],[
 -AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
 -])
  
  AC_ARG_ENABLE(man,
-               [AS_HELP_STRING([--enable-man],
+              [AS_HELP_STRING([--enable-man],
 diff -urN a/docs/Makefile.am b/docs/Makefile.am
 --- a/docs/Makefile.am	2013-08-08 12:00:40.000000000 +0200
 +++ b/docs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
+@@ -1,11 +0,0 @@
 -## Process this file with automake to produce Makefile.in
 -
 -SUBDIRS = reference
@@ -631,7 +626,6 @@ diff -urN a/docs/Makefile.am b/docs/Makefile.am
 -	  echo $$p; \
 -	done
 -
--.PHONY: test test-report perf-report full-report
 diff -urN a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
 --- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am	2013-08-08 12:00:40.000000000 +0200
 +++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am	1970-01-01 01:00:00.000000000 +0100
@@ -706,7 +700,7 @@ diff -urN a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/r
 diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
 --- a/docs/reference/gio/Makefile.am	2013-08-08 12:00:40.000000000 +0200
 +++ b/docs/reference/gio/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-@@ -1,178 +0,0 @@
+@@ -1,184 +0,0 @@
 -NULL =
 -
 -SUBDIRS = gdbus-object-manager-example
@@ -768,6 +762,8 @@ diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
 -	gnetworkingprivate.h		\
 -	gnetworkmonitorbase.h		\
 -	gnetworkmonitornetlink.h	\
+-	gnotificationbackend.h		\
+-	gnotification-private.h		\
 -	gpollfilemonitor.h		\
 -	gregistrysettingsbackend.h	\
 -	gsettingsbackendinternal.h	\
@@ -778,6 +774,7 @@ diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
 -	gsocks4aproxy.h			\
 -	gsocks4proxy.h			\
 -	gsocks5proxy.h			\
+-	gsubprocesslauncher-private.h	\
 -	gthreadedresolver.h		\
 -	gunionvolumemonitor.h		\
 -	gunixmount.h			\
@@ -787,7 +784,8 @@ diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
 -	gwin32appinfo.h			\
 -	gwin32mount.h			\
 -	gwin32resolver.h		\
--	gwin32volumemonitor.h
+-	gwin32volumemonitor.h		\
+-	thumbnail-verify.h
 -
 -
 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
@@ -804,7 +802,7 @@ diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
 -	$(NULL)
 -
 -# Extra options to supply to gtkdoc-mkdb
--MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
+-MKDB_OPTIONS = --output-format=xml --name-space=g \
 -	--ignore-files='libasyncns tests'
 -
 -# Images to copy into HTML directory
@@ -823,6 +821,7 @@ diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
 -	gio-querymodules.xml	\
 -	glib-compile-schemas.xml\
 -	glib-compile-resources.xml	\
+-	gapplication.xml	\
 -	gsettings.xml		\
 -	gresource.xml		\
 -	gdbus.xml		\
@@ -855,6 +854,7 @@ diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
 -if ENABLE_MAN
 -
 -man_MANS +=			\
+-	gapplication.1		\
 -	gio-querymodules.1	\
 -	glib-compile-schemas.1	\
 -	glib-compile-resources.1	\
@@ -888,7 +888,7 @@ diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
 diff -urN a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
 --- a/docs/reference/glib/Makefile.am	2013-08-08 12:00:40.000000000 +0200
 +++ b/docs/reference/glib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-@@ -1,127 +0,0 @@
+@@ -1,135 +0,0 @@
 -## Process this file with automake to produce Makefile.in
 -
 -AUTOMAKE_OPTIONS = 1.6
@@ -906,7 +906,7 @@ diff -urN a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR|G_GNUC_WARN_UNUSED_RESULT"
 -
 -# Extra options to supply to gtkdoc-mkdb
--MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
+-MKDB_OPTIONS=--output-format=xml --name-space=g
 -
 -# Used for dependencies
 -HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h
@@ -944,9 +944,13 @@ diff -urN a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
 -	gwakeup.h
 -
 -# Images to copy into HTML directory
--HTML_IMAGES =  				\
--	file-name-encodings.png		\
--	mainloop-states.gif
+-HTML_IMAGES =  						\
+-	file-name-encodings.png				\
+-	mainloop-states.gif				\
+-	Sorted_binary_tree_breadth-first_traversal.svg 	\
+-	Sorted_binary_tree_inorder.svg 			\
+-	Sorted_binary_tree_postorder.svg 		\
+-	Sorted_binary_tree_preorder.svg
 -
 -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 -content_files =				\
@@ -981,6 +985,10 @@ diff -urN a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
 -	mainloop-states.fig		\
 -	mainloop-states.png		\
 -	mainloop-states.eps		\
+-	Sorted_binary_tree_breadth-first_traversal.svg 	\
+-	Sorted_binary_tree_inorder.svg 			\
+-	Sorted_binary_tree_postorder.svg 		\
+-	Sorted_binary_tree_preorder.svg			\
 -	version.xml.in
 -
 -########################################################################
@@ -1038,7 +1046,7 @@ diff -urN a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile
 -             --ignore-decorators="G_GNUC_INTERNAL|G_GNUC_WARN_UNUSED_RESULT"
 -
 -# Extra options to supply to gtkdoc-mkdb
--MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
+-MKDB_OPTIONS=--output-format=xml --name-space=g
 -
 -# Used for dependencies
 -HFILE_GLOB=$(top_srcdir)/gobject/*.h
diff --git a/src/glib.mk b/src/glib.mk
index bc9bedd..c9a3342 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -3,8 +3,8 @@
 
 PKG             := glib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.38.2
-$(PKG)_CHECKSUM := 685c5a4215b776b83dd5330ab9084c5dcb0a51b8
+$(PKG)_VERSION  := 2.42.0
+$(PKG)_CHECKSUM := f5168a7adffad3620ff3f1b3d6ff6d0ad3f0752e
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
@@ -13,6 +13,7 @@ $(PKG)_DEPS     := gcc gettext pcre libiconv zlib libffi dbus
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://git.gnome.org/browse/glib/refs/tags' | \
     $(SED) -n "s,.*tag/?id=\([0-9]\+\.[0-9]*[02468]\.[^']*\).*,\1,p" | \
+    $(SORT) -Vr | \
     head -1
 endef
 
diff --git a/src/glibmm-1-fixes.patch b/src/glibmm-1-fixes.patch
deleted file mode 100644
index 6197b0b..0000000
--- a/src/glibmm-1-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Taken from https://git.gnome.org/browse/glibmm/commit/?id=fb0bf14a29b80a0843e1e5dd1b5c5345d3839c93
-
-From a53dd20596df824423088d70aa2c3ca262346cd5 Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
-Date: Tue, 2 Sep 2014 20:12:21 -0700
-Subject: [PATCH] Gio::DBus: Don't use parameter name 'interface'
-
-* gio/src/dbusmessage.hg:
-* gio/src/dbusobject.hg: Change parameter name 'interface' to 'iface',
-to avoid compilation errors with MinGW. Bug #735137.
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-
-diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
-index 3ca2511..926e7fb 100644
---- a/gio/src/dbusmessage.hg
-+++ b/gio/src/dbusmessage.hg
-@@ -1,5 +1,3 @@
--// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
--
- /* Copyright (C) 2010 The giomm Development Team
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -67,8 +65,11 @@ public:
-   // They are generally UTF-8 that can only contain the ASCII subset,
-   // so ustring still seems preferrable to std::string, which generally implies an unknown endoding for us.
- 
--  _WRAP_METHOD(static Glib::RefPtr<Message> create_signal(const Glib::ustring& path, const Glib::ustring& interface, const Glib::ustring& signal), g_dbus_message_new_signal)
--  _WRAP_METHOD(static Glib::RefPtr<Message> create_method_call(const Glib::ustring& name, const Glib::ustring& path, const Glib::ustring& interface, const Glib::ustring& method), g_dbus_message_new_method_call)
-+  // The parameter name 'interface' can cause compilation errors with MinGW.
-+  // See https://bugzilla.gnome.org/show_bug.cgi?id=735137
-+  // The parameter name in glib is 'interface_'.
-+  _WRAP_METHOD(static Glib::RefPtr<Message> create_signal(const Glib::ustring& path, const Glib::ustring& iface, const Glib::ustring& signal), g_dbus_message_new_signal)
-+  _WRAP_METHOD(static Glib::RefPtr<Message> create_method_call(const Glib::ustring& name, const Glib::ustring& path, const Glib::ustring& iface, const Glib::ustring& method), g_dbus_message_new_method_call)
-   _WRAP_METHOD(static Glib::RefPtr<Message> create_method_reply(const Glib::RefPtr<Message>& method_call_message), g_dbus_message_new_method_reply)
-   _WRAP_METHOD(static Glib::RefPtr<Message> create_method_error_literal(const Glib::RefPtr<const Message>& method_call_message, const Glib::ustring& error_name, const Glib::ustring& error_message), g_dbus_message_new_method_error_literal)
- 
-diff --git a/gio/src/dbusobject.hg b/gio/src/dbusobject.hg
-index a1e47d6..5431004 100644
---- a/gio/src/dbusobject.hg
-+++ b/gio/src/dbusobject.hg
-@@ -1,5 +1,3 @@
--// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
--
- /* Copyright (C) 2012 The giomm Development Team
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -62,8 +60,11 @@ public:
- 
- #m4 _CONVERSION(`GDBusInterface*',`const Glib::RefPtr<Gio::DBus::Interface>&',`Glib::wrap($3, true)')
- 
--  _WRAP_SIGNAL(void interface_added(const Glib::RefPtr<Gio::DBus::Interface>& interface), "interface_added")
--  _WRAP_SIGNAL(void interface_removed(const Glib::RefPtr<Gio::DBus::Interface>& interface), "interface_removed")
-+  // The parameter name 'interface' can cause compilation errors with MinGW.
-+  // See https://bugzilla.gnome.org/show_bug.cgi?id=735137
-+  // The parameter name in glib is 'interface_'.
-+  _WRAP_SIGNAL(void interface_added(const Glib::RefPtr<Gio::DBus::Interface>& iface), "interface_added")
-+  _WRAP_SIGNAL(void interface_removed(const Glib::RefPtr<Gio::DBus::Interface>& iface), "interface_removed")
- 
- #m4 _CONVERSION(`Glib::ustring',`const gchar*',`g_strdup($3.c_str())')
-   _WRAP_VFUNC(Glib::ustring get_object_path() const, "get_object_path")
--- 
-1.8.3.2
-
diff --git a/src/glibmm.mk b/src/glibmm.mk
index de6b4f1..7538d82 100644
--- a/src/glibmm.mk
+++ b/src/glibmm.mk
@@ -3,8 +3,8 @@
 
 PKG             := glibmm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.38.1
-$(PKG)_CHECKSUM := d543b32b32514bfbcad9242e1636af9a53283e3a
+$(PKG)_VERSION  := 2.42.0
+$(PKG)_CHECKSUM := 8f316a4dfdaf49366028087085f04c0ba29cb5c2
 $(PKG)_SUBDIR   := glibmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := glibmm-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/glibmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
@@ -14,6 +14,7 @@ define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://git.gnome.org/browse/glibmm/refs/tags' | \
     grep '<a href=' | \
     $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \
+    $(SORT) -Vr | \
     head -1
 endef