diff --git a/dev-libs/glib/glib2-2.57.1.recipe b/dev-libs/glib/glib2-2.57.1.recipe index 03fd7a7bd..261efb96d 100644 --- a/dev-libs/glib/glib2-2.57.1.recipe +++ b/dev-libs/glib/glib2-2.57.1.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="1" +REVISION="2" SOURCE_URI="https://gitlab.gnome.org/GNOME/glib/-/archive/$portVersion/glib-$portVersion.tar.gz" CHECKSUM_SHA256="73c10a1927c79d8c318bba9ad6f7bc96ff187013ee19377b3e82f684958b2c2c" SOURCE_DIR="glib-$portVersion" diff --git a/dev-libs/glib/patches/glib2-2.57.1.patchset b/dev-libs/glib/patches/glib2-2.57.1.patchset index 38f675ae5..483249c4e 100644 --- a/dev-libs/glib/patches/glib2-2.57.1.patchset +++ b/dev-libs/glib/patches/glib2-2.57.1.patchset @@ -1,4 +1,4 @@ -From 7e32998baec6df434328f70f173fafacc18c6dd8 Mon Sep 17 00:00:00 2001 +From 74e3e83281b3472e010a44a30204b5cac4b1a29d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 19 Dec 2015 14:51:01 +0000 Subject: glib_compile_schemas: links against gio, gobject and gmodule. @@ -23,10 +23,10 @@ index df4f240..b03e662 100644 gconstructor_as_data.h \ gvdb/gvdb-format.h \ -- -2.16.4 +2.21.0 -From 4bcc596453ac15edd806a032ccb5dfd5c29d2e07 Mon Sep 17 00:00:00 2001 +From d968dda5cb2ded7c7f0146e41081b9256962c5c5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 19 Dec 2015 14:59:42 +0000 Subject: configure.ac: on Haiku @@ -76,10 +76,10 @@ index 7afeb87..dc3297c 100644 AC_MSG_RESULT($G_THREAD_LIBS) -- -2.16.4 +2.21.0 -From 341186eabe3ed50649a987eb965307c0297fcc71 Mon Sep 17 00:00:00 2001 +From d577ba25ece5e325739b7e91c5cad492430a5866 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 @@ -134,10 +134,10 @@ index be001ae..c8919a6 100644 (guint64) statbuf.st_size); g_string_append_printf (fs, "%s" "atime=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "", -- -2.16.4 +2.21.0 -From f74032ca4ed380fb856ea8b9d9215b37d19fd6b7 Mon Sep 17 00:00:00 2001 +From 1225be0329f92ce05292d47044227bed84a67ab1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 29 Jul 2017 12:19:31 +0200 Subject: gunixmounts.c: on Haiku @@ -180,10 +180,10 @@ index f2db27e..abf4c3d 100644 _g_get_unix_mount_points (void) { -- -2.16.4 +2.21.0 -From 08798a44def0f879a9baac4212635e2e3c272d4b Mon Sep 17 00:00:00 2001 +From 40d0e6168227335896a14b404bbad7ba46a9c16e 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() @@ -242,10 +242,10 @@ index 5813b22..5b294a6 100644 static void -- -2.16.4 +2.21.0 -From ace3f32944f4b09de46d290fac3bbc0a3484406a Mon Sep 17 00:00:00 2001 +From 23d15413eb7df653822c5a59ea8b08b4c3f61a86 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 20 Sep 2017 18:09:43 +0200 Subject: configure.ac: define G_OS_HAIKU @@ -267,5 +267,29 @@ index dc3297c..387286a 100644 glib_os="#define G_OS_UNIX #define G_PLATFORM_WIN32 -- -2.16.4 +2.21.0 + + +From 7bd65b60714d8273fc17e5e1d9ab05ebb1c1b4d5 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 18 May 2019 18:36:06 +1000 +Subject: Enable always_malloc by default + + +diff --git a/glib/gslice.c b/glib/gslice.c +index 6b0f226..789e083 100644 +--- a/glib/gslice.c ++++ b/glib/gslice.c +@@ -388,7 +388,9 @@ slice_config_init (SliceConfig *config) + * This way it's possible to force gslice to be enabled under + * valgrind just by setting G_SLICE to the empty string. + */ ++#ifndef __HAIKU__ + if (RUNNING_ON_VALGRIND) ++#endif + config->always_malloc = TRUE; + } + } +-- +2.21.0