[SCM] BOINC packaging branch, master, updated. upstream/7.0.27+dfsg-439-gb36f5fe

[Steffen Moeller]

The following commit has been merged in the master branch:
commit b36f5fe689ad4103d9729852204ce22f76aeb7d2
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Wed May 16 18:43:33 2012 +0200

    Preparing for screen saver.

diff --git a/debian/changelog b/debian/changelog
index 1102b53..8d964c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.27+dfsg-4) UNRELEASED; urgency=low
+
+  * Preparing for screen saver
+
+ -- Steffen Moeller <moeller at debian.org>  Wed, 16 May 2012 18:42:59 +0200
+
 boinc (7.0.27+dfsg-3) unstable; urgency=low
 
   * Now truly reconstituting compatibility with SETI
diff --git a/debian/patches/screensaver_woes.patch b/debian/patches/screensaver_woes.patch
new file mode 100644
index 0000000..a3f5e5b
--- /dev/null
+++ b/debian/patches/screensaver_woes.patch
@@ -0,0 +1,37 @@
+Index: boinc/clientscr/screensaver_x11.cpp
+===================================================================
+--- boinc.orig/clientscr/screensaver_x11.cpp	2012-03-31 13:44:23.171164107 +0200
++++ boinc/clientscr/screensaver_x11.cpp	2012-05-16 17:05:03.009253195 +0200
+@@ -531,9 +531,12 @@
+   for(int n = 0; n < 10; n++)
+     {
+       // get list of x clients
+-      xcb_atom_t NET_CLIENT_LIST = xcb_atom_get(con, "_NET_CLIENT_LIST");
++      //xcb_atom_t NET_CLIENT_LIST = xcb_atom_get(con, "_NET_CLIENT_LIST");
++      xcb_intern_atom_cookie_t cookie0=xcb_intern_atom(con, 0, strlen("_NET_CLIENT_LIST"), "_NET_CLIENT_LIST");;
++      xcb_intern_atom_reply_t *reply0=xcb_intern_atom_reply(con, cookie0, NULL);;
++
+       xcb_get_property_cookie_t cookie =
+-        xcb_get_property(con, 0, screen->root, NET_CLIENT_LIST, WINDOW, 0,
++        xcb_get_property(con, 0, screen->root, reply0->atom, XCB_ATOM_WINDOW, 0,
+                         std::numeric_limits<uint32_t>::max());
+ 
+       xcb_generic_error_t  *error;
+@@ -554,7 +557,7 @@
+           xcb_get_property_reply_t *reply2;
+ 
+           // check WM_COMMAND
+-          cookie = xcb_get_property(con, 0, clients[c], WM_COMMAND, STRING,
++          cookie = xcb_get_property(con, 0, clients[c], XCB_ATOM_WM_COMMAND, XCB_ATOM_STRING,
+                                     0, std::numeric_limits<uint32_t>::max());
+           reply2 = xcb_get_property_reply(con, cookie, &error);
+           if(!error) // ignore errors
+@@ -571,7 +574,7 @@
+             }
+ 
+           // check WM_CLASS
+-          cookie = xcb_get_property(con, 0, clients[c], WM_CLASS, STRING,
++          cookie = xcb_get_property(con, 0, clients[c], XCB_ATOM_WM_CLASS, XCB_ATOM_STRING,
+                                     0, std::numeric_limits<uint32_t>::max());
+           reply2 = xcb_get_property_reply(con, cookie, &error);
+           if(!error) // ignore errors
diff --git a/debian/patches/series b/debian/patches/series
index 585b968..bed6c78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,3 +54,4 @@ nvidia_mem_display_simplification.patch
 api_NULL_not_defined.patch
 wxWidgets_observations.patch
 unlink_undefined.patch
+screensaver_woes.patch

-- 
BOINC packaging