[boinc] 01/01: Fixing lp 1274456

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Mon Feb 3 18:08:36 UTC 2014


This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit ea24b74d14371df8d15440daf6968c77af76f6e9
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Feb 3 19:08:29 2014 +0100

    Fixing lp 1274456
---
 debian/changelog                    |  1 +
 debian/patches/fix-lp-1274456.patch | 23 +++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1d85118..67189ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ boinc (7.2.33+dfsg-2) unstable; urgency=low
     - Re-enabled boinc-amd-opencl for unstable
     - Dropped nvidia-current in favour of nvidia-304 | nvidia-310 | nvidia-319
       (LP: #1268409)
+    - Added Jussi Lahtinen patch for fixing LP: #1274456
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 25 Nov 2013 18:03:56 +0100
 
diff --git a/debian/patches/fix-lp-1274456.patch b/debian/patches/fix-lp-1274456.patch
new file mode 100644
index 0000000..cd81ad5
--- /dev/null
+++ b/debian/patches/fix-lp-1274456.patch
@@ -0,0 +1,23 @@
+Author: Jussi Lahtinen
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1274456
+
+--- boinc-7.2.33+dfsg.orig/client/hostinfo_unix.cpp
++++ boinc-7.2.33+dfsg/client/hostinfo_unix.cpp
+@@ -1867,6 +1867,7 @@ bool xss_idle(long idle_treshold) {
+     static Display* disp = NULL;
+     
+     long idle_time = 0;
++    int  event_base_return, error_base_return;
+     
+     if(disp != NULL) {
+         XScreenSaverQueryInfo(disp, DefaultRootWindow(disp), xssInfo);
+@@ -1923,6 +1924,9 @@ bool xss_idle(long idle_treshold) {
+         // or DISPLAY points to wrong/invalid display
+         if(disp != NULL) {
+             xssInfo = XScreenSaverAllocInfo();
++            if (!XScreenSaverQueryExtension(disp, &event_base_return, &error_base_return)){
++               // How to handle failing?
++            }
+         }
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 90b1342..b4fc32c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -75,3 +75,4 @@ file_upload_handler_in_sched_linking.patch
 disable_silent_rules.patch
 server_status_php.patch
 #db_interface_use.patch
+fix-lp-1274456.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