Merge branch 'core-updates' Conflicts: gnu/packages/bootstrap.scm
Merge branch 'master' into core-updates
gnu: evince: Add inputs. * gnu/packages/gnome.scm (evince): Add 'dconf' and 'libcanberra' inputs. Remove custom phase 'set-mime-search-path which is now handled by glib-or-gtk-build-system.
gnu: dconf: Add dconf. * gnu/packages/gnome.scm (dconf): New variable.
Merge branch 'master' into core-updates
gnu: icon-naming-utils: Wrap with PERL5LIB to find XML::Simple. Fixes <http://bugs.gnu.org/19367>. * gnu/packages/gnome.scm (icon-naming-utils)[arguments]: New field.
Merge branch 'master' into core-updates
gnu: libxml2: Add search path specification. * gnu/packages/xml.scm (libxml2)[native-search-paths, search-paths]: New fields. * gnu/packages/gnome.scm (gnome-doc-utils)[arguments]: Remove. * gnu/packages/gps.scm (gpscorrelate)[arguments]: Remove settings for 'XML_CATALOG_FILES' from 'configure' phase. * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise.
Merge branch 'xorg-updates'
Merge branch 'master' into core-updates
gnu: gtkglext: Add glu to inputs. * gnu/packages/gnome.scm (gtkglext): Add glu to inputs.
Merge branch 'master' into xorg-updates
gnu: Add vte. * gnu/packages/gnome.scm (vte, vte/gtk+-2): New variables.
gnu: Add vala. * gnu/packages/gnome.scm (vala): New variable.
Merge branch 'master' into 'core-updates'.
gnu: libwnck: Propagate inputs. * gnu/packages/gnome.scm (libwnck, libwnck-1): Propagate inputs libxres and startup-notification.
gnu: Add libwnck. * gnu/packages/gnome.scm (libwnck, libwnck-1): New variables.
gnu: evince: Use 'glib-or-gtk-build-system'. * gnu/packages/gnome.scm (evince)[build-system]: Switch to GLIB-OR-GTK-BUILD-SYSTEM.
gnu: Add gnome-themes-standard. * gnu/packages/gnome.scm (gnome-themes-standard): New variable.
gnu: librsvg: Generate complete loaders.cache including support for SVG. * gnu/packages/gnome.scm (librsvg): Add 'generate-full-cache phase.