Merge branch 'master' into core-updates
gnu: xorg: Add presentproto. * gnu/packages/xorg.scm (presentproto): New variable.
gnu: xorg: Add dri3proto. * gnu/packages/xorg.scm (dri3proto): New variable.
gnu: xf86-input-evdev: Add required input udev. * gnu/packages/xorg.scm (xf86-input-evdev): Add input udev.
gnu: setxkbmap: Use xkeyboard-config as default config root. * gnu/packages/xorg.scm (setxkbmap): Add 'xkeyboard-config' as an input. Pass --with-xkb-config-root to configure.
gnu: Consolidate libjpeg, libpng, and libtiff into one module. * gnu/packages/image.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add image.scm and remove libjpeg.scm, libpng.scm, and libtiff.scm. * gnu/packages/libjpeg.scm, gnu/packages/libpng.scm, gnu/packages/libtiff.scm: Delete files. * gnu/packages/emacs.scm gnu/packages/games.scm, gnu/packages/gd.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm, gnu/packages/gimp.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnustep.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm, gnu/packages/gtk.scm, gnu/packages/imagemagick.scm, gnu/packages/inkscape.scm, gnu/packages/netpbm.scm, gnu/packages/pdf.scm, gnu/packages/plotutils.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm, gnu/packages/scheme.scm, gnu/packages/sdl.scm, gnu/packages/slim.scm, gnu/packages/tcl.scm, gnu/packages/texlive.scm, gnu/packages/video.scm, gnu/packages/xiph.scm, gnu/packages/xorg.scm: Use (gnu packages image) module.
Merge branch 'master' into core-updates
gnu: xterm: Upgrade to 304. * gnu/packages/xorg.scm (xterm): Upgrade to 304. Switch to a version-specific URL.
gnu: libsm: Propagate input libice. * gnu/packages/xorg.scm (libsm): Propagate input libice.
gnu: xorg: libxxf86dga: Propagate input xf86dgaproto. * gnu/packages/xorg.scm (libxxf86dga): Propagate input xf86dgaproto.
gnu: Add perl-x11-protocol * gnu/packages/xorg.scm (perl-x11-protocol): New variable
Merge branch 'core-updates'
Merge branch 'master' into core-updates
gnu: util-macros: Install .pc file in lib/pkgconfig; remove INSTALL file. * gnu/packages/xorg.scm (util-macros): Substitute "$(libdir)/pkgconfig" for "$(datadir)/pkgconfig" in Makefile.in. After install, remove share/util-macros/INSTALL and share/util-macros.
gnu: xterm: Upgrade to 303. * gnu/packages/xorg.scm (xterm): Upgrade to 303.
gnu: libxft: Propagate Freetype and Fontconfig. * gnu/packages/xorg.scm (libxft): Move Freetype and Fontconfig from 'inputs' to 'propagated-inputs'.
Merge branch 'master' into core-updates Conflicts: gnu-system.am
gnu: Add xterm. * gnu/packages/xorg.scm (xterm): New variable.
gnu: xorg-server: Use /var as $localstatedir. * gnu/packages/xorg.scm (xorg-server): Pass --localstatedir=/var. In 'configure' phase, patch 'hw/xfree86/Makefile.in'.
Merge branch 'master' into core-updates