[boinc-client] Rebuild for new xcb-util boinc-glib-compat.patch: Build compat with new glib boinc-xcb-compat.patch:

Adam Jackson ajax at fedoraproject.org
Thu Dec 1 17:49:04 UTC 2011


commit ebd05af7f414285c68c9c045a0850378e7afd2e2
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Dec 1 17:47:54 2011 -0500

    Rebuild for new xcb-util
    boinc-glib-compat.patch: Build compat with new glib
    boinc-xcb-compat.patch: Build compat with new xcb-util

 boinc-client.spec      |    6 +++++-
 boinc-xcb-compat.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/boinc-client.spec b/boinc-client.spec
index 36c9ace..fc6e006 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -36,6 +36,8 @@ Patch0:		boinc-guirpcauth.patch
 Patch1:		boinc-libnotify.patch
 # build fix for new glib
 Patch2:		boinc-glib-compat.patch
+# build fix for new xcb-util
+Patch3:		boinc-xcb-compat.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	logrotate
@@ -126,6 +128,7 @@ This package contains documentation files for %{name}.
 %patch0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # fix utf8
 iconv -f ISO88591 -t UTF8 < checkin_notes > checkin_notes.utf8
@@ -353,9 +356,10 @@ fi
 %{_includedir}/boinc
 
 %changelog
-* Tue Nov 29 2011 Adam Jackson <ajax at redhat.com> 6.12.35-2.rsvn
+* Thu Dec 01 2011 Adam Jackson <ajax at redhat.com> 6.12.35-2.rsvn
 - Rebuild for new xcb-util
 - boinc-glib-compat.patch: Build compat with new glib
+- boinc-xcb-compat.patch: Build compat with new xcb-util
 
 * Fri Aug 19 2011 Miloš Jakubíček <xjakub at fi.muni.cz> - 6.12.35-1.r24014svn
 - Update to 6.12 branch (fix BZ#719875, BZ#690333)
diff --git a/boinc-xcb-compat.patch b/boinc-xcb-compat.patch
new file mode 100644
index 0000000..53d06fc
--- /dev/null
+++ b/boinc-xcb-compat.patch
@@ -0,0 +1,26 @@
+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*)
+   pthread_exit(0);
+ }
+ 
++/* hack */
++static xcb_atom_t
++xcb_atom_get(xcb_connection_t *connection, const char *atom_name)
++{
++	if(atom_name == NULL)
++		return XCB_NONE;
++	xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection,
++		xcb_intern_atom(connection, 0, strlen(atom_name), atom_name),
++				NULL);
++	if(!reply)
++		return XCB_NONE;
++	xcb_atom_t atom = reply->atom;
++	free(reply);
++	return atom;
++}
++
+ /// Program entry point.
+ int main(int argc, char *argv[])
+ {


More information about the scm-commits mailing list