Skip to content
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

Jump to bottom

gdk_pixbuf: 2.36.7 → 2.36.12 #39026

Merged
merged 1 commit into from Apr 21, 2018
Merged

gdk_pixbuf: 2.36.7 → 2.36.12 #39026

merged 1 commit into from Apr 21, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Apr 16, 2018

Motivation for this change

Previous attempt failed due to gdk-pixbuf forcing the use of shared-mime-info, which did not work on systems that missed it in their XDG_DATA_DIRS. Since there is no way to propagate s-m-i from gdk-pixbuf to XDG_DATA_DIRS of all the depending packages, we are patching the build script not to enable type sniffing. Proper solution would be hardcoding the s-m-i path into glib.

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/)
  • Tested regression case
  • Fits CONTRIBUTING.md.

@jtojnar jtojnar requested review from peti and vcunat April 16, 2018 23:33
@jtojnar
Copy link
Contributor Author

jtojnar commented Apr 16, 2018

Still need to move installed tests to a separate output.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gdk_pixbuf

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/2yzich0gpvwk0fw2nsg1lqmgszs0hykk-gdk-pixbuf-2.36.12-man
gzipping man pages under /nix/store/2yzich0gpvwk0fw2nsg1lqmgszs0hykk-gdk-pixbuf-2.36.12-man/share/man/
strip is /nix/store/hbn8i7224ahsrrm6zas7vik7sl0lqjn6-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/2yzich0gpvwk0fw2nsg1lqmgszs0hykk-gdk-pixbuf-2.36.12-man
checking for references to /build in /nix/store/2yzich0gpvwk0fw2nsg1lqmgszs0hykk-gdk-pixbuf-2.36.12-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/sxn09dicfw9vdkmdarhrdmms74g416gr-gdk-pixbuf-2.36.12-devdoc
strip is /nix/store/hbn8i7224ahsrrm6zas7vik7sl0lqjn6-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/sxn09dicfw9vdkmdarhrdmms74g416gr-gdk-pixbuf-2.36.12-devdoc
checking for references to /build in /nix/store/sxn09dicfw9vdkmdarhrdmms74g416gr-gdk-pixbuf-2.36.12-devdoc...
/nix/store/25vcqvxfn9i0zyx7y8bnzqrl928r3spb-gdk-pixbuf-2.36.12

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: gdk_pixbuf

Partial log (click to expand)

