Merge branch 'master' into xorg-updates

Really remove the 'nix-upstream' submodule.

* nix-upstream: Remove subproject.

gnu: Add xfce4-terminal.

* gnu/packages/xfce.scm (xfce4-terminal): New variable.

gnu: Add vte.

* gnu/packages/gnome.scm (vte, vte/gtk+-2): New variables.

gnu: Consistently use modular xorg source URIs in xorg.scm.

* gnu/packages/xorg.scm (bigreqsproto, compositeproto, damageproto)
  (dmxproto, encodings, font-adobe100dpi, font-adobe75dpi, font-alias)
  (font-arabic-misc, font-cronyx-cyrillic, font-dec-misc, font-isas-misc)
  (font-micro-misc, font-misc-cyrillic, font-misc-ethiopic, font-misc-misc)
  (font-mutt-misc, font-schumacher-misc, font-screen-cyrillic, font-sony-misc)
  (font-sun-misc, font-util, font-winitzki-cyrillic, font-xfree86-type1)
  (libpthread-stubs, libwindowswm, libxdmcp, libxkbfile, libxscrnsaver)
  (luit, recordproto, renderproto, resourceproto, scrnsaverproto, setxkbmap)
  (smproxy, windowswmproto, x11perf, xcb-proto, xcmiscproto, xcmsdb, xdriinfo)
  (xf86-input-void, xf86-video-newport, xf86bigfontproto, xf86dgaproto)
  (xf86driproto, xf86vidmodeproto, xgamma, xineramaproto, xkbevd, xlsatoms)
  (xorg-sgml-doctools, xpr, xwud, fixesproto, mkfontdir, libxcb, xcb-util)
  (xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, kbproto, xbitmaps):
  Use source URIs with prefix mirror://xorg/individual/ for consistency.
  (dri3proto, presentproto, printproto): Remove comments about them not
  being part of X11R7.7.

gnu: xorg-server: Update to 1.16.2.901, with many security fixes.

Includes fixes for CVE-2014-8091, CVE-2014-8092, CVE-2014-8093, CVE-2014-8094,
CVE-2014-8095, CVE-2014-8096, CVE-2014-8097, CVE-2014-8098, CVE-2014-8099,
CVE-2014-8100, CVE-2014-8101, CVE-2014-8102, and CVE-2014-8103.

See <http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/>

* gnu/packages/xorg.scm (xorg-server): Update to 1.16.2.901.  Move mesa,
  resourceproto, scrnsaverproto, and xf86driproto from inputs to
  propagated-inputs.  Add dri3proto and presentproto to propagated-inputs.
  Add eudev and libxshmfence to inputs.  Add a 'pre-configure' phase instead
  of modifying the 'configure' phase.  Adapt substitution that avoids trying
  to 'mkdir /var' to build system changes.

* gnu/services/xorg.scm (xserver.conf): Add xf86-input-evdev ModulePath line.

gnu: xf86-video-voodoo: Update to 1.2.5.

* gnu/packages/xorg.scm (xf86-video-voodoo): Update to 1.2.5.

gnu: xf86-video-vmware: Update to 13.0.2.

* gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-vmware): Update to 13.0.2.
  Add patch.  Add mesa to inputs.

gnu: xf86-video-vesa: Update to 2.3.3.

* gnu/packages/xorg.scm (xf86-video-vesa): Update to 2.3.3.

gnu: xf86-video-trident: Update to 1.3.6.

* gnu/packages/patches/xf86-video-trident-remove-mibstore.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-trident): Update to 1.3.6.  Add patch.

gnu: xf86-video-tga: Update to 1.2.2.

* gnu/packages/patches/xf86-video-tga-remove-mibstore.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-tga): Update to 1.2.2.  Add patch.

gnu: xf86-video-tdfx: Update to 1.4.5.

* gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-tdfx): Update to 1.4.5.  Add patch.

gnu: xf86-video-sunffb: Update to 1.2.2.

* gnu/packages/xorg.scm (xf86-video-sunffb): Update to 1.2.2.

gnu: xf86-video-suncg6: Update to 1.1.2.

* gnu/packages/xorg.scm (xf86-video-suncg6): Update to 1.1.2.

gnu: xf86-video-modesetting: Now uses the same libdrm as mesa.

* gnu/packages/xorg.scm (xf86-video-modesetting): Remove a comment stating
  that the libdrm used in this driver is incompatible with the one in mesa,
  because it is no longer true.
* gnu/services/xorg.scm (xserver.conf): Uncomment 'xf86-video-modesetting'
  ModulePath and remove associated comment.

gnu: xf86-video-sis: Update to 0.10.7.

* gnu/packages/patches/xf86-video-sis-update-api.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-sis): Update to 0.10.7.  Add patch.

gnu: xf86-video-siliconmotion: Update to 1.7.7.

* gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch:
  New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-siliconmotion): Update to 1.7.7.
  Add patch.

gnu: xf86-video-savage: Update to 2.3.7.

* gnu/packages/xorg.scm (xf86-video-savage): Update to 2.3.7.

gnu: xf86-video-r128: Update to 6.9.2.

* gnu/packages/patches/xf86-video-r128-glibc-2.20.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-r128): Update to 6.9.2.  Add patch.

gnu: xf86-video-openchrome: Update to 0.3.3.

* gnu/packages/patches/xf86-video-openchrome-includes.patch: Remove.
* gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it and remove the other.
* gnu/packages/xorg.scm (xf86-video-openchrome): Update to 0.3.3.
  Add one patch and remove the other.