Skip to content

Gnome updates staging #80594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
worldofpeace merged 12 commits into from
Feb 23, 2020
Merged

Gnome updates staging #80594

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1b24c1a
gnome3.gnome-desktop: 3.34.2 -> 3.34.4
worldofpeace Feb 20, 2020
fede9f6
folks: 0.13.1 -> 0.13.2
worldofpeace Feb 20, 2020
df2d5fb
gjs: 1.58.4 -> 1.58.5
worldofpeace Feb 20, 2020
4ac9af7
glib: 2.62.4 -> 2.62.5
worldofpeace Feb 20, 2020
0def916
grilo: 0.3.11 -> 0.3.12
worldofpeace Feb 20, 2020
1e23480
grilo-plugins: 0.3.10 -> 0.3.11
worldofpeace Feb 20, 2020
7e22c87
gtk3: 3.24.13 -> 3.24.14
worldofpeace Feb 20, 2020
8bf3b33
libpeas: 1.24.0 -> 1.24.1
worldofpeace Feb 20, 2020
c6a1e23
libsecret: 0.20.0 -> 0.20.1
worldofpeace Feb 20, 2020
9c1c68a
tracker: 2.3.1 -> 2.3.2
worldofpeace Feb 20, 2020
8d2827f
tracker-miners: 2.3.1 -> 2.3.2
worldofpeace Feb 20, 2020
dfa4187
vte: 0.58.2 -> 0.58.3
worldofpeace Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "3.34.2";
version = "3.34.4";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v983xirwp1y6ggz97bh742ak6gff0hxb359dgn37nikjxhvm0a0";
sha256 = "1g0cvsx0gk65kfa91knkqg7l2isrnlpvqwjbzpr3a5f2girp4gn5";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/folks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@

stdenv.mkDerivation rec {
pname = "folks";
version = "0.13.1";
version = "0.13.2";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x";
sha256 = "0wq14yjs7m3axziy679a854vc7r7fj1l38p9jnyapb21vswdcqq2";
};

mesonFlags = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gjs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

stdenv.mkDerivation rec {
pname = "gjs";
version = "1.58.4";
version = "1.58.5";

src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pxxgsb9gvymgr7qsglfdbaa7hy29y01prszjr27f7bpdik3y6i6";
sha256 = "0fm1szmhdawvgbf9fh6vvkv1fdvbn888fciyi2wkhx48kz09jvg7";
};

outputs = [ "out" "dev" "installedTests" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/glib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down
22 changes: 11 additions & 11 deletions pkgs/development/libraries/glib/split-dev-programs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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,

@hedning hedning Feb 23, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change here from upstream was doing a join_paths('${prefix}... on the gio_module_dir option, which we don't use 0. They renamed the variable at the same time. Updated patch should be fine 👍

@worldofpeace worldofpeace Feb 23, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for checking, I come across the same to be sure 💟

'gio=' + join_paths('${bindir}', 'gio'),
- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
Expand All @@ -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,
Expand All @@ -51,15 +51,15 @@ 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,
+ install_dir : get_option('devbindir'),
# 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,
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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',
Expand Down