diff --git a/dev-libs/glib/glib2-2.62.0.recipe b/dev-libs/glib/glib2-2.62.0.recipe index a5f110b61..330dfea1d 100644 --- a/dev-libs/glib/glib2-2.62.0.recipe +++ b/dev-libs/glib/glib2-2.62.0.recipe @@ -20,7 +20,7 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald 2008-2010 Collabora Ltd. 1995-2010 Several others" LICENSE="GNU LGPL v2" -REVISION="5" +REVISION="6" SOURCE_URI="https://gitlab.gnome.org/GNOME/glib/-/archive/$portVersion/glib-$portVersion.tar.gz" CHECKSUM_SHA256="226f44a6fe121d4367d5c2458a363054d6076a9e70cf2ec5b948b6c028a08688" SOURCE_DIR="glib-$portVersion" diff --git a/dev-libs/glib/patches/glib2-2.62.0.patchset b/dev-libs/glib/patches/glib2-2.62.0.patchset index f200f9e02..4b392e221 100644 --- a/dev-libs/glib/patches/glib2-2.62.0.patchset +++ b/dev-libs/glib/patches/glib2-2.62.0.patchset @@ -1,4 +1,4 @@ -From 8953ca94d555aeadcc1e2b1bd4219b50af6f7aef Mon Sep 17 00:00:00 2001 +From e1b248c02e0259f4f0b38c13596d24ce233fbdfb Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 29 Jul 2017 12:13:00 +0200 Subject: g_dbus_message_print: use B_PRIiDEV on Haiku @@ -53,10 +53,10 @@ index 852a704..968d33f 100644 (guint64) statbuf.st_size); g_string_append_printf (fs, "%s" "atime=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "", -- -2.23.0 +2.30.2 -From bee7a2522d34ee9e10e7e40d3e5987386c6fbb61 Mon Sep 17 00:00:00 2001 +From 8407a5ee77a8b0c24e7876e799c5846785d63127 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 29 Jul 2017 12:19:31 +0200 Subject: gunixmounts.c: on Haiku @@ -99,10 +99,10 @@ index cf73fe5..88795f4 100644 _g_get_unix_mount_points (void) { -- -2.23.0 +2.30.2 -From f64e4c89849681b3807501b504cbd02963af9f18 Mon Sep 17 00:00:00 2001 +From 3cb1e89ee25160bd94ea15ca2324dec90d03f1bd Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 29 Jul 2017 12:32:14 +0200 Subject: glib/gutils.c: on Haiku define load_user_special_dirs() @@ -161,10 +161,10 @@ index 988d0a5..7248ead 100644 static void -- -2.23.0 +2.30.2 -From d7c2d78ee7c9447765ec07e802ab0b2856e352a6 Mon Sep 17 00:00:00 2001 +From e7b90c2f26d9a6b472c60ba7639ffa0b62a1c229 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 15:24:28 +0200 Subject: _SC_HOST_NAME_MAX is not defined on H1B1 @@ -187,10 +187,10 @@ index 7248ead..a27c429 100644 size = (gsize) max + 1; else -- -2.23.0 +2.30.2 -From 69f610c998a72ed4ed06b26e632f4269d9bab8cc Mon Sep 17 00:00:00 2001 +From b84a08f536145a49ed19aba44a504f4526dd892c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 23 Nov 2019 20:10:10 +0100 Subject: Haiku patch for x86 @@ -245,5 +245,45 @@ index ad776fa..49d2ea4 100644 child_argv[1] = "mapchild"; child_argv[2] = pid; -- -2.23.0 +2.30.2 + + +From 485728e688a8a89e84b3b8cf68a7e4871804e39f Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 17 Aug 2021 08:29:48 +0000 +Subject: Fix network detection + + +diff --git a/gio/meson.build b/gio/meson.build +index 9a9e621..32d7d67 100644 +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -26,6 +26,7 @@ elif not host_system.contains('android') + int qclass = C_IN;''', + name : 'C_IN in public headers (no arpa/nameser_compat.h needed)') + if cc.compiles('''#include ++ #include + #include + #include + int qclass = C_IN;''', +@@ -46,6 +47,7 @@ if host_system != 'windows' + return res_query("test", 0, 0, (void *)0, 0); + }''' + res_query_test_full = '''#include ++ #include + #include + #include + ''' + res_query_test +@@ -56,6 +58,9 @@ if host_system != 'windows' + elif cc.links(res_query_test, args : '-lbind', name : 'res_query() in -lbind') + network_libs += [ cc.find_library('bind') ] + network_args += [ '-lbind' ] ++ elif cc.links(res_query_test, args : '-lnetwork', name : 'res_query() in -lnetwork') ++ network_libs += [ cc.find_library('network') ] ++ network_args += [ '-lnetwork' ] + else + error('Could not find res_query()') + endif +-- +2.30.2