[BACK]Return to patch-glib_meson.build CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / devel / glib2 / patches

File: [cvs.NetBSD.org] / pkgsrc / devel / glib2 / patches / patch-glib_meson.build (download)

Revision 1.7, Sun Dec 29 19:40:56 2019 UTC (3 months ago) by triaxx
Branch: MAIN
Changes since 1.6: +3 -4 lines

glib2: update to 2.62.4

pkgsrc changes:
---------------
  * Fix build on FreeBSD (PR 54752)

upstream changes:
-----------------
  * Apply recursion depth limits to variants in D-Bus messages (!1290)
  * Bugs fixed:
      o #1938 GDateTime doesn't support leap seconds
      o !1240 Backport !1233 ◊»datetime: Handle leap seconds in ISO8601 dates„ŗto glib-2-62
      o !1257 Backport !1232 „ŗ◊Őqueue: Do not return early from _kqsub_cancel„ŗto glib-2-62
      o !1266 Backport !1265 „ŗ◊√uild: don't check for protected visibility„ŗto glib-2-62
      o !1276 Backport !1274 „ŗ◊’rash portal: Don't follow symlinks„ŗto glib-2-62
      o !1290 Backport !1201 „ŗ◊»dbusmessage: Limit recursion of variants in D-Bus messages„ŗto glib-2-62

$NetBSD: patch-glib_meson.build,v 1.7 2019/12/29 19:40:56 triaxx Exp $

- On Darwin, allow building without Cocoa.
- Don't bother with gtester as it's slated for deprecation anyway:
  https://gitlab.gnome.org/GNOME/glib/issues/1441

--- glib/meson.build.orig	2019-12-19 16:33:15.000000000 +0000
+++ glib/meson.build
@@ -316,7 +316,7 @@ else
   platform_deps = []
 endif
 
-if host_system == 'darwin'
+if host_system == 'darwin' and glib_have_cocoa
   glib_sources += files('gosxutils.m')
 endif
 
@@ -410,24 +410,7 @@ if host_system == 'windows'
       include_directories : configinc,
       dependencies : [libglib_dep])
   endif
-else
-  gtester = executable('gtester', 'gtester.c',
-    install : true,
-    c_args : ['-UG_DISABLE_ASSERT'],
-    include_directories : configinc,
-    dependencies : [libglib_dep])
 endif
-
-report_conf = configuration_data()
-report_conf.set('GLIB_VERSION', glib_version)
-report_conf.set('PYTHON', python_name)
-configure_file(
-  input: 'gtester-report.in',
-  output: 'gtester-report',
-  install_dir: get_option('bindir'),
-  configuration: report_conf,
-  install_mode: 'rwxr-xr-x'
-)
 
 install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))