[boinc] 03/04: New upstream release
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sat Jan 2 18:02:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit a36482a7bf6319162f4247bee513085df7465555
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Dec 23 11:04:02 2015 +0100
New upstream release
---
debian/changelog | 12 +++
.../156b0be9f13b3427973f1d83a004947225b2d8b6.patch | 3 +
.../882d0cdd43d39bec7328be79c9da73a04c597ec7.patch | 98 ++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 114 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 1e8aa23..29cab2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+boinc (7.6.22+dfsg-1) unstable; urgency=medium
+
+ [ Gianfranco Costamagna ]
+ * Upload to unstable
+ * New upstream release.
+
+ [ Preston Maness ]
+ * debian/patches/882d0cdd43d39bec7328be79c9da73a04c597ec7.patch:
+ - fix idle detection in case X is not available.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Wed, 23 Dec 2015 11:02:42 +0100
+
boinc (7.6.21+dfsg-1exp1) experimental; urgency=medium
* Upload to experimental again, with the boinc-server-* packages.
diff --git a/debian/patches/156b0be9f13b3427973f1d83a004947225b2d8b6.patch b/debian/patches/156b0be9f13b3427973f1d83a004947225b2d8b6.patch
index 6b20e17..56c2f09 100644
--- a/debian/patches/156b0be9f13b3427973f1d83a004947225b2d8b6.patch
+++ b/debian/patches/156b0be9f13b3427973f1d83a004947225b2d8b6.patch
@@ -1,3 +1,6 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
From 156b0be9f13b3427973f1d83a004947225b2d8b6 Mon Sep 17 00:00:00 2001
From: Preston Maness <aggroskater at gmail.com>
Date: Wed, 16 Dec 2015 10:45:57 -0600
diff --git a/debian/patches/882d0cdd43d39bec7328be79c9da73a04c597ec7.patch b/debian/patches/882d0cdd43d39bec7328be79c9da73a04c597ec7.patch
new file mode 100644
index 0000000..4f40cf1
--- /dev/null
+++ b/debian/patches/882d0cdd43d39bec7328be79c9da73a04c597ec7.patch
@@ -0,0 +1,98 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+From 882d0cdd43d39bec7328be79c9da73a04c597ec7 Mon Sep 17 00:00:00 2001
+From: Preston Maness <aggroskater at gmail.com>
+Date: Fri, 18 Dec 2015 09:56:24 -0600
+Subject: [PATCH] Adjusting the failure behaviour of xss_idle to report idle
+ rather than busy, and send a message to the Event Log that X-based idle
+ detection is disabled. Also changed how to handle the 'Always' definition
+ conflict with X.h.
+
+---
+ client/hostinfo_unix.cpp | 17 +++++++++++------
+ lib/prefs.cpp | 2 +-
+ lib/prefs.h | 6 +-----
+ 3 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
+index c059895..5adc50e 100644
+--- a/client/hostinfo_unix.cpp
++++ b/client/hostinfo_unix.cpp
+@@ -43,6 +43,9 @@
+
+ #if HAVE_XSS
+ #include <X11/extensions/scrnsaver.h> //X-based idle detection
++// prevents naming collision between X.h define of Always and boinc's
++// lib/prefs.h definition in an enum.
++#undef Always
+ #endif
+
+ #include <cstdio>
+@@ -1959,10 +1962,12 @@ bool interrupts_idle(time_t t) {
+ bool xss_idle(long idle_threshold) {
+ static XScreenSaverInfo* xssInfo = NULL;
+ static Display* disp = NULL;
++ // if an X-related error occurs, set this to true and always
++ // report that we are idle (have xss_idle return true). Will report the
++ // failure in Event Log for user visibility.
+ static bool error = false;
+- // some X call failed - always return not idle
+
+- if (error) return false;
++ if (error) return true;
+
+ long idle_time = 0;
+
+@@ -1973,8 +1978,8 @@ bool xss_idle(long idle_threshold) {
+ //
+ if (disp == NULL) {
+ error = true;
+- //msg_printf(NULL, MSG_INFO, "XDisplay not found.");
+- return false;
++ msg_printf(NULL, MSG_INFO, "XDisplay not found. X-based idle detection disabled.");
++ return true;
+ }
+ int event_base_return, error_base_return;
+ xssInfo = XScreenSaverAllocInfo();
+@@ -1982,8 +1987,8 @@ bool xss_idle(long idle_threshold) {
+ disp, &event_base_return, &error_base_return
+ )){
+ error = true;
+- //msg_printf(NULL, MSG_INFO, "XScreenSaverQueryExtension() failed.");
+- return false;
++ msg_printf(NULL, MSG_INFO, "XScreenSaverQueryExtension() failed. X-based idle detection disabled.");
++ return true;
+ }
+ }
+
+diff --git a/lib/prefs.cpp b/lib/prefs.cpp
+index 9bd4160..3a8267e 100644
+--- a/lib/prefs.cpp
++++ b/lib/prefs.cpp
+@@ -149,7 +149,7 @@ bool TIME_SPAN::suspended(double hour) const {
+
+ TIME_SPAN::TimeMode TIME_SPAN::mode() const {
+ if (end_hour == start_hour || (start_hour == 0 && end_hour == 24)) {
+- return Always2;
++ return Always;
+ } else if (start_hour == 24 && end_hour == 0) {
+ return Never;
+ }
+diff --git a/lib/prefs.h b/lib/prefs.h
+index da81ea7..ebbe3cc 100644
+--- a/lib/prefs.h
++++ b/lib/prefs.h
+@@ -89,11 +89,7 @@ struct TIME_SPAN {
+ double end_hour;
+
+ enum TimeMode {
+- // "Always" is defined by X.h, which itself is (indirectly) included
+- // from client/hostinfo_unix.cpp when including the XSS API
+- // (<X11/extensions/scrnsaver.h>). Hence, renaming here (and in
+- // prefs.cpp).
+- Always2 = 7000,
++ Always = 7000,
+ Never,
+ Between
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 328ea9c..7ee4aaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@ disable_silent_rules.patch
envargs.patch
fix-underlinking.patch
156b0be9f13b3427973f1d83a004947225b2d8b6.patch
+882d0cdd43d39bec7328be79c9da73a04c597ec7.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list