01/03: gnu: xf86-video-sis: Fix FTBFS with xorg-server >= 1.20.

[Marius Bakke]

mbakke pushed a commit to branch staging
in repository guix.

commit c67f603d5508ff6fa8bf5b0185c53c40bc8646a3
Author: Marius Bakke <address@hidden>
Date:   Sun Jul 8 18:28:43 2018 +0200

    gnu: xf86-video-sis: Fix FTBFS with xorg-server >= 1.20.
    
    * gnu/packages/patches/xf86-video-sis-xorg-compat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/xorg.scm (xf86-video-sis)[source](patches): Use it.
---
 gnu/local.mk                                          |  1 +
 gnu/packages/patches/xf86-video-sis-xorg-compat.patch | 18 ++++++++++++++++++
 gnu/packages/xorg.scm                                 |  1 +
 3 files changed, 20 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index d2490dd..89bad3d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1215,6 +1215,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/xf86-video-i128-remove-mibstore.patch   \
   %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch      \
   %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
+  %D%/packages/patches/xf86-video-sis-xorg-compat.patch        \
   %D%/packages/patches/xf86-video-tga-remove-mibstore.patch    \
   %D%/packages/patches/xfce4-panel-plugins.patch               \
   %D%/packages/patches/xfce4-session-fix-xflock4.patch         \
diff --git a/gnu/packages/patches/xf86-video-sis-xorg-compat.patch 
b/gnu/packages/patches/xf86-video-sis-xorg-compat.patch
new file mode 100644
index 0000000..ebe9715
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-sis-xorg-compat.patch
@@ -0,0 +1,18 @@
+Remove use of interface no longer provided by xorg-server.
+
+Patch taken from upstream:
+https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=4b1356a2b7fd06e9a05d134caa4033681c939737
+
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 8f06164..513f68b 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -2738,7 +2738,7 @@ SiSPrintModes(ScrnInfoPtr pScrn)
+     float hsync, refresh = 0.0;
+     char *desc, *desc2, *prefix, *uprefix, *output;
+ 
+-    xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d "
++    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d "
+              "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY,
+              pScrn->displayWidth);
+ 
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4ce02b7..f253d79 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3266,6 +3266,7 @@ Xorg X server.")
                "mirror://xorg/individual/driver/xf86-video-sis-"
                version
                ".tar.bz2"))
+        (patches (search-patches "xf86-video-sis-xorg-compat.patch"))
         (sha256
           (base32
            "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"))))