From 48fe14e01db18a87ea08f3184e8361e5890c694b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 20 Sep 2017 18:34:01 +0200
Subject: [PATCH] glib2: define G_OS_HAIKU (used by libnice).

---
 dev-libs/glib/glib2-2.53.5.recipe           |  2 +-
 dev-libs/glib/patches/glib2-2.53.5.patchset | 59 +++++++++++++++------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/dev-libs/glib/glib2-2.53.5.recipe b/dev-libs/glib/glib2-2.53.5.recipe
index 0f380d4d0..d65fd7788 100644
--- a/dev-libs/glib/glib2-2.53.5.recipe
+++ b/dev-libs/glib/glib2-2.53.5.recipe
@@ -21,7 +21,7 @@ COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 	2008-2010 Collabora Ltd.
 	1995-2010 Several others"
 LICENSE="GNU LGPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://git.gnome.org/browse/glib/snapshot/glib-$portVersion.tar.xz"
 CHECKSUM_SHA256="963a70f114e9925424898178973423f70d4cd1dfcd226fa85882be6c8b87f3f5"
 SOURCE_DIR="glib-$portVersion"
diff --git a/dev-libs/glib/patches/glib2-2.53.5.patchset b/dev-libs/glib/patches/glib2-2.53.5.patchset
index d981bfa73..84476a6ca 100644
--- a/dev-libs/glib/patches/glib2-2.53.5.patchset
+++ b/dev-libs/glib/patches/glib2-2.53.5.patchset
@@ -1,4 +1,4 @@
-From 2107a6fce76fb34082a2fe24aa8814a931cbbb1b Mon Sep 17 00:00:00 2001
+From 55a17051755769cfea9ea4fea50f80be8887734c Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 19 Dec 2015 14:51:01 +0000
 Subject: glib_compile_schemas: links against gio, gobject and gmodule.
@@ -23,10 +23,10 @@ index b2db995..c82f05c 100644
  	gconstructor_as_data.h \
  	gvdb/gvdb-format.h		\
 -- 
-2.7.0
+2.13.1
 
 
-From 9229a461b8bbfaa0bd8b232ef0013a84392fb1ff Mon Sep 17 00:00:00 2001
+From e8cd3bc56e49a31380e516a611b81ddb171c06de 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
@@ -35,7 +35,7 @@ Subject: configure.ac: on Haiku
 * use -lbe -lroot as thread related libs.
 
 diff --git a/configure.ac b/configure.ac
-index fbc4400..7386289 100644
+index 09fa3b4..6f23523 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -154,6 +154,9 @@ case "$host" in
@@ -76,10 +76,10 @@ index fbc4400..7386289 100644
  AC_MSG_RESULT($G_THREAD_LIBS)
  
 -- 
-2.7.0
+2.13.1
 
 
-From 2ae7f7f265f807896f61a19ad715d33a6ac0e6b2 Mon Sep 17 00:00:00 2001
+From ebdda5ed9978ae6272df99f6e8cadf42f3a50e27 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 29 Jul 2017 12:13:00 +0200
 Subject: g_dbus_message_print: use B_PRIiDEV on Haiku
@@ -87,7 +87,7 @@ 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 9158858..901c1e5 100644
+index e80794f..7c68f57 100644
 --- a/gio/gdbusmessage.c
 +++ b/gio/gdbusmessage.c
 @@ -33,8 +33,12 @@
@@ -134,10 +134,10 @@ index 9158858..901c1e5 100644
                                            (guint64) statbuf.st_size);
                    g_string_append_printf (fs, "%s" "atime=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
 -- 
-2.7.0
+2.13.1
 
 
-From af39ea73bae9c6cc46d029bb6523ff207587b933 Mon Sep 17 00:00:00 2001
+From bca36b1e71dc29ed71b628f1b87917498a375147 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 29 Jul 2017 12:19:31 +0200
 Subject: gunixmounts.c: on Haiku
@@ -146,10 +146,10 @@ Subject: gunixmounts.c: on Haiku
 * like Inerix, _g_get_unix_mount_points() calls _g_get_unix_mounts().
 
 diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
-index 2ccd9f7..3b2f5b0 100644
+index ce6a2fc..dac4c05 100644
 --- a/gio/gunixmounts.c
 +++ b/gio/gunixmounts.c
-@@ -829,7 +829,18 @@ _g_get_unix_mounts (void)
+@@ -837,7 +837,18 @@ _g_get_unix_mounts (void)
  
    return return_list;
  }
@@ -168,7 +168,7 @@ index 2ccd9f7..3b2f5b0 100644
  /* Common code {{{2 */
  #else
  #error No _g_get_unix_mounts() implementation for system
-@@ -1340,8 +1351,8 @@ _g_get_unix_mount_points (void)
+@@ -1348,8 +1359,8 @@ _g_get_unix_mount_points (void)
    
    return g_list_reverse (return_list);
  }
@@ -180,10 +180,10 @@ index 2ccd9f7..3b2f5b0 100644
  _g_get_unix_mount_points (void)
  {
 -- 
-2.7.0
+2.13.1
 
 
-From 44cc8d19093525980ad7645711a984efb4261310 Mon Sep 17 00:00:00 2001
+From cc4f7378d24f874c0483360b356f0a88f673d5cc Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 29 Jul 2017 12:32:14 +0200
 Subject: glib/gutils.c: on Haiku define load_user_special_dirs()
@@ -191,7 +191,7 @@ 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 70b08b6..5448a66 100644
+index 099bba5..7fbee2d 100644
 --- a/glib/gutils.c
 +++ b/glib/gutils.c
 @@ -69,6 +69,10 @@
@@ -205,7 +205,7 @@ index 70b08b6..5448a66 100644
  
  /**
   * SECTION:misc_utils
-@@ -1429,6 +1433,35 @@ load_user_special_dirs (void)
+@@ -1431,6 +1435,35 @@ load_user_special_dirs (void)
    g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = find_folder (kMovieDocumentsFolderType);
  }
  
@@ -242,5 +242,30 @@ index 70b08b6..5448a66 100644
  
  static void
 -- 
-2.7.0
+2.13.1
+
+
+From 10bb92c8389573bf0a4b42b42339da4bd75413c5 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 20 Sep 2017 18:09:43 +0200
+Subject: configure.ac: define G_OS_HAIKU
+
+
+diff --git a/configure.ac b/configure.ac
+index 6f23523..a09db90 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3231,6 +3231,10 @@ g_pid_format="\"$glib_pid_format\""
+ g_pollfd_format="\"$glib_pollfd_format\""
+ 
+ case $host in
++ *-*-haiku*)
++    glib_os="#define G_OS_UNIX
++#define G_OS_HAIKU"
++    ;;
+   *-*-cygwin*)
+     glib_os="#define G_OS_UNIX
+ #define G_PLATFORM_WIN32
+-- 
+2.13.1