[wip] Various GNOME 3.26 libraries: update #30371

jtojnar · 2017-10-12T22:07:59Z

Motivation for this change

These libraries were updated as a part of the GNOME 3.26 pull request but they can actually be used independently. Since pull requests updating many of these packages started to pop up, I decided to submit those changes to prevent duplication of effort.

Updated libraries

appstream-glib
clutter_gtk
colord
fwup
glib_networking
glibmm
gnome3.dconf
gnome3.folks
gnome3.gjs
gnome3.grilo
gnome3.grilo-plugins
gnome3.libpeas
gnome3.libgdata
gnome3.libgepub
gnome3.libgxps
gnome3.libzapojit
gnome3.mutter
gnome3.nautilus-sendto
gnome3.totem-pl-parser
gnome3.vte
gobjectIntrospection
granite
gstreamer
gusb
gvfs
json_glib
libchamplain
libevdev
libgtop
libgudev
libical
libinput
librsvg
libwacom
libxkbcommon
networkmanagerapplet
ostree
packagekit
spice_gtk
spice_protocol
spidermonkey_52
telepathy_glib
xf86_input_wacom
zeitgeist

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

FRidh · 2017-10-22T16:37:17Z

@jtojnar what is the status? Did you test these changes? Do you think we should run a Hydra job?

jtojnar · 2017-10-22T18:12:02Z

I only build tested them with GNOME 3.26. I will need to take a second pass. Hydra job might help.

jtojnar · 2017-10-26T23:06:40Z

@FRidh Finished review, could you please arrange the Hydra job? Or @vcunat?

dezgeg · 2017-11-03T15:39:49Z

I don't have Hydra creation permissions, but in the meantime here's some failures I noticed when build-testing this:
colord:

Compiler for C supports argument -Wl,-z,now: YES
Found pkg-config: /nix/store/pki9r32nbdvdrmxaxrkb7j8lbq3jfihi-pkg-config-0.29.2/bin/pkg-config (0.29.2)
Native dependency gio-2.0 found: YES 2.54.1
Native dependency glib-2.0 found: YES 2.54.1
Native dependency gmodule-2.0 found: YES 2.54.1
Native dependency gio-unix-2.0 found: YES 2.54.1
Native dependency lcms2 found: YES 2.8
Native dependency sqlite3 found: YES 3.21.0
Native dependency gusb found: YES 0.2.11
Native dependency gudev-1.0 found: YES 232
Library m found: YES
Native dependency udev found: YES 234
Native dependency libudev found: YES 234
Native dependency systemd found: YES 234
Native dependency libsystemd found: YES 234
Has header "pwd.h": YES
Has header "syslog.h": YES
Has header "unistd.h": YES
Checking for function "getuid": YES
Native dependency bash-completion found: YES 2.7
Native dependency sane-backends found: YES 1.0.27
Native dependency dbus-1 found: YES 1.10.24
Program spotread found: YES (/nix/store/fwzbk1l1lkil2ffxig946xhyn3m6aay3-argyllcms-1.8.3/bin/spotread)
Program vapigen found: NO

Meson encountered an error in file meson.build, line 170, column 2:
Program "vapigen" not found or not executable

A full log can be found at /tmp/nix-build-colord-1.4.1.drv-0/colord-1.4.1/build/meson-logs/meson-log.txt
builder for ‘/nix/store/frk7p89khfx3zqjjb4iybz0idj9hsqsy-colord-1.4.1.drv’ failed with exit code 1

Needs vala or -Denable-vala=false?

mutter:

  CC       backends/native/meta-idle-monitor-native.lo
In file included from /nix/store/d9s2m4fs3m8ifngnkzmpik6li1yqy0z9-glib-2.54.1/lib/glib-2.0/include/glibconfig.h:9:0,
                 from /nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gtypes.h:32,
                 from /nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/galloca.h:32,
                 from /nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib.h:30,
                 from /nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/gobject/gbinding.h:28,
                 from /nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib-object.h:23,
                 from backends/native/meta-launcher.h:23,
                 from backends/native/meta-launcher.c:22:
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:430:43: error: redefinition of 'glib_autoptr_cleanup_GUdevDevice'
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
                                           ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:444:22: note: in expansion of macro '_GLIB_AUTOPTR_FUNC_NAME'
   static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
                      ^~~~~~~~~~~~~~~~~~~~~~~
backends/native/meta-launcher.c:52:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
 ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:430:43: note: previous definition of 'glib_autoptr_cleanup_GUdevDevice' was here
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
                                           ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:444:22: note: in expansion of macro '_GLIB_AUTOPTR_FUNC_NAME'
   static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
                      ^~~~~~~~~~~~~~~~~~~~~~~
/nix/store/hg3qjccvdqzxpwc8xzs3savnzhvkp430-libgudev-232/include/gudev-1.0/gudev/gudevdevice.h:39:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GUdevDevice, g_object_unref)
 ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:430:43: error: redefinition of 'glib_autoptr_cleanup_GUdevClient'
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
                                           ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:444:22: note: in expansion of macro '_GLIB_AUTOPTR_FUNC_NAME'
   static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
                      ^~~~~~~~~~~~~~~~~~~~~~~
