[SCM] BOINC packaging branch, master, updated. upstream/7.0.28+dfsg-446-g6f97e21

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 6f97e215c2f00314d738cb635fea0b35cbb5a24e
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue May 22 00:54:05 2012 +0200

    Bernd Machenschalk reviewed screensaver build

diff --git a/debian/patches/screensaver_woes.patch b/debian/patches/0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
similarity index 57%
rename from debian/patches/screensaver_woes.patch
rename to debian/patches/0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
index a3f5e5b..df5f616 100644
--- a/debian/patches/screensaver_woes.patch
+++ b/debian/patches/0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
@@ -1,23 +1,35 @@
-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 @@
+>From d8e6277f152c42464f1c23683a575d5826a45bbc Mon Sep 17 00:00:00 2001
+From: Bernd Machenschalk <bernd.machenschalk at ligo.org>
+Date: Mon, 21 May 2012 16:35:57 +0200
+Subject: [PATCH 1/2] Patch from Steffen Moeller for recent Xcb
+
+---
+ clientscr/screensaver_x11.cpp |   14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/clientscr/screensaver_x11.cpp b/clientscr/screensaver_x11.cpp
+index a2e2649..8f6a9a4 100644
+--- a/clientscr/screensaver_x11.cpp
++++ b/clientscr/screensaver_x11.cpp
+@@ -531,10 +531,14 @@ int main(int argc, char *argv[])
    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_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,
+-                        std::numeric_limits<uint32_t>::max());
 +        xcb_get_property(con, 0, screen->root, reply0->atom, XCB_ATOM_WINDOW, 0,
-                         std::numeric_limits<uint32_t>::max());
++			 std::numeric_limits<uint32_t>::max());
  
        xcb_generic_error_t  *error;
-@@ -554,7 +557,7 @@
+       xcb_get_property_reply_t *reply =
+@@ -554,7 +558,7 @@ int main(int argc, char *argv[])
            xcb_get_property_reply_t *reply2;
  
            // check WM_COMMAND
@@ -26,7 +38,7 @@ Index: boinc/clientscr/screensaver_x11.cpp
                                      0, std::numeric_limits<uint32_t>::max());
            reply2 = xcb_get_property_reply(con, cookie, &error);
            if(!error) // ignore errors
-@@ -571,7 +574,7 @@
+@@ -571,7 +575,7 @@ int main(int argc, char *argv[])
              }
  
            // check WM_CLASS
@@ -35,3 +47,6 @@ Index: boinc/clientscr/screensaver_x11.cpp
                                      0, std::numeric_limits<uint32_t>::max());
            reply2 = xcb_get_property_reply(con, cookie, &error);
            if(!error) // ignore errors
+-- 
+1.7.10.1
+
diff --git a/debian/patches/0002-re-enable-X11-screensaver-build.patch b/debian/patches/0002-re-enable-X11-screensaver-build.patch
new file mode 100644
index 0000000..d007099
--- /dev/null
+++ b/debian/patches/0002-re-enable-X11-screensaver-build.patch
@@ -0,0 +1,29 @@
+>From d5cb7777c766c302ce0d9c37315bae7468ae297c Mon Sep 17 00:00:00 2001
+From: Bernd Machenschalk <bernd.machenschalk at ligo.org>
+Date: Mon, 21 May 2012 17:39:14 +0200
+Subject: [PATCH 2/2] re-enable X11 screensaver build
+
+---
+ Makefile.am |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0c2ea14..f74a363 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,9 +22,9 @@ endif
+ 
+ if ENABLE_MANAGER
+    CLIENTGUI_SUBDIRS = clientgui locale
+-#if BUILD_X11_SCREENSAVER
+-#   CLIENTGUI_SUBDIRS += clientscr
+-#endif
++if BUILD_X11_SCREENSAVER
++   CLIENTGUI_SUBDIRS += clientscr
++endif
+ endif
+ 
+ # ORDER MATTERS below.  One must build dependencies FIRST, then things
+-- 
+1.7.10.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 8588534..1747ecb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ mac_addresses_cores_in_kfreebsd.patch
 stripchart_debian.patch
 upstream_sztaki_configureEval.patch
 generate_less.patch
-#Makefile_subdirs.patch
 csh2tcsh.patch
 possible_size_type_error.patch
 upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
@@ -54,4 +53,5 @@ nvidia_mem_display_simplification.patch
 api_NULL_not_defined.patch
 #convinceRom#wxWidgets_observations.patch
 unlink_undefined.patch
-screensaver_woes.patch
+0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
+0002-re-enable-X11-screensaver-build.patch

-- 
BOINC packaging