[SCM] BOINC packaging branch, debian/experimental, updated. debian/6.4.5-1-2-gf58dd21

rmayorga rmayorga at debian.org
Sat May 23 20:05:13 UTC 2009


The following commit has been merged in the debian/experimental branch:
commit 88677fe3083e134959d3bbdafd9b0b3bdc802c9a
Author: rmayorga <rmayorga at debian.org>
Date:   Sat May 16 21:39:50 2009 -0600

    Add gcc 4.4 patch

diff --git a/debian/patches/102_gcc4.4_safe.patch b/debian/patches/102_gcc4.4_safe.patch
new file mode 100644
index 0000000..449a10c
--- /dev/null
+++ b/debian/patches/102_gcc4.4_safe.patch
@@ -0,0 +1,32 @@
+--- boinc.orig/sched/sched_driver.cpp
++++ boinc/sched/sched_driver.cpp
+@@ -40,6 +40,7 @@
+ #define HOSTID "7"
+     // ID of a host belonging to that user
+ 
++#include <cstdio>
+ #include <vector>
+ #include "util.h"
+ 
+--- boinc.orig/sched/sched_util.cpp
++++ boinc/sched/sched_util.cpp
+@@ -104,7 +104,7 @@
+ #else
+ int try_fopen(const char* path, FCGI_FILE*& f, const char *mode) {
+ #endif
+-    char* p;
++    const char* p;
+     DIR* d;
+     char dirpath[256];
+ 
+--- boinc.orig/clientgui/common/wxFlatNotebook.cpp
++++ boinc/clientgui/common/wxFlatNotebook.cpp
+@@ -607,7 +607,7 @@
+ //
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ 
+-BEGIN_EVENT_TABLE(wxPageContainerBase, wxControl)
++BEGIN_EVENT_TABLE(wxPageContainerBase, wxPanel)
+ EVT_PAINT(wxPageContainerBase::OnPaint)
+ EVT_SIZE(wxPageContainerBase::OnSize)
+ EVT_LEFT_DOWN(wxPageContainerBase::OnLeftDown)
diff --git a/debian/patches/series b/debian/patches/series
index 769fd51..687268f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 005_using_hyphen_as_minus.patch
 006_correct_catalog_path.patch
 101_check_RSA_returned_values.patch
+102_gcc4.4_safe.patch

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list