Solaris pkgconfig file changes Not suitable for upstream --- glib-2.82.0/glib/meson.build.orig +++ glib-2.82.0/glib/meson.build @@ -447,10 +447,10 @@ subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : [ - 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', - 'gobject_query=' + '${bindir}' / 'gobject-query', - 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', - 'glib_valgrind_suppressions=' + '${datadir}' / + 'glib_genmarshal=glib-genmarshal', + 'gobject_query=gobject-query', + 'glib_mkenums=glib-mkenums', + 'glib_valgrind_suppressions=' + valgrind_suppression_file_install_subdir / fs.name(valgrind_suppression_file), ], --- glib-2.82.0/gio/meson.build.orig +++ glib-2.82.0/gio/meson.build @@ -889,13 +889,13 @@ 'dtdsdir=' + '${datadir}' / dtds_subdir, 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + '${bindir}' / 'gio', - 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', - 'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas', - 'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources', - 'gdbus=' + '${bindir}' /'gdbus', - 'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen', - 'gresource=' + '${bindir}' / 'gresource', - 'gsettings=' + '${bindir}' / 'gsettings', + 'gio_querymodules=gio-querymodules', + 'glib_compile_schemas=glib-compile-schemas', + 'glib_compile_resources=glib-compile-resources', + 'gdbus=gdbus', + 'gdbus_codegen=gdbus-codegen', + 'gresource=gresource', + 'gsettings=gsettings', ], version : glib_version, install_dir : glib_pkgconfigreldir, --- glib-2.82.0/meson.build.orig +++ glib-2.82.0/meson.build @@ -2089,7 +2089,7 @@ glibconfig_conf.set('g_threads_impl_def', 'WIN32') glib_conf.set('THREADS_WIN32', 1) else - thread_dep = dependency('threads') + thread_dep = [] threads_implementation = 'posix' pthread_prefix = ''' #ifndef _GNU_SOURCE