03/03: gnu: xf86-video-sis: Update to 0.12.0.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 49db1ef2b0a0be730f2bd0cfd6396e146990b1d1
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Sep 1 23:16:29 2020 +0300

    gnu: xf86-video-sis: Update to 0.12.0.
    
    * gnu/packages/xorg.scm (xf86-video-sis): Update to 0.12.0.
    [source]: Remove patch.
    * gnu/packages/patches/xf86-video-sis-xorg-compat.patch: Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                          |  1 -
 gnu/packages/patches/xf86-video-sis-xorg-compat.patch | 18 ------------------
 gnu/packages/xorg.scm                                 |  9 ++++-----
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index dfb9640..44f7d61 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1673,7 +1673,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch      \
   %D%/packages/patches/xf86-video-savage-xorg-compat.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/xf86-video-voodoo-pcitag.patch          \
   %D%/packages/patches/xfce4-panel-plugins.patch               \
diff --git a/gnu/packages/patches/xf86-video-sis-xorg-compat.patch 
b/gnu/packages/patches/xf86-video-sis-xorg-compat.patch
deleted file mode 100644
index ebe9715..0000000
--- a/gnu/packages/patches/xf86-video-sis-xorg-compat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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 e777e77..868a062 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3363,7 +3363,7 @@ Xorg X server.")
 (define-public xf86-video-sis
   (package
     (name "xf86-video-sis")
-    (version "0.10.9")
+    (version "0.12.0")
     (source
       (origin
         (method url-fetch)
@@ -3371,16 +3371,15 @@ 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"))))
+         (base32
+          "0nrs6cjldlhakx5987fiiggjrlzilsbdc7l9pz22x1iwslbkz78i"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))
     (native-inputs
-      `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/";)
     (synopsis "Sis video driver for X server")
     (description