haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib2, bump version (#9607)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-10-11 05:57:21 +00:00
committed by GitHub
parent 3ab177f226
commit dc6c0c8bb1
2 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-libs/glib/glib2-2.77.0.recipe → dev-libs/glib/glib2-2.78.0.recipe
View File

@@ -22,7 +22,7 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://gitlab.gnome.org/GNOME/glib/-/archive/$portVersion/glib-$portVersion.tar.gz"
CHECKSUM_SHA256="d61839d9c7b2dd5676bda640ef2482746d896047dfca54a9ab6f877d919cee2f"
CHECKSUM_SHA256="e1e8e200cbae77d79551d758b79e816e60feaf238f2199aec58691f5bdb6c7b4"
SOURCE_DIR="glib-$portVersion"
srvGitRev2="0854af0fdb6d527a8d1999835ac2c5059976c210"
SOURCE_URI_2="https://gitlab.gnome.org/GNOME/gvdb/-/archive/0854af0fdb6d527a8d1999835ac2c5059976c210/gvdb-$srvGitRev2.tar.gz"
@@ -40,7 +40,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
commandBinDir=$prefix/bin
fi
libVersion="0.7700.0"
libVersion="0.7800.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="

64
dev-libs/glib/patches/glib2-2.77.0.patchset → dev-libs/glib/patches/glib2-2.78.0.patchset
View File

@@ -1,4 +1,4 @@
From b007ad396d76c624aad8017c392bf68d20812762 Mon Sep 17 00:00:00 2001
From 28e826ce18531fa9a97e69702706d2b93c06ed3c 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
@@ -6,7 +6,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 66da3bd..37d9eab 100644
index adddb31..c257eba 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -37,8 +37,12 @@
@@ -22,7 +22,7 @@ index 66da3bd..37d9eab 100644
#include "gdbusutils.h"
#include "gdbusmessage.h"
@@ -3675,8 +3679,14 @@ g_dbus_message_print (GDBusMessage *message,
@@ -3707,8 +3711,14 @@ g_dbus_message_print (GDBusMessage *message,
if (fstat (fds[n], &statbuf) == 0)
{
#ifndef MAJOR_MINOR_NOT_FOUND
@@ -37,7 +37,7 @@ index 66da3bd..37d9eab 100644
#endif
g_string_append_printf (fs, "%s" "mode=0%o", fs->len > 0 ? "," : "",
(guint) statbuf.st_mode);
@@ -3687,9 +3697,14 @@ g_dbus_message_print (GDBusMessage *message,
@@ -3719,9 +3729,14 @@ g_dbus_message_print (GDBusMessage *message,
g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
(guint) statbuf.st_gid);
#ifndef MAJOR_MINOR_NOT_FOUND
@@ -56,17 +56,17 @@ index 66da3bd..37d9eab 100644
2.37.3
From 9d8196f5079ae14f862f8af75e350a23afb54b9f Mon Sep 17 00:00:00 2001
From b0c2d3ef2fcf06c75e200b280f8977918af427f0 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 23 Aug 2021 19:31:38 +0000
Subject: gunixmounts.c: Add Haiku support
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 9a02de3..b9cbc20 100644
index 1cfd25d..cb820e9 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -60,6 +60,9 @@
@@ -69,6 +69,9 @@ extern char* hasmntopt(const struct mntent* mnt, const char* opt);
#endif
#include <sys/mount.h>
#endif
@@ -76,7 +76,7 @@ index 9a02de3..b9cbc20 100644
#ifndef O_BINARY
#define O_BINARY 0
@@ -960,6 +963,49 @@ _g_get_unix_mounts (void)
@@ -969,6 +972,49 @@ _g_get_unix_mounts (void)
return return_list;
}
@@ -126,7 +126,7 @@ index 9a02de3..b9cbc20 100644
/* QNX {{{2 */
#elif defined (HAVE_QNX)
@@ -1493,16 +1539,8 @@ _g_get_unix_mount_points (void)
@@ -1502,16 +1548,8 @@ _g_get_unix_mount_points (void)
return g_list_reverse (return_list);
}
@@ -149,7 +149,7 @@ index 9a02de3..b9cbc20 100644
2.37.3
From 8b0bff5e9bf6c9e5ce27c973c86e370a2403957a Mon Sep 17 00:00:00 2001
From 5b2ea998682fd35351b4b0fcf51658133320f654 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()
@@ -157,7 +157,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 d73b647..2b81778 100644
index 362c55a..c951c7a 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -78,6 +78,10 @@
@@ -171,7 +171,7 @@ index d73b647..2b81778 100644
/**
* SECTION:misc_utils
@@ -1865,6 +1869,13 @@ g_build_user_data_dir (void)
@@ -1872,6 +1876,13 @@ g_build_user_data_dir (void)
#ifdef G_OS_WIN32
else
data_dir = get_special_folder (&FOLDERID_LocalAppData);
@@ -185,7 +185,7 @@ index d73b647..2b81778 100644
#endif
if (!data_dir || !data_dir[0])
{
@@ -1929,6 +1940,13 @@ g_build_user_config_dir (void)
@@ -1936,6 +1947,13 @@ g_build_user_config_dir (void)
#ifdef G_OS_WIN32
else
config_dir = get_special_folder (&FOLDERID_LocalAppData);
@@ -199,7 +199,7 @@ index d73b647..2b81778 100644
#endif
if (!config_dir || !config_dir[0])
{
@@ -1992,6 +2010,13 @@ g_build_user_cache_dir (void)
@@ -1999,6 +2017,13 @@ g_build_user_cache_dir (void)
#ifdef G_OS_WIN32
else
cache_dir = get_special_folder (&FOLDERID_InternetCache);
@@ -213,7 +213,7 @@ index d73b647..2b81778 100644
#endif
if (!cache_dir || !cache_dir[0])
{
@@ -2193,6 +2218,35 @@ load_user_special_dirs (void)
@@ -2200,6 +2225,35 @@ load_user_special_dirs (void)
load_user_special_dirs_macos (g_user_special_dirs);
}
@@ -249,7 +249,7 @@ index d73b647..2b81778 100644
#elif defined(G_OS_WIN32)
static void
@@ -2688,7 +2742,16 @@ g_build_system_data_dirs (void)
@@ -2695,7 +2749,16 @@ g_build_system_data_dirs (void)
*/
#ifndef G_OS_WIN32
if (!data_dirs || !data_dirs[0])
@@ -266,7 +266,7 @@ index d73b647..2b81778 100644
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#else
@@ -2783,6 +2846,20 @@ g_build_system_config_dirs (void)
@@ -2790,6 +2853,20 @@ g_build_system_config_dirs (void)
g_free (special_conf_dirs);
}
@@ -291,7 +291,7 @@ index d73b647..2b81778 100644
2.37.3
From 7b7eb5ddfc120afe2b2d7a8cdd9fab9ba0f5dcee Mon Sep 17 00:00:00 2001
From 613744f2353cd7f08c1c61bc2051561fb2b0584b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 23 Nov 2019 20:10:10 +0100
Subject: Haiku patch for x86
@@ -329,14 +329,14 @@ index ea3495c..94bdaf1 100644
2.37.3
From 8df34ff954ea9dc1783e52f7776bd3e3ccbea835 Mon Sep 17 00:00:00 2001
From 842c55aafe88ffff563a1ebe8dafc6fada11e596 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 1f7c109..67ac6a2 100644
index 9239e3c..7b837c4 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -26,6 +26,7 @@ if host_system not in ['windows', 'android']
@@ -369,7 +369,7 @@ index 1f7c109..67ac6a2 100644
2.37.3
From 363f3c3e5fbde4f6a170456cab9f5f299dcf12ac Mon Sep 17 00:00:00 2001
From 1d5dfbaf3b4fcba12c43f63895f90f8f4688d701 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 5 Jan 2023 18:31:01 +1000
Subject: Use find_directory for xdgmime
@@ -427,3 +427,25 @@ index c3c1162..c48d390 100644
--
2.37.3
From d8408d9bc8aee8ba6a7b8f0e8ca673c1ec54eae1 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 9 Oct 2023 11:43:56 +0200
Subject: Haiku doesn't have sys/ptrace.h
diff --git a/gio/tests/gsubprocess-testprog.c b/gio/tests/gsubprocess-testprog.c
index 610b8f3..84edc59 100644
--- a/gio/tests/gsubprocess-testprog.c
+++ b/gio/tests/gsubprocess-testprog.c
@@ -5,6 +5,7 @@
#include <errno.h>
#ifdef G_OS_UNIX
#include <unistd.h>
+#elif !defined(__HAIKU__)
#include <sys/ptrace.h>
#else
#include <io.h>
--
2.37.3