summaryrefslogtreecommitdiff
path: root/devel/glib2/patches
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2021-03-23 13:48:27 +0000
committeradam <adam@pkgsrc.org>2021-03-23 13:48:27 +0000
commitb400c0a6042084158b576e6c66807ffef2df7c00 (patch)
tree12c7ef6a99e9aadac7335990b7838aa85c092740 /devel/glib2/patches
parent87cbb63fc2f4cc4b7c13ad3d8261695d90e143cd (diff)
downloadpkgsrc-b400c0a6042084158b576e6c66807ffef2df7c00.tar.gz
glib2: downgraded to 2.66.8
Overview of changes in GLib 2.66.8 ================================== * Fix a security issue when using `g_file_replace()` with `G_FILE_CREATE_REPLACE_DESTINATION` * Bugs fixed: - file-roller symlink attack - Backport !2325 “file-roller symlink attack” to glib-2-66 - Backport !1976 “Use the right permissions for directory watching on Win32” to glib-2-66
Diffstat (limited to 'devel/glib2/patches')
-rw-r--r--devel/glib2/patches/patch-meson.build18
1 files changed, 9 insertions, 9 deletions
diff --git a/devel/glib2/patches/patch-meson.build b/devel/glib2/patches/patch-meson.build
index e52fad70ea0..b749f1c1000 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.12 2021/03/22 06:54:19 adam Exp $
+$NetBSD: patch-meson.build,v 1.13 2021/03/23 13:48:27 adam Exp $
- On Darwin, optionally use Cocoa (needed for X11 users).
@@ -12,9 +12,9 @@ $NetBSD: patch-meson.build,v 1.12 2021/03/22 06:54:19 adam 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-03-18 13:47:48.000000000 +0000
+++ meson.build
-@@ -773,6 +773,7 @@ if host_system == 'darwin'
+@@ -756,6 +756,7 @@ if host_system == 'darwin'
#error "Detected GNUstep, not Cocoa"
#endif''',
name : 'Mac OS X Cocoa support')
@@ -22,7 +22,7 @@ $NetBSD: patch-meson.build,v 1.12 2021/03/22 06:54:19 adam Exp $
if glib_have_cocoa
glib_conf.set('HAVE_COCOA', true)
-@@ -2038,7 +2039,7 @@ endif
+@@ -2003,7 +2004,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 = []
@@ -31,7 +31,7 @@ $NetBSD: patch-meson.build,v 1.12 2021/03/22 06:54:19 adam Exp $
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
+@@ -2076,16 +2077,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')
@@ -50,7 +50,7 @@ $NetBSD: patch-meson.build,v 1.12 2021/03/22 06:54:19 adam Exp $
if cc.compiles(glib_conf_prefix + '''
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
-@@ -2220,9 +2220,11 @@ endif
+@@ -2185,9 +2185,11 @@ endif
glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
@@ -65,16 +65,16 @@ $NetBSD: patch-meson.build,v 1.12 2021/03/22 06:54:19 adam Exp $
python_version = python.language_version()
python_version_req = '>=3.5'
-@@ -2231,7 +2233,7 @@ if not python_version.version_compare(py
+@@ -2196,7 +2198,7 @@ if not python_version.version_compare(py
endif
# Determine which user environment-dependent files that we want to install
-have_bash = find_program('bash', required : false).found() # For completion scripts
+have_bash = false
- 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
+ # Some installed tests require a custom environment
+@@ -2204,8 +2206,7 @@ env_program = find_program('env', requir
# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
if host_system == 'sunos'