From f773c19c5aa7aeeee4ccb5cb264a5e10f4c92e86 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Wed, 28 Feb 2007 20:03:02 +0000
Subject: [PATCH] - libXrandr-1.2.0-appease-cee-plus-plus.patch: don't use C++
 keywords as     function argument names.

---
 libXrandr-1.2.0-appease-cee-plus-plus.patch | 11 +++++++++++
 libXrandr.spec                              |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 libXrandr-1.2.0-appease-cee-plus-plus.patch

diff --git a/libXrandr-1.2.0-appease-cee-plus-plus.patch b/libXrandr-1.2.0-appease-cee-plus-plus.patch
new file mode 100644
index 0000000..946a5ff
--- /dev/null
+++ b/libXrandr-1.2.0-appease-cee-plus-plus.patch
@@ -0,0 +1,11 @@
+--- libXrandr-1.2.0/include/X11/extensions/Xrandr.h.jx	2006-12-13 04:24:25.000000000 -0500
++++ libXrandr-1.2.0/include/X11/extensions/Xrandr.h	2007-02-28 14:43:34.000000000 -0500
+@@ -296,7 +296,7 @@
+ int
+ XRRGetOutputProperty (Display *dpy, RROutput output,
+ 		      Atom property, long offset, long length,
+-		      Bool delete, Bool pending, Atom req_type, 
++		      Bool, Bool pending, Atom req_type, 
+ 		      Atom *actual_type, int *actual_format,
+ 		      unsigned long *nitems, unsigned long *bytes_after,
+ 		      unsigned char **prop);
diff --git a/libXrandr.spec b/libXrandr.spec
index 091d9df..a3c4474 100644
--- a/libXrandr.spec
+++ b/libXrandr.spec
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Patch0: libXrandr-1.2.0-appease-cee-plus-plus.patch
 
 BuildRequires: pkgconfig
 # xrandr.pc Requires: xproto randrproto >= 1.2.1
@@ -37,6 +38,7 @@ X.Org X11 libXrandr development package
 
 %prep
 %setup -q
+%patch0 -p1 -b .cpp
 
 %build
 %configure  --disable-static
@@ -73,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Feb 28 2007 Adam Jackson <ajax@redhat.com> 1.2.0-2
+- libXrandr-1.2.0-appease-cee-plus-plus.patch: don't use C++ keywords as
+  function argument names.
+
 * Wed Feb 21 2007 Adam Jackson <ajax@redhat.com> 1.2.0-1
 - libXrandr 1.2.0