branch staging updated (92af3ce -> 68ee10d)

[Marius Bakke]

mbakke pushed a change to branch staging
in repository guix.

      from  92af3ce   Merge branch 'master' into staging
       new  c67f603   gnu: xf86-video-sis: Fix FTBFS with xorg-server >= 1.20.
       new  a4edd9a   gnu: xf86-video-savage: Fix FTBFS with xorg-server >= 
1.20.
       new  68ee10d   gnu: xf86-video-r128: Fix FTBFS with xorg-server >= 1.20.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk                                       |  2 +
 .../patches/xf86-video-savage-xorg-compat.patch    | 33 +++++++++++
 .../patches/xf86-video-sis-xorg-compat.patch       | 18 ++++++
 gnu/packages/xorg.scm                              | 66 ++++++++++++++--------
 4 files changed, 94 insertions(+), 25 deletions(-)
 create mode 100644 gnu/packages/patches/xf86-video-savage-xorg-compat.patch
 create mode 100644 gnu/packages/patches/xf86-video-sis-xorg-compat.patch