glib: 2.73.3 → 2.74.0
https://gitlab.gnome.org/GNOME/glib/-/compare/2.73.3...2.74.0 Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
parent
9155c3d0d5
commit
bdd3746cb6
|
@ -44,11 +44,11 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glib";
|
||||
version = "2.73.3";
|
||||
version = "2.74.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "3xorhBZn1rSLLvaWnr2kMoJDgp9uRYZnJvgG+Q9k7q0=";
|
||||
sha256 = "NlLH8HLXsDGmte3WI/d+vF3NKuaYWYq8yJ/znKda3TA=";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isDarwin [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
|
||||
index bf25cdaeb..bff7016cc 100644
|
||||
index f0a256898..9c8497cd0 100644
|
||||
--- a/gio/gdbus-2.0/codegen/meson.build
|
||||
+++ b/gio/gdbus-2.0/codegen/meson.build
|
||||
@@ -19,7 +19,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
|
||||
|
@ -8,14 +8,14 @@ index bf25cdaeb..bff7016cc 100644
|
|||
output : 'gdbus-codegen',
|
||||
- install_dir : get_option('bindir'),
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin-devel',
|
||||
configuration : gdbus_codegen_conf
|
||||
)
|
||||
# Provide tools for others when we're a subproject and they use the Meson GNOME module
|
||||
diff --git a/gio/meson.build b/gio/meson.build
|
||||
index 69bb0603e..839b1cfb4 100644
|
||||
index fdd2528df..cf359c7d7 100644
|
||||
--- a/gio/meson.build
|
||||
+++ b/gio/meson.build
|
||||
@@ -858,14 +858,15 @@ pkg.generate(libgio,
|
||||
@@ -859,14 +859,15 @@ pkg.generate(libgio,
|
||||
variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
|
||||
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
|
||||
'bindir=' + join_paths('${prefix}', get_option('bindir')),
|
||||
|
@ -36,41 +36,42 @@ index 69bb0603e..839b1cfb4 100644
|
|||
'gsettings=' + join_paths('${bindir}', 'gsettings')],
|
||||
version : glib_version,
|
||||
install_dir : glib_pkgconfigreldir,
|
||||
@@ -966,13 +967,14 @@ executable('gio', gio_tool_sources,
|
||||
@@ -968,6 +969,7 @@ executable('gio', gio_tool_sources,
|
||||
|
||||
executable('gresource', 'gresource-tool.c',
|
||||
install : true,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin',
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
link_args : noseh_link_args,
|
||||
dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
|
||||
@@ -975,7 +977,7 @@ executable('gresource', 'gresource-tool.c',
|
||||
|
||||
gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
|
||||
install : true,
|
||||
- install_dir : multiarch_bindir,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin',
|
||||
c_args : gio_c_args,
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
link_args : noseh_link_args,
|
||||
@@ -981,7 +983,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
|
||||
@@ -985,7 +987,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
|
||||
glib_compile_schemas = executable('glib-compile-schemas',
|
||||
['glib-compile-schemas.c'],
|
||||
install : true,
|
||||
- install_dir : multiarch_bindir,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin',
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
link_args : noseh_link_args,
|
||||
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep])
|
||||
@@ -989,6 +991,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
|
||||
@@ -994,6 +996,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
|
||||
glib_compile_resources = executable('glib-compile-resources',
|
||||
[gconstructor_as_data_h, 'glib-compile-resources.c'],
|
||||
install : true,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin-devel',
|
||||
c_args : gio_c_args,
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
link_args : noseh_link_args,
|
||||
diff --git a/glib/meson.build b/glib/meson.build
|
||||
index bcfcba94f..162fc86f2 100644
|
||||
index 1e6dc36be..6b5de6c86 100644
|
||||
--- a/glib/meson.build
|
||||
+++ b/glib/meson.build
|
||||
@@ -396,9 +396,10 @@ pkg.generate(libglib,
|
||||
|
@ -92,20 +93,20 @@ index bcfcba94f..162fc86f2 100644
|
|||
gtester = executable('gtester', 'gtester.c',
|
||||
install : true,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin-devel',
|
||||
c_args : ['-UG_DISABLE_ASSERT'],
|
||||
include_directories : configinc,
|
||||
dependencies : [libglib_dep])
|
||||
@@ -446,7 +448,7 @@ report_conf.set('PYTHON', python_name)
|
||||
@@ -447,7 +449,7 @@ report_conf.set('PYTHON', python_name)
|
||||
configure_file(
|
||||
input: 'gtester-report.in',
|
||||
output: 'gtester-report',
|
||||
- install_dir: get_option('bindir'),
|
||||
+ install_dir: get_option('devbindir'),
|
||||
install_tag : 'bin-devel',
|
||||
configuration: report_conf,
|
||||
install_mode: 'rwxr-xr-x'
|
||||
)
|
||||
diff --git a/gobject/meson.build b/gobject/meson.build
|
||||
index 07d096f36..865891e8c 100644
|
||||
index a994eb591..36b36b925 100644
|
||||
--- a/gobject/meson.build
|
||||
+++ b/gobject/meson.build
|
||||
@@ -79,7 +79,7 @@ foreach tool: python_tools
|
||||
|
@ -114,17 +115,17 @@ index 07d096f36..865891e8c 100644
|
|||
configuration : python_tools_conf,
|
||||
- install_dir : glib_bindir,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin-devel',
|
||||
)
|
||||
|
||||
# Set variables for later use
|
||||
@@ -154,6 +154,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep)
|
||||
@@ -155,6 +155,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep)
|
||||
|
||||
executable('gobject-query', 'gobject-query.c',
|
||||
install : true,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin-devel',
|
||||
dependencies : [libglib_dep, libgobject_dep])
|
||||
|
||||
install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index f13cbfdd5..f218db581 100644
|
||||
--- a/meson_options.txt
|
||||
|
@ -142,7 +143,7 @@ index f13cbfdd5..f218db581 100644
|
|||
type : 'combo',
|
||||
choices : ['auto', 'libc', 'external'],
|
||||
diff --git a/tools/meson.build b/tools/meson.build
|
||||
index d550a0e37..cff7fdae5 100644
|
||||
index 0542fb89b..bfb10cd80 100644
|
||||
--- a/tools/meson.build
|
||||
+++ b/tools/meson.build
|
||||
@@ -8,7 +8,7 @@ if have_sh
|
||||
|
@ -151,6 +152,6 @@ index d550a0e37..cff7fdae5 100644
|
|||
configure_file(input : 'glib-gettextize.in',
|
||||
- install_dir : glib_bindir,
|
||||
+ install_dir : get_option('devbindir'),
|
||||
install_tag : 'bin-devel',
|
||||
output : 'glib-gettextize',
|
||||
configuration : gettextize_conf)
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue