glib: 2.62.4 -> 2.62.5

2 files changed, 13 insertions, 13 deletions

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 1875621323001..6bc5a6c2535a1 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -48,11 +48,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "glib";
-  version = "2.62.4";
+  version = "2.62.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c";
+    sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq";
   };
 
   patches = optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch
index 9d3989a30a546..9a949ea1226c0 100644
--- a/pkgs/development/libraries/glib/split-dev-programs.patch
+++ b/pkgs/development/libraries/glib/split-dev-programs.patch
@@ -1,5 +1,5 @@
 diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
-index 121e9e6bb..b76fa0188 100644
+index 5ea6bae2f..e0b584a86 100644
 --- a/gio/gdbus-2.0/codegen/meson.build
 +++ b/gio/gdbus-2.0/codegen/meson.build
 @@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
@@ -12,15 +12,15 @@ index 121e9e6bb..b76fa0188 100644
  )
    # 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 9a9e621b3..12e1d146a 100644
+index 3535788ab..99c3b48d6 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -830,14 +830,15 @@ pkg.generate(libgio,
+@@ -831,14 +831,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')),
 +               'devbindir=' + get_option('devbindir'),
-                'giomoduledir=' + giomodulesdir,
+                'giomoduledir=' + pkgconfig_giomodulesdir,
                 'gio=' + join_paths('${bindir}', 'gio'),
 -               'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
 -               'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
@@ -36,7 +36,7 @@ index 9a9e621b3..12e1d146a 100644
                 'gsettings=' + join_paths('${bindir}', 'gsettings')],
    version : glib_version,
    install_dir : glib_pkgconfigreldir,
-@@ -938,12 +939,14 @@ executable('gio', gio_tool_sources,
+@@ -939,12 +940,14 @@ executable('gio', gio_tool_sources,
  
  executable('gresource', 'gresource-tool.c',
    install : true,
@@ -51,7 +51,7 @@ index 9a9e621b3..12e1d146a 100644
    c_args : gio_c_args,
    # intl.lib is not compatible with SAFESEH
    link_args : noseh_link_args,
-@@ -952,6 +955,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
+@@ -953,6 +956,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
  glib_compile_schemas = executable('glib-compile-schemas',
    [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'],
    install : true,
@@ -59,7 +59,7 @@ index 9a9e621b3..12e1d146a 100644
    # intl.lib is not compatible with SAFESEH
    link_args : noseh_link_args,
    dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
-@@ -959,6 +963,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
+@@ -960,6 +964,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
  glib_compile_resources = executable('glib-compile-resources',
    [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'],
    install : true,
@@ -68,7 +68,7 @@ index 9a9e621b3..12e1d146a 100644
    # intl.lib is not compatible with SAFESEH
    link_args : noseh_link_args,
 diff --git a/glib/meson.build b/glib/meson.build
-index 91a48f194..80472a06b 100644
+index aaf5f00f5..09edd291a 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
 @@ -375,9 +375,10 @@ pkg.generate(libglib,
@@ -103,7 +103,7 @@ index 91a48f194..80472a06b 100644
    install_mode: 'rwxr-xr-x'
  )
 diff --git a/gobject/meson.build b/gobject/meson.build
-index c7805c556..22ec629a4 100644
+index 85e283bab..386ad5e4e 100644
 --- a/gobject/meson.build
 +++ b/gobject/meson.build
 @@ -75,7 +75,7 @@ foreach tool: python_tools
@@ -124,10 +124,10 @@ index c7805c556..22ec629a4 100644
  
  install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
 diff --git a/meson.build b/meson.build
-index 717d1bccb..fb0bee8a1 100644
+index 484f4c750..c7f9327d9 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2118,7 +2118,7 @@ if have_sh
+@@ -2122,7 +2122,7 @@ if have_sh
    gettextize_conf.set('datarootdir', glib_datadir)
    gettextize_conf.set('datadir', glib_datadir)
    configure_file(input : 'glib-gettextize.in',