From eb9d63a9895c1a7478e8aeeb37cf5dcdde4e5fa6 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 12 Aug 2023 12:29:48 +0000 Subject: [PATCH] glib2, revbump for python changes, build fixes for gcc2 (#9191) --- dev-libs/glib/glib2-2.57.1.recipe | 6 +- dev-libs/glib/patches/glib2-2.57.1.patchset | 77 +++++++++++++++++---- 2 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dev-libs/glib/glib2-2.57.1.recipe b/dev-libs/glib/glib2-2.57.1.recipe index c93b1e18a..7f33608ff 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="2" +REVISION="3" SOURCE_URI="https://gitlab.gnome.org/GNOME/glib/-/archive/$portVersion/glib-$portVersion.tar.gz" CHECKSUM_SHA256="73c10a1927c79d8c318bba9ad6f7bc96ff187013ee19377b3e82f684958b2c2c" SOURCE_DIR="glib-$portVersion" @@ -77,7 +77,7 @@ REQUIRES_devel=" glib2$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix cmd:perl - cmd:python + cmd:python3 devel:libffi$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix @@ -105,7 +105,7 @@ BUILD_PREREQUIRES=" cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python + cmd:python3 cmd:which " diff --git a/dev-libs/glib/patches/glib2-2.57.1.patchset b/dev-libs/glib/patches/glib2-2.57.1.patchset index 483249c4e..d35419d09 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 74e3e83281b3472e010a44a30204b5cac4b1a29d Mon Sep 17 00:00:00 2001 +From fb3b82a9685eb247e9e83d8b878b0aa81041f5de 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.21.0 +2.37.3 -From d968dda5cb2ded7c7f0146e41081b9256962c5c5 Mon Sep 17 00:00:00 2001 +From 841540be84d9ecb2ec966773fd3ad0622e8ec1fe 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.21.0 +2.37.3 -From d577ba25ece5e325739b7e91c5cad492430a5866 Mon Sep 17 00:00:00 2001 +From f6d1a6c6c595db66ec543de0433077c2d5eff490 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.21.0 +2.37.3 -From 1225be0329f92ce05292d47044227bed84a67ab1 Mon Sep 17 00:00:00 2001 +From 702b6a31782f59a9fd7a4d4d82ff52745dfed6db 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.21.0 +2.37.3 -From 40d0e6168227335896a14b404bbad7ba46a9c16e Mon Sep 17 00:00:00 2001 +From 4d199b20bd75dd9bd85320198cd7e88f6b071513 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.21.0 +2.37.3 -From 23d15413eb7df653822c5a59ea8b08b4c3f61a86 Mon Sep 17 00:00:00 2001 +From ea2742520fc173a42dbb55ab6161f922c022e693 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,10 +267,10 @@ index dc3297c..387286a 100644 glib_os="#define G_OS_UNIX #define G_PLATFORM_WIN32 -- -2.21.0 +2.37.3 -From 7bd65b60714d8273fc17e5e1d9ab05ebb1c1b4d5 Mon Sep 17 00:00:00 2001 +From 8844c6c18a855af989c0ef2193058e1d747bcafb 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 @@ -291,5 +291,54 @@ index 6b0f226..789e083 100644 } } -- -2.21.0 +2.37.3 + + +From 1c5b0352058ab67aadbffe9416ae6bfae24fc699 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sat, 12 Aug 2023 12:30:41 +0200 +Subject: Fix build for arpa/namser_compat.h + +checking if arpa/nameser_compat.h is needed... configure: error: could not compile test program either way + +diff --git a/configure.ac b/configure.ac +index 387286a..9d7d022 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -990,11 +990,13 @@ AS_IF([test $glib_native_win32 = yes], [ + AS_IF([test $glib_native_android != yes], [ + AC_MSG_CHECKING([if arpa/nameser_compat.h is needed]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ++ #include + #include ], + [int qclass = C_IN;])], + [AC_MSG_RESULT([no])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include + #include ++ #include + #include ], + [int qclass = C_IN;])], + [AC_MSG_RESULT([yes]) +-- +2.37.3 + + +From 561062c43f6f0c8a596ef5799c85a90bc1ee6e76 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sat, 12 Aug 2023 12:32:32 +0200 +Subject: Fix for python3 + + +diff --git a/gio/data-to-c.py b/gio/data-to-c.py +index f226220..7a8d8a8 100755 +--- a/gio/data-to-c.py ++++ b/gio/data-to-c.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + import sys + +-- +2.37.3