pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

glib: 2.62.4 -> 2.62.5

worldofpeace 4ac9af7b df2d5fba

+13 -13
+2 -2
pkgs/development/libraries/glib/default.nix
··· 48 48 49 49 stdenv.mkDerivation rec { 50 50 pname = "glib"; 51 - version = "2.62.4"; 51 + version = "2.62.5"; 52 52 53 53 src = fetchurl { 54 54 url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 55 - sha256 = "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c"; 55 + sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq"; 56 56 }; 57 57 58 58 patches = optionals stdenv.isDarwin [
+11 -11
pkgs/development/libraries/glib/split-dev-programs.patch
··· 1 1 diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build 2 - index 121e9e6bb..b76fa0188 100644 2 + index 5ea6bae2f..e0b584a86 100644 3 3 --- a/gio/gdbus-2.0/codegen/meson.build 4 4 +++ b/gio/gdbus-2.0/codegen/meson.build 5 5 @@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) ··· 12 12 ) 13 13 # Provide tools for others when we're a subproject and they use the Meson GNOME module 14 14 diff --git a/gio/meson.build b/gio/meson.build 15 - index 9a9e621b3..12e1d146a 100644 15 + index 3535788ab..99c3b48d6 100644 16 16 --- a/gio/meson.build 17 17 +++ b/gio/meson.build 18 - @@ -830,14 +830,15 @@ pkg.generate(libgio, 18 + @@ -831,14 +831,15 @@ pkg.generate(libgio, 19 19 variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 20 20 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 21 21 'bindir=' + join_paths('${prefix}', get_option('bindir')), 22 22 + 'devbindir=' + get_option('devbindir'), 23 - 'giomoduledir=' + giomodulesdir, 23 + 'giomoduledir=' + pkgconfig_giomodulesdir, 24 24 'gio=' + join_paths('${bindir}', 'gio'), 25 25 - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), 26 26 - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), ··· 36 36 'gsettings=' + join_paths('${bindir}', 'gsettings')], 37 37 version : glib_version, 38 38 install_dir : glib_pkgconfigreldir, 39 - @@ -938,12 +939,14 @@ executable('gio', gio_tool_sources, 39 + @@ -939,12 +940,14 @@ executable('gio', gio_tool_sources, 40 40 41 41 executable('gresource', 'gresource-tool.c', 42 42 install : true, ··· 51 51 c_args : gio_c_args, 52 52 # intl.lib is not compatible with SAFESEH 53 53 link_args : noseh_link_args, 54 - @@ -952,6 +955,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu 54 + @@ -953,6 +956,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu 55 55 glib_compile_schemas = executable('glib-compile-schemas', 56 56 [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'], 57 57 install : true, ··· 59 59 # intl.lib is not compatible with SAFESEH 60 60 link_args : noseh_link_args, 61 61 dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) 62 - @@ -959,6 +963,7 @@ glib_compile_schemas = executable('glib-compile-schemas', 62 + @@ -960,6 +964,7 @@ glib_compile_schemas = executable('glib-compile-schemas', 63 63 glib_compile_resources = executable('glib-compile-resources', 64 64 [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'], 65 65 install : true, ··· 68 68 # intl.lib is not compatible with SAFESEH 69 69 link_args : noseh_link_args, 70 70 diff --git a/glib/meson.build b/glib/meson.build 71 - index 91a48f194..80472a06b 100644 71 + index aaf5f00f5..09edd291a 100644 72 72 --- a/glib/meson.build 73 73 +++ b/glib/meson.build 74 74 @@ -375,9 +375,10 @@ pkg.generate(libglib, ··· 103 103 install_mode: 'rwxr-xr-x' 104 104 ) 105 105 diff --git a/gobject/meson.build b/gobject/meson.build 106 - index c7805c556..22ec629a4 100644 106 + index 85e283bab..386ad5e4e 100644 107 107 --- a/gobject/meson.build 108 108 +++ b/gobject/meson.build 109 109 @@ -75,7 +75,7 @@ foreach tool: python_tools ··· 124 124 125 125 install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) 126 126 diff --git a/meson.build b/meson.build 127 - index 717d1bccb..fb0bee8a1 100644 127 + index 484f4c750..c7f9327d9 100644 128 128 --- a/meson.build 129 129 +++ b/meson.build 130 - @@ -2118,7 +2118,7 @@ if have_sh 130 + @@ -2122,7 +2122,7 @@ if have_sh 131 131 gettextize_conf.set('datarootdir', glib_datadir) 132 132 gettextize_conf.set('datadir', glib_datadir) 133 133 configure_file(input : 'glib-gettextize.in',