summaryrefslogtreecommitdiff
path: root/devel/glib2/patches
diff options
context:
space:
mode:
Diffstat (limited to 'devel/glib2/patches')
-rw-r--r--devel/glib2/patches/patch-gio_giomodule.c8
-rw-r--r--devel/glib2/patches/patch-gmodule_gmodule-dl.c10
-rw-r--r--devel/glib2/patches/patch-meson.build41
3 files changed, 22 insertions, 37 deletions
diff --git a/devel/glib2/patches/patch-gio_giomodule.c b/devel/glib2/patches/patch-gio_giomodule.c
index c14444a84c6..409e6bcb08b 100644
--- a/devel/glib2/patches/patch-gio_giomodule.c
+++ b/devel/glib2/patches/patch-gio_giomodule.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-gio_giomodule.c,v 1.6 2019/08/20 14:06:46 wiz Exp $
+$NetBSD: patch-gio_giomodule.c,v 1.7 2021/10/11 10:03:47 cirnatdan Exp $
Disable inotify on SunOS.
---- gio/giomodule.c.orig 2019-07-24 10:52:04.000000000 +0000
+--- gio/giomodule.c.orig 2021-09-17 10:17:56.682960300 +0000
+++ gio/giomodule.c
-@@ -1210,7 +1210,7 @@ _g_io_modules_ensure_loaded (void)
- g_type_ensure (g_null_settings_backend_get_type ());
+@@ -1280,7 +1280,7 @@ _g_io_modules_ensure_loaded (void)
g_type_ensure (g_memory_settings_backend_get_type ());
g_type_ensure (g_keyfile_settings_backend_get_type ());
+ g_type_ensure (g_power_profile_monitor_dbus_get_type ());
-#if defined(HAVE_INOTIFY_INIT1)
+#if defined(HAVE_INOTIFY_INIT1) && !defined(__sun)
g_type_ensure (g_inotify_file_monitor_get_type ());
diff --git a/devel/glib2/patches/patch-gmodule_gmodule-dl.c b/devel/glib2/patches/patch-gmodule_gmodule-dl.c
index 25faa107070..1e9199f9610 100644
--- a/devel/glib2/patches/patch-gmodule_gmodule-dl.c
+++ b/devel/glib2/patches/patch-gmodule_gmodule-dl.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-gmodule_gmodule-dl.c,v 1.3 2021/06/30 14:26:11 prlw1 Exp $
+$NetBSD: patch-gmodule_gmodule-dl.c,v 1.4 2021/10/11 10:03:47 cirnatdan Exp $
RTL_GLOBAL is a bug.
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2171
---- gmodule/gmodule-dl.c.orig 2021-06-10 18:57:57.268194400 +0000
+--- gmodule/gmodule-dl.c.orig 2021-09-17 10:17:56.832962500 +0000
+++ gmodule/gmodule-dl.c
-@@ -106,36 +106,13 @@ _g_module_open (const gchar *file_name,
+@@ -151,38 +151,13 @@ _g_module_open (const gchar *file_name,
static gpointer
_g_module_self (void)
{
@@ -22,6 +22,7 @@ https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2171
- * always returns 'undefined symbol'. Only if RTLD_DEFAULT or
- * NULL is given, dlsym returns an appropriate pointer.
- */
+- lock_dlerror ();
-#if defined(__BIONIC__)
- handle = RTLD_DEFAULT;
-#else
@@ -29,6 +30,7 @@ https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2171
-#endif
- if (!handle)
- g_module_set_error (fetch_dlerror (TRUE));
+- unlock_dlerror ();
-
- return handle;
+ return RTLD_DEFAULT;
@@ -41,5 +43,5 @@ https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2171
if (handle != RTLD_DEFAULT)
-#endif
{
+ lock_dlerror ();
if (dlclose (handle) != 0)
- g_module_set_error (fetch_dlerror (TRUE));
diff --git a/devel/glib2/patches/patch-meson.build b/devel/glib2/patches/patch-meson.build
index 46f6c2d63ea..a1a37992ebf 100644
--- a/devel/glib2/patches/patch-meson.build
+++ b/devel/glib2/patches/patch-meson.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.14 2021/03/30 09:37:51 cirnatdan Exp $
+$NetBSD: patch-meson.build,v 1.15 2021/10/11 10:03:47 cirnatdan Exp $
- On Darwin, optionally use Cocoa (needed for X11 users).
@@ -12,45 +12,27 @@ $NetBSD: patch-meson.build,v 1.14 2021/03/30 09:37:51 cirnatdan Exp $
- Define a newer POSIX, as we build this package with -std=gnu99
---- meson.build.orig 2021-03-18 13:28:31.000000000 +0000
+--- meson.build.orig 2021-09-17 10:17:56.849962700 +0000
+++ meson.build
-@@ -773,6 +773,7 @@ if host_system == 'darwin'
+@@ -778,7 +778,7 @@ if host_system == 'darwin'
#error "Detected GNUstep, not Cocoa"
#endif''',
name : 'Mac OS X Cocoa support')
+-
+ glib_have_cocoa = glib_have_cocoa and get_option('use_cocoa')
-
if glib_have_cocoa
glib_conf.set('HAVE_COCOA', true)
-@@ -2038,7 +2039,7 @@ endif
+ osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
+@@ -2047,7 +2047,7 @@ endif
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
# implementations. This could be extended if issues are found in some platforms.
libintl_deps = []
--if cc.has_function('ngettext')
-+if cc.has_function('ngettext') and host_system != 'sunos'
+-if cc.has_function('ngettext', args : osx_ldflags)
++if cc.has_function('ngettext', args : osx_ldflags) and host_system != 'sunos'
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
else
# First just find the bare library.
-@@ -2111,16 +2112,15 @@ if host_system != 'windows' and get_opti
- if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
- glib_conf.set('HAVE_SYS_XATTR_H', 1)
- glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H')
-+ glib_conf.set('HAVE_XATTR', 1)
- #failure. try libattr
- elif cc.has_header_symbol('attr/xattr.h', 'getxattr')
- glib_conf.set('HAVE_ATTR_XATTR_H', 1)
- glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_ATTR_XATTR_H')
- xattr_dep = [cc.find_library('xattr')]
-- else
-- error('No getxattr implementation found in C library or libxattr')
-+ glib_conf.set('HAVE_XATTR', 1)
- endif
-
-- glib_conf.set('HAVE_XATTR', 1)
- if cc.compiles(glib_conf_prefix + '''
- #include <stdio.h>
- #ifdef HAVE_SYS_TYPES_H
-@@ -2220,9 +2220,11 @@ endif
+@@ -2230,9 +2230,12 @@ endif
glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
@@ -62,10 +44,11 @@ $NetBSD: patch-meson.build,v 1.14 2021/03/30 09:37:51 cirnatdan Exp $
+ python = import('python').find_installation()
+endif
+python_name = python.path()
++
python_version = python.language_version()
python_version_req = '>=3.5'
-@@ -2231,7 +2233,7 @@ if not python_version.version_compare(py
+@@ -2241,7 +2244,7 @@ if not python_version.version_compare(py
endif
# Determine which user environment-dependent files that we want to install
@@ -74,7 +57,7 @@ $NetBSD: patch-meson.build,v 1.14 2021/03/30 09:37:51 cirnatdan Exp $
bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
have_sh = find_program('sh', required : false).found() # For glib-gettextize
-@@ -2240,8 +2242,7 @@ env_program = find_program('env', requir
+@@ -2250,8 +2253,7 @@ env_program = find_program('env', requir
# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
if host_system == 'sunos'
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 12:23:09 +0000