Installing /private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/tests/bug775693.pixdata to /nix/store/4yry0nvyc427mc0mjg6hrc46w5jqh2da-gdk-pixbuf-2.36.12/libexec/installed-tests/gdk-pixbuf-2.0
Installing /private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/tests/aero.gif to /nix/store/4yry0nvyc427mc0mjg6hrc46w5jqh2da-gdk-pixbuf-2.36.12/libexec/installed-tests/gdk-pixbuf-2.0
Running custom install script '/nix/store/88gcw0dr4w0798ws2sg6rnb9mhsl31yp-python3-3.6.5/bin/python3.6m /nix/store/2qhqyds7xq0g047ihqhx29b9vbvn0h88-meson-0.45.1/bin/meson --internal gettext install --subdir=po --localedir=share/locale --pkgname=gdk-pixbuf'
Running custom install script '/nix/store/88gcw0dr4w0798ws2sg6rnb9mhsl31yp-python3-3.6.5/bin/python3.6m /nix/store/2qhqyds7xq0g047ihqhx29b9vbvn0h88-meson-0.45.1/bin/meson --internal gtkdoc --sourcedir=/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12 --builddir=/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build --subdir=docs/reference/gdk-pixbuf --headerdirs=/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/gdk-pixbuf/.@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/gdk-pixbuf/.@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/contrib/gdk-pixbuf-xlib/.@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/contrib/gdk-pixbuf-xlib/. --mainfile=gdk-pixbuf.xml --modulename=gdk-pixbuf --mode=auto --scanargs=--deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"@@--ignore-headers=pixops gdk-pixbuf-alias.h gdk-pixbuf-marshal.h gdk-pixbuf-private.h gdk-pixbuf-xlib-private.h io-gif-animation.h io-ani-animation.h xpm-color-table.h test-images.h --gobjects-types-file=gdk-pixbuf.types --fixxrefargs=--html-dir=/nix/store/4yry0nvyc427mc0mjg6hrc46w5jqh2da-gdk-pixbuf-2.36.12/share/gtk-doc/html@@--extra-dir=/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/share/gtk-doc/html/glib@@--extra-dir=/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/share/gtk-doc/html/gobject@@--extra-dir=/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/share/gtk-doc/html/gio --html-assets=composite.png --content-files=/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.xml@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.xml@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf.xml@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml --cflags=-I/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/. -I/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/. -I/nix/store/6g6rzlg2rv7fwaicbqwbpjm4bc4xscyq-glib-2.56.0-dev/include/glib-2.0 -I/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/lib/glib-2.0/include -D_REENTRANT --ldflags=-L/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/gdk-pixbuf -Wl,-rpath,/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/gdk-pixbuf -lgdk_pixbuf-2.0 -lm -L/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/lib -lgobject-2.0 -lglib-2.0 -lgmodule-2.0 -lgio-2.0 --cc=/nix/store/8sy3wqjg78fpfp15ffq7scvkg8dj3y28-clang-wrapper-5.0.1/bin/cc --ld=/nix/store/8sy3wqjg78fpfp15ffq7scvkg8dj3y28-clang-wrapper-5.0.1/bin/cc'
Failed to run install script '/nix/store/88gcw0dr4w0798ws2sg6rnb9mhsl31yp-python3-3.6.5/bin/python3.6m /nix/store/2qhqyds7xq0g047ihqhx29b9vbvn0h88-meson-0.45.1/bin/meson --internal gtkdoc --sourcedir=/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12 --builddir=/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build --subdir=docs/reference/gdk-pixbuf --headerdirs=/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/gdk-pixbuf/.@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/gdk-pixbuf/.@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/contrib/gdk-pixbuf-xlib/.@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/contrib/gdk-pixbuf-xlib/. --mainfile=gdk-pixbuf.xml --modulename=gdk-pixbuf --mode=auto --scanargs=--deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"@@--ignore-headers=pixops gdk-pixbuf-alias.h gdk-pixbuf-marshal.h gdk-pixbuf-private.h gdk-pixbuf-xlib-private.h io-gif-animation.h io-ani-animation.h xpm-color-table.h test-images.h --gobjects-types-file=gdk-pixbuf.types --fixxrefargs=--html-dir=/nix/store/4yry0nvyc427mc0mjg6hrc46w5jqh2da-gdk-pixbuf-2.36.12/share/gtk-doc/html@@--extra-dir=/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/share/gtk-doc/html/glib@@--extra-dir=/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/share/gtk-doc/html/gobject@@--extra-dir=/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/share/gtk-doc/html/gio --html-assets=composite.png --content-files=/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.xml@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.xml@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf.xml@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml@@/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml --cflags=-I/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/. -I/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/. -I/nix/store/6g6rzlg2rv7fwaicbqwbpjm4bc4xscyq-glib-2.56.0-dev/include/glib-2.0 -I/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/lib/glib-2.0/include -D_REENTRANT --ldflags=-L/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/gdk-pixbuf -Wl,-rpath,/private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/gdk-pixbuf -lgdk_pixbuf-2.0 -lm -L/nix/store/sb2d7b7fzdc8sn692h35lm6crzcqy5nz-glib-2.56.0/lib -lgobject-2.0 -lglib-2.0 -lgmodule-2.0 -lgio-2.0 --cc=/nix/store/8sy3wqjg78fpfp15ffq7scvkg8dj3y28-clang-wrapper-5.0.1/bin/cc --ld=/nix/store/8sy3wqjg78fpfp15ffq7scvkg8dj3y28-clang-wrapper-5.0.1/bin/cc'
FAILED: meson-install
/nix/store/88gcw0dr4w0798ws2sg6rnb9mhsl31yp-python3-3.6.5/bin/python3.6m /nix/store/2qhqyds7xq0g047ihqhx29b9vbvn0h88-meson-0.45.1/bin/meson --internal install /private/tmp/nix-build-gdk-pixbuf-2.36.12.drv-0/gdk-pixbuf-2.36.12/build/meson-private/install.dat
ninja: build stopped: subcommand failed.
builder for '/nix/store/zqjnpml1w0q8fwjj8ys2a8cd107azax3-gdk-pixbuf-2.36.12.drv' failed with exit code 1
error: build of '/nix/store/zqjnpml1w0q8fwjj8ys2a8cd107azax3-gdk-pixbuf-2.36.12.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gdk_pixbuf

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/l5vsyfqkbhi87lhym1zvi6zw1lczwzz7-gdk-pixbuf-2.36.12-man
gzipping man pages under /nix/store/l5vsyfqkbhi87lhym1zvi6zw1lczwzz7-gdk-pixbuf-2.36.12-man/share/man/
strip is /nix/store/65ir27a74jycbnjfn1w6n5z701js27di-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/l5vsyfqkbhi87lhym1zvi6zw1lczwzz7-gdk-pixbuf-2.36.12-man
checking for references to /build in /nix/store/l5vsyfqkbhi87lhym1zvi6zw1lczwzz7-gdk-pixbuf-2.36.12-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/dbf52m9yzikfwymb0vabz0vrhgl4db27-gdk-pixbuf-2.36.12-devdoc
strip is /nix/store/65ir27a74jycbnjfn1w6n5z701js27di-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/dbf52m9yzikfwymb0vabz0vrhgl4db27-gdk-pixbuf-2.36.12-devdoc
checking for references to /build in /nix/store/dbf52m9yzikfwymb0vabz0vrhgl4db27-gdk-pixbuf-2.36.12-devdoc...
/nix/store/p76sy2dabijz5k5yr8hx378zz07rhs2w-gdk-pixbuf-2.36.12

@jtojnar jtojnar merged commit 50953c3 into NixOS:staging Apr 21, 2018
jtojnar added a commit that referenced this pull request Apr 21, 2018
@jtojnar
Revert "gdk_pixbuf: 2.36.7 → 2.36.12 (#39026)"
4c25932 
This reverts commit 50953c3.
@jtojnar jtojnar mentioned this pull request Apr 21, 2018
Merged
jtojnar added a commit that referenced this pull request Apr 21, 2018
@jtojnar
Revert "gdk_pixbuf: 2.36.7 → 2.36.12 (#39026)" (#39316)
c70a245 
This reverts commit 50953c3.
@jtojnar
Copy link
Contributor Author

jtojnar commented Apr 24, 2018

Merged again in 4b2f397

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti Awaiting requested review from peti

@vcunat vcunat Awaiting requested review from vcunat

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jtojnar @GrahamcOfBorg