summaryrefslogtreecommitdiff
path: root/extra/xf86-video-dummy/git-fix.diff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-19 11:22:26 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-19 11:22:26 +0100
commit56bf63be7060f55d0048fc1f2e37526723bf0dc7 (patch)
tree5072df371092a3bfded8d6aadca1af5018523291 /extra/xf86-video-dummy/git-fix.diff
parentd697117f3e2c400f8a7cae7bbbbf27166edc277a (diff)
parentb54c21859be3590a319ceade1f58d0b89ac5ef32 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/bitcoin/PKGBUILD community/chmsee/PKGBUILD community/projectm/PKGBUILD extra/apache/PKGBUILD extra/gv/PKGBUILD extra/libdc1394/PKGBUILD extra/libraw1394/PKGBUILD extra/samba/PKGBUILD extra/sg3_utils/PKGBUILD extra/upower/PKGBUILD extra/xf86-input-aiptek/PKGBUILD extra/xf86-video-modesetting/PKGBUILD extra/xorg-server/PKGBUILD libre/rp-pppoe-libre/PKGBUILD
Diffstat (limited to 'extra/xf86-video-dummy/git-fix.diff')
-rw-r--r--extra/xf86-video-dummy/git-fix.diff31
1 files changed, 31 insertions, 0 deletions
diff --git a/extra/xf86-video-dummy/git-fix.diff b/extra/xf86-video-dummy/git-fix.diff
new file mode 100644
index 000000000..4b0b46ef3
--- /dev/null
+++ b/extra/xf86-video-dummy/git-fix.diff
@@ -0,0 +1,31 @@
+From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:36 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 62066d6..6062c39 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -14,9 +14,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+
+@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+ , lines - pScrn->virtualY);
+ }
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+
+--
+cgit v0.9.0.2-2-gbebe