diff --git a/0001-protocol-versions-Bump-minor-version-of-XI.patch b/0001-protocol-versions-Bump-minor-version-of-XI.patch new file mode 100644 index 0000000..73926de --- /dev/null +++ b/0001-protocol-versions-Bump-minor-version-of-XI.patch @@ -0,0 +1,26 @@ +From fcf7973d1b1e3ee6b418b2953d41422f643c0c82 Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" +Date: Wed, 23 Jan 2013 18:11:55 +0000 +Subject: [PATCH] protocol-versions: Bump minor version of XI + +This was accidentally excluded when we added barriers. +--- + include/protocol-versions.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/protocol-versions.h b/include/protocol-versions.h +index cb8e213..10f5117 100644 +--- a/include/protocol-versions.h ++++ b/include/protocol-versions.h +@@ -127,7 +127,7 @@ + + /* X Input */ + #define SERVER_XI_MAJOR_VERSION 2 +-#define SERVER_XI_MINOR_VERSION 2 ++#define SERVER_XI_MINOR_VERSION 3 + + /* XKB */ + #define SERVER_XKB_MAJOR_VERSION 1 +-- +1.8.1 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 7eaf2a8..b668b50 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -42,7 +42,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.13.99.901 -Release: 2%{?gitdate:.%{gitdate}}%{dist} +Release: 3%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -109,8 +109,8 @@ Patch7065: 0001-xfree86-hotplug-cleanup-properly-if-the-screen-fails.patch Patch7066: 0001-xf86crtc-don-t-use-display-for-vx-vy-for-gpu-screens.patch # autoconfig: send events Patch7067: 0001-autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch - - +# http://patchwork.freedesktop.org/patch/12922/mbox/ +Patch7068: 0001-protocol-versions-Bump-minor-version-of-XI.patch %global moduledir %{_libdir}/xorg/modules %global drimoduledir %{_libdir}/dri @@ -584,6 +584,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Wed Jan 23 2013 Adam Jackson 1.13.99.901-3 +- Bump XI minor for barriers + * Wed Jan 09 2013 Adam Jackson 1.13.99.901-2 - Pick up fixes from git