components/library/glib/patches/16-pkgconfig.patch

   1 Solaris pkgconfig file changes
   2
   3 Not suitable for upstream
   4
   5 --- glib-2.82.0/glib/meson.build.orig
   6 +++ glib-2.82.0/glib/meson.build
   7 @@ -447,10 +447,10 @@
   8    subdirs : ['glib-2.0'],
   9    extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
  10    variables : [
  11 -    'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal',
  12 -    'gobject_query=' + '${bindir}' / 'gobject-query',
  13 -    'glib_mkenums=' + '${bindir}' / 'glib-mkenums',
  14 -    'glib_valgrind_suppressions=' + '${datadir}' /
  15 +    'glib_genmarshal=glib-genmarshal',
  16 +    'gobject_query=gobject-query',
  17 +    'glib_mkenums=glib-mkenums',
  18 +    'glib_valgrind_suppressions=' +
  19        valgrind_suppression_file_install_subdir /
  20        fs.name(valgrind_suppression_file),
  21    ],
  22 --- glib-2.82.0/gio/meson.build.orig
  23 +++ glib-2.82.0/gio/meson.build
  24 @@ -889,13 +889,13 @@
  25      'dtdsdir=' + '${datadir}' / dtds_subdir,
  26      'giomoduledir=' + pkgconfig_giomodulesdir,
  27      'gio=' + '${bindir}' / 'gio',
  28 -    'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
  29 -    'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas',
  30 -    'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources',
  31 -    'gdbus=' + '${bindir}' /'gdbus',
  32 -    'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen',
  33 -    'gresource=' + '${bindir}' / 'gresource',
  34 -    'gsettings=' + '${bindir}' / 'gsettings',
  35 +    'gio_querymodules=gio-querymodules',
  36 +    'glib_compile_schemas=glib-compile-schemas',
  37 +    'glib_compile_resources=glib-compile-resources',
  38 +    'gdbus=gdbus',
  39 +    'gdbus_codegen=gdbus-codegen',
  40 +    'gresource=gresource',
  41 +    'gsettings=gsettings',
  42    ],
  43    version : glib_version,
  44    install_dir : glib_pkgconfigreldir,
  45 --- glib-2.82.0/meson.build.orig
  46 +++ glib-2.82.0/meson.build
  47 @@ -2089,7 +2089,7 @@
  48    glibconfig_conf.set('g_threads_impl_def', 'WIN32')
  49    glib_conf.set('THREADS_WIN32', 1)
  50  else
  51 -  thread_dep = dependency('threads')
  52 +  thread_dep = []
  53    threads_implementation = 'posix'
  54    pthread_prefix = '''
  55        #ifndef _GNU_SOURCE