[boinc-client] boinc-xcb-compat.patch: Also fix the atom enums to be compatible with new XCB.

[Adam Jackson]

commit c093f83742acce8f84833c32cc13af22805f020b
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jan 12 16:26:04 2012 -0500

    boinc-xcb-compat.patch: Also fix the atom enums to be compatible with
    new XCB.

 boinc-client.spec      |    6 +++++-
 boinc-xcb-compat.patch |   12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/boinc-client.spec b/boinc-client.spec
index 47b5a2d..4791018 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.12.35
-Release:	3.r%{revision}svn%{?dist}
+Release:	4.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -356,6 +356,10 @@ fi
 %{_includedir}/boinc
 
 %changelog
+* Thu Jan 12 2012 Adam Jackson <ajax at redhat.com> 6.12.35-4.rsvn
+- boinc-xcb-compat.patch: Also fix the atom enums to be compatible with
+  new XCB.
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 6.12.35-3.r24014svn
 - Rebuild for new libpng
 
diff --git a/boinc-xcb-compat.patch b/boinc-xcb-compat.patch
index 53d06fc..1174b81 100644
--- a/boinc-xcb-compat.patch
+++ b/boinc-xcb-compat.patch
@@ -1,7 +1,7 @@
 diff -up boinc_core_release_6_12/clientscr/screensaver_x11.cpp.jx boinc_core_release_6_12/clientscr/screensaver_x11.cpp
 --- boinc_core_release_6_12/clientscr/screensaver_x11.cpp.jx	2010-07-19 16:06:49.000000000 -0400
-+++ boinc_core_release_6_12/clientscr/screensaver_x11.cpp	2011-12-01 17:35:50.357000051 -0500
-@@ -397,6 +397,22 @@ void *event_loop(void*)
++++ boinc_core_release_6_12/clientscr/screensaver_x11.cpp	2012-01-12 16:19:22.152079366 -0500
+@@ -397,6 +397,30 @@ void *event_loop(void*)
    pthread_exit(0);
  }
  
@@ -21,6 +21,14 @@ diff -up boinc_core_release_6_12/clientscr/screensaver_x11.cpp.jx boinc_core_rel
 +	return atom;
 +}
 +
++/* also hack */
++#ifndef WINDOW
++#define WINDOW XCB_ATOM_WINDOW
++#define WM_COMMAND XCB_ATOM_WM_COMMAND
++#define STRING XCB_ATOM_STRING
++#define WM_CLASS XCB_ATOM_WM_CLASS
++#endif
++
  /// Program entry point.
  int main(int argc, char *argv[])
  {