* gnu/packages/xdisorg.scm (slop): Update to 5.3.21.
[arguments]: Specify -std=gnu++11 in #:configure-flags.
[inputs]: Drop LIBX11, LIBXRANDR, IMLIB2 and GLEW. Add GLM.
* gnu/packages/patches/xf86-input-wacom-xorg-abi-25.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/xdisorg.scm (xf86-input-wacom)[source](patches): Use it.
Conflicts:
gnu/local.mk: Missing mention of gdk-pixbuf-list-dir.patch in the
commit log really confused me here... It's from 8c6b077bfa (staging).
gnu/packages/xorg.scm: xkeyboard-config updated both places.
* gnu/packages/patches/pixman-CVE-2016-5296.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/xdisorg.scm (pixman)[replacement]: New field.
(pixman/fixed): New variable.
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.