backends/native/meta-launcher.c:53:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
 ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:430:43: note: previous definition of 'glib_autoptr_cleanup_GUdevClient' was here
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
                                           ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:444:22: note: in expansion of macro '_GLIB_AUTOPTR_FUNC_NAME'
   static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
                      ^~~~~~~~~~~~~~~~~~~~~~~
/nix/store/hg3qjccvdqzxpwc8xzs3savnzhvkp430-libgudev-232/include/gudev-1.0/gudev/gudevclient.h:39:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GUdevClient, g_object_unref)
 ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:430:43: error: redefinition of 'glib_autoptr_cleanup_GUdevEnumerator'
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
                                           ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:444:22: note: in expansion of macro '_GLIB_AUTOPTR_FUNC_NAME'
   static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
                      ^~~~~~~~~~~~~~~~~~~~~~~
backends/native/meta-launcher.c:54:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref)
 ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:430:43: note: previous definition of 'glib_autoptr_cleanup_GUdevEnumerator' was here
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
                                           ^
/nix/store/cf7hbajqjr93kc50mpi32cqjbcq53x6k-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:444:22: note: in expansion of macro '_GLIB_AUTOPTR_FUNC_NAME'
   static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
                      ^~~~~~~~~~~~~~~~~~~~~~~
/nix/store/hg3qjccvdqzxpwc8xzs3savnzhvkp430-libgudev-232/include/gudev-1.0/gudev/gudevenumerator.h:39:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GUdevEnumerator, g_object_unref)
 ^
  CC       backends/native/meta-cursor-renderer-native.lo
  CC       backends/native/meta-clutter-backend-native.lo
