glib: bump version.

* split patch in logical units for upstream.
2026-04-09 05:10:05 +02:00 · 2015-12-19 15:44:40 +00:00
parent d5178528f8
commit e01100da50
2 changed files with 81 additions and 51 deletions
--- a/dev-libs/glib/glib2-2.47.4.recipe
+++ b/dev-libs/glib/glib2-2.47.4.recipe
@@ -12,7 +12,7 @@ systems without major changes
 "
 HOMEPAGE="http://www.gtk.org/"
 SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.47/glib-$portVersion.tar.xz"
-CHECKSUM_SHA256="f1d59b95e7aa6f5c3aa58139a0bf7fd5c92e4f3a26f8252a657ec88373cd4449"
+CHECKSUM_SHA256="4270129436fc2380e59f500b602d7c165cece208cda2872fdf1e8d1322cd1520"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 	1991-2003 Free Software Foundation, Inc.
--- a/dev-libs/glib/patches/glib2-2.47.4.patchset
+++ b/dev-libs/glib/patches/glib2-2.47.4.patchset
@@ -1,34 +1,54 @@
-From 5aa9cb0c6bf9ce1deb8eca9eb171c5f66561f868 Mon Sep 17 00:00:00 2001
+From cf040d5469f1683a84a671dfbebaeded12bb60c1 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
-Date: Tue, 17 Jun 2014 19:57:08 +0000
-Subject: Haiku patch
+Date: Sat, 19 Dec 2015 14:51:01 +0000
+Subject: glib_compile_schemas: links against gio, gobject and gmodule.

-based on patch from 2.38.1
+Otherwise build fails on Haiku.
+
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 5d5d741..d4caed9 100644
+--- a/gio/Makefile.am
+++ b/gio/Makefile.am
+@@ -728,7 +728,11 @@ gio_querymodules_LDADD	 = libgio-2.0.la 		\
+ gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
+ 	$(AM_V_GEN) $(srcdir)/data-to-c.pl $(top_srcdir)/glib/gconstructor.h gconstructor_code > $@.tmp && mv $@.tmp $@
+ 
+-glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
+glib_compile_schemas_LDADD = libgio-2.0.la 		\
+	$(top_builddir)/gobject/libgobject-2.0.la	\
+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
+	$(top_builddir)/glib/libglib-2.0.la		\
+	$(NULL)
+ glib_compile_schemas_SOURCES = \
+ 	gconstructor_as_data.h \
+ 	gvdb/gvdb-format.h		\
+-- 
+2.2.2
+
+
+From 0095964aadf305fde0a5b58ea9b5ba03d9787d50 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 19 Dec 2015 14:59:42 +0000
+Subject: configure.ac: on Haiku
+
+* don't use -pthread
+* use -lbe -lroot as thread related libs.

 diff --git a/configure.ac b/configure.ac
-index 51048f4..594e325 100644
+index 339defc..9d8bed2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -149,6 +149,10 @@ case "$host" in
+@@ -152,6 +152,9 @@ case "$host" in
     ;;
 esac
 case $host in
 +  *-*-haiku*)
-+    glib_os_haiku=yes
 +    LIBS="-lnetwork $LIBS"
 +    ;;
   *-*-linux*)
     glib_os_linux=yes
     ;;
