[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-212-g53fcab8

Steffen Moeller moeller at debian.org
Sat Apr 9 13:19:15 UTC 2011


The following commit has been merged in the master branch:
commit 53fcab84214067aec2340b577a03d516ae4232f2
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Apr 9 15:18:55 2011 +0200

    Added patch avoiding const warnings.

diff --git a/debian/patches/AdvancedFrame_const.patch b/debian/patches/AdvancedFrame_const.patch
new file mode 100644
index 0000000..1d5ec53
--- /dev/null
+++ b/debian/patches/AdvancedFrame_const.patch
@@ -0,0 +1,32 @@
+Index: boinc/clientgui/AdvancedFrame.cpp
+===================================================================
+--- boinc.orig/clientgui/AdvancedFrame.cpp	2011-03-29 18:06:52.000000000 +0200
++++ boinc/clientgui/AdvancedFrame.cpp	2011-03-29 19:01:31.000000000 +0200
+@@ -1494,14 +1494,14 @@
+     int prog;
+ #endif
+     int argc = 3;
+-    char* argv[3];
++    char* const argv[3] = {
++	 const_cast<char *>("boincmgr"),
++	 const_cast<char *>("--multiple"),
++	 const_cast<char *>("")
++    };
+ 
+     wxString strExecutable = wxGetApp().GetRootDirectory() + wxGetApp().GetExecutableName();
+ 
+-    argv[0] = "boincmgr";
+-    argv[1] = "--multiple";
+-    argv[2] = "";
+-
+     run_program(
+         wxGetApp().GetRootDirectory().mb_str(),
+         strExecutable.mb_str(),
+@@ -1510,6 +1510,7 @@
+         2.0,
+         prog
+     );
++
+ #else
+     char s[512];
+     unsigned char procName[256];

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list