diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh index 033d030..0d9b2ad 100755 --- a/make-git-snapshot.sh +++ b/make-git-snapshot.sh @@ -13,5 +13,5 @@ fi git log | head -1 | awk '{ print $2 }' > ../commitid git repack -a -d cd .. -tar jcf $DIRNAME.tar.bz2 $DIRNAME +tar cf - $DIRNAME | xz -c9 > $DIRNAME.tar.xz rm -rf $DIRNAME diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index c62f3dc..20236fd 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.99 -Release: 32.%{gitdate}%{?dist} +Release: 33.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -83,9 +83,6 @@ Patch6029: xserver-1.6.1-proc-cmdline.patch Patch6030: xserver-1.6.99-right-of.patch Patch6031: xserver-1.6.99-dri2-crash-fixes.patch -# ajax, please fix me -Patch9000: xserver-1.6.99-show-ugly-cursor.patch - %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri %define sdkdir %{_includedir}/xorg @@ -511,6 +508,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Tue Aug 11 2009 Adam Jackson 1.6.99-33.20090807 +- xserver-1.6.99-show-ugly-cursor.patch: Drop, gtk bug found. + * Tue Aug 11 2009 Dave Airlie 1.6.99-32.20090807 - update to latest -git for EXA fixes diff --git a/xserver-1.6.99-show-ugly-cursor.patch b/xserver-1.6.99-show-ugly-cursor.patch deleted file mode 100644 index 15f3b09..0000000 --- a/xserver-1.6.99-show-ugly-cursor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 33856dc328da576bbb96602df93e7e35ad36bd01 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 10 Aug 2009 19:59:25 -0400 -Subject: [PATCH] un-suppress the initial root cursor momentarily - ---- - xfixes/cursor.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/xfixes/cursor.c b/xfixes/cursor.c -index acc703a..f88476a 100644 ---- a/xfixes/cursor.c -+++ b/xfixes/cursor.c -@@ -134,7 +134,7 @@ typedef struct _CursorScreen { - #define Unwrap(as,s,elt,backup) (((backup) = (s)->elt), (s)->elt = (as)->elt) - - /* The cursor doesn't show up until the first XDefineCursor() */ --static Bool CursorVisible = FALSE; -+static Bool CursorVisible = TRUE; - - Bool EnableCursor = TRUE; - --- -1.6.2.2 -