-@@ -193,6 +197,7 @@ AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"])
- AM_CONDITIONAL(OS_WIN32_X64, [test "$LIB_EXE_MACHINE_FLAG" = "X64"])
- AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"])
- AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
-+AM_CONDITIONAL(OS_HAIKU, [test "$glib_os_haiku" = "yes"])
- AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
- AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
- 
-@@ -1945,8 +1950,8 @@ AS_IF([ test x"$have_threads" = xposix], [
+@@ -1876,8 +1879,8 @@ AS_IF([ test x"$have_threads" = xposix], [
   # One of them does for most gcc versions and some other platforms/compilers
   # too and could be considered as the canonical way to go. 
   case $host in
@@ -39,7 +59,7 @@ index 51048f4..594e325 100644
        ;;
     *-solaris*)
       # These compiler/linker flags work with both Sun Studio and gcc
-@@ -2111,6 +2116,15 @@ if test "x$G_THREAD_LIBS" = xerror; then
+@@ -2042,6 +2045,15 @@ if test "x$G_THREAD_LIBS" = xerror; then
         AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)
 fi
 
@@ -55,25 +75,19 @@ index 51048f4..594e325 100644
 AC_MSG_CHECKING(thread related libraries)
 AC_MSG_RESULT($G_THREAD_LIBS)
 
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index b7f91cc..80ee9ff 100644
--- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -726,7 +726,11 @@ gio_querymodules_LDADD	 = libgio-2.0.la 		\
- gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
- 	$(AM_V_GEN) $(srcdir)/data-to-c.pl $(top_srcdir)/glib/gconstructor.h gconstructor_code > $@.tmp && mv $@.tmp $@
- 
-glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
-+glib_compile_schemas_LDADD = libgio-2.0.la 		\
-+	$(top_builddir)/gobject/libgobject-2.0.la	\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
-+	$(top_builddir)/glib/libglib-2.0.la		\
-+	$(NULL)
- glib_compile_schemas_SOURCES = \
- 	gconstructor_as_data.h \
- 	gvdb/gvdb-format.h		\
+-- 
+2.2.2
+
+
+From 00208cb8f052a1e0acafdeb558d580d4cceb2855 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 19 Dec 2015 15:06:17 +0000
+Subject: g_dbus_message_print: use B_PRIiDEV on Haiku.
+
+because Haiku doesn't define major() and minor().
+
 diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
-index d9d8f37..c604606 100644
+index d9d8f37..eb5945c 100644
 --- a/gio/gdbusmessage.c
 +++ b/gio/gdbusmessage.c
@@ -33,6 +33,9 @@
@@ -114,8 +128,20 @@ index d9d8f37..c604606 100644
                   g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
                                           (guint64) statbuf.st_size);
                   g_string_append_printf (fs, "%s" "atime=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
+-- 
+2.2.2
+
+
+From 55022ad00cba573ec61795760b3cbf30f1efb284 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 19 Dec 2015 15:09:39 +0000
+Subject: gunixmounts.c: on Haiku
+
+* define get_mtab_monitor_file() and _g_get_unix_mounts().
+* like Interix, _g_get_unix_mount_points() calls _g_get_unix_mounts().
+
 diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
-index 2e2ff5e..dddcadc 100644
+index 2e2ff5e..8d5e752 100644
 --- a/gio/gunixmounts.c
 +++ b/gio/gunixmounts.c
@@ -712,7 +712,18 @@ _g_get_unix_mounts (void)
@@ -137,20 +163,33 @@ index 2e2ff5e..dddcadc 100644
 /* Common code {{{2 */
 #else
 #error No _g_get_unix_mounts() implementation for system
-@@ -1111,7 +1122,7 @@ _g_get_unix_mount_points (void)
+@@ -1110,8 +1121,8 @@ _g_get_unix_mount_points (void)
+   
   return g_list_reverse (return_list);
 }
- /* Interix {{{2 */
+-/* Interix {{{2 */
 -#elif defined(__INTERIX)
+/* Interix, Haiku {{{2 */
 +#elif defined(__INTERIX) || defined(__HAIKU__)
 static GList *
 _g_get_unix_mount_points (void)
 {
+-- 
+2.2.2
+
+
+From 4bb1d1e5f4c0284cbc235b9747eb5d2deaa6f4c8 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 19 Dec 2015 15:12:40 +0000
+Subject: glib/gutils.c: on Haiku define load_user_special_dirs().
+
+use find_directory() from SupportDefs.h.
+
 diff --git a/glib/gutils.c b/glib/gutils.c
-index 360a4d5..4cbd53b 100644
+index e82ce54..bb2b72a 100644
 --- a/glib/gutils.c
 +++ b/glib/gutils.c
-@@ -74,6 +74,11 @@
+@@ -69,6 +69,11 @@
 #include "gwin32.h"
 #endif
 
@@ -162,16 +201,7 @@ index 360a4d5..4cbd53b 100644
 
 /**
  * SECTION:misc_utils
-@@ -366,7 +371,7 @@ g_find_program_in_path (const gchar *program)
-     }
-   
-   path = g_getenv ("PATH");
-#if defined(G_OS_UNIX)
-+#ifdef G_OS_UNIX
-   if (path == NULL)
-     {
-       /* There is no 'PATH' in the environment.  The default
-@@ -1404,6 +1409,34 @@ load_user_special_dirs (void)
+@@ -1421,6 +1426,34 @@ load_user_special_dirs (void)
   g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = find_folder (kMovieDocumentsFolderType);
 }