diff options
| author | Andy Wingo <wingo@igalia.com> | 2016-02-18 21:28:30 +0100 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-02-24 11:49:57 -0500 |
| commit | bcd4a740397bf7812879fba288424586d62edd9c (patch) | |
| tree | 59d40ecab5e392caa73f0b8232bea0e3471d6433 | |
| parent | 816decebf27352ee0843a2d3d8f06fa0979e10da (diff) | |
| download | guix-bcd4a740397bf7812879fba288424586d62edd9c.tar.gz | |
gnu: xf86-video-trident: Update to 1.3.7.
* gnu/packages/patches/xf86-video-trident-remove-mibstore.patch: Delete file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/xorg.scm (xf86-video-trident): Update to 1.3.7. [source]: Remove patch.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/xf86-video-trident-remove-mibstore.patch | 23 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 6 |
3 files changed, 2 insertions, 28 deletions
diff --git a/gnu-system.am b/gnu-system.am index b74ba26e5a..dd39e86398 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -774,7 +774,6 @@ dist_patch_DATA = \ gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \ gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \ - gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \ gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \ gnu/packages/patches/xfce4-panel-plugins.patch \ gnu/packages/patches/xfce4-session-fix-xflock4.patch \ diff --git a/gnu/packages/patches/xf86-video-trident-remove-mibstore.patch b/gnu/packages/patches/xf86-video-trident-remove-mibstore.patch deleted file mode 100644 index 74c89878e7..0000000000 --- a/gnu/packages/patches/xf86-video-trident-remove-mibstore.patch +++ /dev/null @@ -1,23 +0,0 @@ -Removes references to mibstore.h and miInitializeBackingStore, which -have been removed from xorg-server. Zack Rusin <zackr@vmware.com> -wrote: "It was a noop for at least 5 years and it has been removed." -See: http://patches.openembedded.org/patch/46133/ - ---- xf86-video-trident-1.3.6/src/trident_driver.c.~1~ 2012-07-15 22:16:00.000000000 -0400 -+++ xf86-video-trident-1.3.6/src/trident_driver.c 2014-12-19 01:45:29.529410518 -0500 -@@ -56,7 +56,6 @@ - - #include "mipointer.h" - --#include "mibstore.h" - #include "shadow.h" - #include "trident.h" - #include "trident_regs.h" -@@ -3037,7 +3036,6 @@ - TridentAccelInit(pScreen); - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* Initialise cursor functions */ diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3b984a8ef5..02ff6a721b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3287,7 +3287,7 @@ X server.") (define-public xf86-video-trident (package (name "xf86-video-trident") - (version "1.3.6") + (version "1.3.7") (source (origin (method url-fetch) @@ -3297,9 +3297,7 @@ X server.") ".tar.bz2")) (sha256 (base32 - "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a")) - (patches (list - (search-patch "xf86-video-trident-remove-mibstore.patch"))))) + "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc")))) (build-system gnu-build-system) (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) |