make[4]: *** [Makefile:2162: backends/native/meta-launcher.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
make[4]: Leaving directory '/tmp/nix-build-mutter-3.24.4.drv-0/mutter-3.24.4/src'
make[3]: *** [Makefile:2334: all-recursive] Error 1
make[3]: Leaving directory '/tmp/nix-build-mutter-3.24.4.drv-0/mutter-3.24.4/src'
make[2]: *** [Makefile:1336: all] Error 2
make[2]: Leaving directory '/tmp/nix-build-mutter-3.24.4.drv-0/mutter-3.24.4/src'
make[1]: *** [Makefile:484: all-recursive] Error 1
make[1]: Leaving directory '/tmp/nix-build-mutter-3.24.4.drv-0/mutter-3.24.4'
make: *** [Makefile:414: all] Error 2
builder for ‘/nix/store/fxb96yvr92zcn3bvvfm27cd9jvayzl5q-mutter-3.24.4.drv’ failed with exit code 2

totem-pl-parser:

unpacking sources
unpacking source archive /nix/store/594v76fxd4waiwz25xys9kwdhh2lyws5-totem-pl-parser-3.10.2.tar.xz
source root is totem-pl-parser-3.10.2
setting SOURCE_DATE_EPOCH to timestamp 1395667871 of file totem-pl-parser-3.10.2/docs/reference/totem-pl-parser.types
patching sources
configuring
meson flags: --buildtype=release --prefix=/nix/store/krbfsi9g7ilhqpz6kjq0p0grw8b98qi6-totem-pl-parser-3.10.2  
Warning: You are using 'ANSI_X3.4-1968' which is not a Unicode-compatible locale.
You might see errors if you use UTF-8 strings as filenames, as strings, or as file contents.
Please switch to a UTF-8 locale for your platform.
Error during basic setup:

Neither directory contains a build file meson.build.
builder for ‘/nix/store/3ldfqhhdzql0hcxdgv404i6ckbdrcgbi-totem-pl-parser-3.10.2.drv’ failed with exit code 1

(I don't know if it matters but I had rebased onto c4be15a when testing)

jtojnar · 2017-11-03T22:34:25Z

@orivej Looks like a cherry-picking failure. Should be fixed now.

orivej · 2017-11-03T22:41:31Z

@orivej Looks like a cherry-picking failure. Should be fixed now.

You meant @dezgeg.

BTW updating libgit2 is more involved than that, I'm doing it in #31119

Three tests are ran, libinput-test-suite-runner is skipped because it must be run as root.

jtojnar · 2017-11-05T20:53:03Z

@vcunat No idea what was up with it. I rebuilt it and GNOME and the apps work just fine with the libraries.

vcunat · 2017-11-06T07:43:37Z

I probably just tried at the right moment by luck. There's also a short-time negative local cache for the binary cache lookups.

globin · 2017-11-06T08:16:49Z

So this should be ready to be merged now?

vcunat · 2017-11-06T08:26:23Z

Yes, I've been just waiting for the remaining builds to finish on Hydra.

jtojnar · 2017-11-07T14:01:58Z

Looks like fwupd build is broken after libgudev update. #30252 attempts to fix it.

dezgeg · 2017-11-07T14:48:00Z

It was actually broken previously since September (https://hydra.nixos.org/build/59954108) but fixes are still welcome :)

orivej · 2017-12-01T07:02:32Z

This broke fwup: https://hydra.nixos.org/job/nixpkgs/trunk/fwup.x86_64-linux

jtojnar · 2017-12-01T11:19:18Z

@orivej ~~This does not seem to be the problem. The same tests fail even if I downgrade fwup. And it does not look like it depends on any other package changed in this PR.~~

Edit: I was fetching incorrect tarball, it indeed breaks with fwup ≥ 0.15. I opened an upstream issue fwup-home/fwup#83

orivej · 2017-12-03T04:58:51Z

Thank you! Fixed in 3954032.

jtojnar requested a review from FRidh as a code owner October 12, 2017 22:07

jtojnar changed the base branch from master to staging October 12, 2017 22:16

FRidh added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Oct 22, 2017

jtojnar force-pushed the gnome-3.26-libs branch 7 times, most recently from 6728623 to 8877139 Compare October 26, 2017 21:53

GrahamcOfBorg added 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ labels Oct 26, 2017

jtojnar force-pushed the gnome-3.26-libs branch from 8877139 to 0cb3181 Compare November 3, 2017 20:41

jtojnar requested review from edolstra, peti and rycee as code owners November 3, 2017 20:41

jtojnar force-pushed the gnome-3.26-libs branch 5 times, most recently from da1cca7 to 75b8aa4 Compare November 3, 2017 22:33

jtojnar force-pushed the gnome-3.26-libs branch from 75b8aa4 to 9060282 Compare November 3, 2017 22:50

jtojnar added 17 commits November 5, 2017 20:44

gobjectIntrospection: 1.52.1 → 1.54.1

c2bc772

ostree: 2017.9 → 2017.12

db16b93

json_glib: 1.2.0 → 1.4.2

01d7bb6

zeitgeist: 0.9.15 → 1.0

360f9b7

colord: 1.2.12 → 1.4.1

cdd40ba

appstream-glib: clean up

e7795a6

packagekit: 1.1.3 → 1.1.7

dcb074a

nautilus-sendto: 3.8.1 → 3.8.6

64e3473

gnome3.totem-pl-parser: clean up

309a831

gnome3.mutter: remove stale patches

1260fe9

gnome3.mutter: add libwacom dependency

4d66728

telepathy_glib: cleanup

e14e705

gnome3.dconf: cleanup

de0cede

libevdev: 1.5.6 → 1.5.7

8f8de4a

gnome3.mutter: fix libgudev 232 compatibility

716a0d6

gnome3.mutter: cleanup

3c98114

libinput: enable tests

09bda35

Three tests are ran, libinput-test-suite-runner is skipped because it must be run as root.

jtojnar force-pushed the gnome-3.26-libs branch from 45d5c57 to 09bda35 Compare November 5, 2017 20:39

vcunat merged commit 09bda35 into NixOS:master Nov 6, 2017

vcunat added a commit that referenced this pull request Nov 6, 2017

Merge #30371: update misc. gnome3-related libraries

bc90fe1

jtojnar deleted the gnome-3.26-libs branch November 8, 2017 14:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wip] Various GNOME 3.26 libraries: update #30371

[wip] Various GNOME 3.26 libraries: update #30371

jtojnar commented Oct 12, 2017 •

edited

FRidh commented Oct 22, 2017

jtojnar commented Oct 22, 2017

jtojnar commented Oct 26, 2017 •

edited

dezgeg commented Nov 3, 2017 •

edited

jtojnar commented Nov 3, 2017

orivej commented Nov 3, 2017

jtojnar commented Nov 5, 2017

vcunat commented Nov 6, 2017 •

edited

globin commented Nov 6, 2017

vcunat commented Nov 6, 2017

jtojnar commented Nov 7, 2017

dezgeg commented Nov 7, 2017

orivej commented Dec 1, 2017

jtojnar commented Dec 1, 2017 •

edited

orivej commented Dec 3, 2017

[wip] Various GNOME 3.26 libraries: update #30371

[wip] Various GNOME 3.26 libraries: update #30371

Conversation

jtojnar commented Oct 12, 2017 • edited

Motivation for this change

Updated libraries

Things done

FRidh commented Oct 22, 2017

jtojnar commented Oct 22, 2017

jtojnar commented Oct 26, 2017 • edited

dezgeg commented Nov 3, 2017 • edited

jtojnar commented Nov 3, 2017

orivej commented Nov 3, 2017

jtojnar commented Nov 5, 2017

vcunat commented Nov 6, 2017 • edited

globin commented Nov 6, 2017

vcunat commented Nov 6, 2017

jtojnar commented Nov 7, 2017

dezgeg commented Nov 7, 2017

orivej commented Dec 1, 2017

jtojnar commented Dec 1, 2017 • edited

orivej commented Dec 3, 2017

jtojnar commented Oct 12, 2017 •

edited

jtojnar commented Oct 26, 2017 •

edited

dezgeg commented Nov 3, 2017 •

edited

vcunat commented Nov 6, 2017 •

edited

jtojnar commented Dec 1, 2017 •

edited