[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-113-g718343f
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Wed Dec 12 00:33:21 UTC 2012
The following commit has been merged in the master branch:
commit 718343f0b9e6b2ab35b7bab829bf5430d9a453fe
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Dec 12 01:32:29 2012 +0100
Preparing for new upstream release 7.0.42 (some patch refresh, dropped some files deleted upstream)
diff --git a/debian/changelog b/debian/changelog
index e123748..30a2817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
+boinc (7.0.42+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Revised some patches
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 08 Dec 2012 01:26:23 +0100
+
boinc (7.0.40+dfsg-1) UNRELEASED; urgency=low
- * New upstream version
+ * New upstream release
* Dropped mac_addresses_cores_in_kfreebsd.patch (file to patch deleted upstream) and ensure_there_is_no_newline_in_passwd.patch (applied upstream)
* Revised slot_dir_source_trace.patch
* Removed some old patches
@@ -9,7 +16,7 @@ boinc (7.0.40+dfsg-1) UNRELEASED; urgency=low
boinc (7.0.39+dfsg-1) UNRELEASED; urgency=low
- * New upstram version
+ * New upstram release
* Dropped add-missing-test-files.patch and add-missing-stripchart-samples.patch patch already applied upstream
* Added link time optimisation
@@ -17,7 +24,7 @@ boinc (7.0.39+dfsg-1) UNRELEASED; urgency=low
boinc (7.0.38+dfsg-1) UNRELEASED; urgency=low
- * New upstream version
+ * New upstream release
* Revised some patches (some of them should will be removed in a future commit)
* Added add-missing-test-files.patch to fix a FTBFS
* Added add-missing-stripchart-samples.patch to fix another FTBFS
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
index 8e4bb28..bfbcf51 100644
--- a/debian/patches/cmath_missing.patch
+++ b/debian/patches/cmath_missing.patch
@@ -63,19 +63,6 @@ Index: boinc/client/whetstone.cpp
#include <time.h>
#endif
-Index: boinc/clientgui/sqlite3.c
-===================================================================
---- boinc.orig/clientgui/sqlite3.c 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/clientgui/sqlite3.c 2012-08-18 14:42:31.737111174 +0200
-@@ -20222,7 +20222,7 @@
- **
- */
- #ifdef SQLITE_HAVE_ISNAN
--# include <math.h>
-+# include <cmath>
- #endif
-
- /*
Index: boinc/clientscr/ss_app.cpp
===================================================================
--- boinc.orig/clientscr/ss_app.cpp 2012-08-18 14:30:37.430776418 +0200
diff --git a/debian/patches/ignored_return_value.patch b/debian/patches/ignored_return_value.patch
index aa76b01..27b17dd 100644
--- a/debian/patches/ignored_return_value.patch
+++ b/debian/patches/ignored_return_value.patch
@@ -1,8 +1,6 @@
-Index: boinc/api/gutil.cpp
-===================================================================
---- boinc.orig/api/gutil.cpp 2012-08-26 19:16:06.793748659 +0200
-+++ boinc/api/gutil.cpp 2012-08-26 19:17:25.488681284 +0200
-@@ -553,32 +553,62 @@
+--- a/api/gutil.cpp
++++ b/api/gutil.cpp
+@@ -544,32 +544,62 @@
//
int read_ppm_file(const char* name, int& w, int& h, unsigned char** arrayp) {
FILE* f;
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index c351da7..82e0386 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -40,7 +40,7 @@
return system(cmd);
#else
// POSIX requires that shells run from an application will use the
-@@ -675,7 +675,7 @@
+@@ -683,7 +683,7 @@
p = strchr(q, '/');
if (!p) break;
*p = 0;
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index 5d5d3c8..4a62d7d 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,8 +1,6 @@
-Index: boinc/lib/coproc.cpp
-===================================================================
---- boinc.orig/lib/coproc.cpp 2012-08-01 20:55:51.707915924 +0200
-+++ boinc/lib/coproc.cpp 2012-08-01 20:56:08.403690215 +0200
-@@ -480,7 +480,7 @@
+--- a/lib/coproc.cpp
++++ b/lib/coproc.cpp
+@@ -497,7 +497,7 @@
cuda_version = 0;
display_driver_version = 0;
strcpy(prop.name, "");
@@ -11,7 +9,7 @@ Index: boinc/lib/coproc.cpp
prop.sharedMemPerBlock = 0;
prop.regsPerBlock = 0;
prop.warpSize = 0;
-@@ -510,7 +510,7 @@
+@@ -527,7 +527,7 @@
while (!xp.get_tag()) {
if (xp.match_tag("/coproc_cuda")) {
if (!peak_flops) {
diff --git a/debian/patches/opendir_errno.patch b/debian/patches/opendir_errno.patch
index 7c31898..d5eb0d5 100644
--- a/debian/patches/opendir_errno.patch
+++ b/debian/patches/opendir_errno.patch
@@ -1,6 +1,6 @@
---- boinc-7.0.38+dfsg.orig/client/check_security.cpp
-+++ boinc-7.0.38+dfsg/client/check_security.cpp
-@@ -40,9 +40,9 @@ bool IsUserInGroupBM();
+--- a/client/check_security.cpp
++++ b/client/check_security.cpp
+@@ -40,9 +40,9 @@
#endif
static int CheckNestedDirectories(
@@ -12,7 +12,7 @@
);
#if (! defined(__WXMAC__) && ! defined(_MAC_INSTALLER))
-@@ -501,9 +501,9 @@ saverName[2] = "Progress Thru Processors
+@@ -503,9 +503,9 @@
}
@@ -24,7 +24,7 @@
) {
int isDirectory;
char full_path[MAXPATHLEN];
-@@ -513,6 +513,7 @@ static int CheckNestedDirectories(char *
+@@ -515,6 +515,7 @@
dirent *dp;
static int errShown = 0;
@@ -32,7 +32,7 @@
dirp = opendir(basepath);
if (dirp == NULL) {
// Ideally, all project-created subdirectories under project or slot
-@@ -522,6 +523,7 @@ static int CheckNestedDirectories(char *
+@@ -524,6 +525,7 @@
// the subdirectory to check them.
strlcpy(full_path, basepath, sizeof(full_path));
if ((depth > 1) && (errno == EACCES)) {
@@ -40,9 +40,9 @@
return 0;
} else {
retval = -1200;
---- boinc-7.0.38+dfsg.orig/client/cs_platforms.cpp
-+++ boinc-7.0.38+dfsg/client/cs_platforms.cpp
-@@ -45,6 +45,7 @@ LPFN_ISWOW64PROCESS fnIsWow64Process;
+--- a/client/cs_platforms.cpp
++++ b/client/cs_platforms.cpp
+@@ -45,6 +45,7 @@
#include <sys/sysctl.h>
#endif
@@ -50,7 +50,7 @@
#include "error_numbers.h"
#include "filesys.h"
#include "str_util.h"
-@@ -180,9 +181,17 @@ void CLIENT_STATE::detect_platforms() {
+@@ -180,9 +181,17 @@
int i;
for (i=0; i < nlibdirs; i++) {
struct dirent *entry;
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 4780cd3..b95b3d1 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -257,7 +257,7 @@
if (boinc_file_exists(path)) {
return 0;
-@@ -620,7 +620,7 @@
+@@ -628,7 +628,7 @@
// make a dir that's owner and group RWX
//
@@ -266,7 +266,7 @@
if (is_dir(path)) return 0;
#ifdef _WIN32
if (!CreateDirectoryA(path, NULL)) {
-@@ -635,7 +635,7 @@
+@@ -643,7 +643,7 @@
return 0;
}
@@ -275,7 +275,7 @@
#ifdef _WIN32
if (!RemoveDirectoryA(name)) {
return ERR_RMDIR;
-@@ -648,7 +648,7 @@
+@@ -656,7 +656,7 @@
}
#ifndef _WIN32
@@ -284,7 +284,7 @@
if (gid) {
if (chown(path, (uid_t)-1, gid)) {
return ERR_CHOWN;
-@@ -661,7 +661,7 @@
+@@ -669,7 +669,7 @@
// if "filepath" is of the form a/b/c,
// create directories dirpath/a, dirpath/a/b etc.
//
@@ -293,7 +293,7 @@
char buf[MAXPATHLEN], oldpath[MAXPATHLEN], newpath[MAXPATHLEN];
int retval;
char *p, *q;
-@@ -740,7 +740,7 @@
+@@ -748,7 +748,7 @@
return 0;
}
@@ -302,7 +302,7 @@
#ifdef _WIN32
getcwd(path, MAXPATHLEN);
#else
-@@ -752,7 +752,7 @@
+@@ -760,7 +760,7 @@
#endif
}
@@ -311,7 +311,7 @@
boinc_getcwd(path);
if (strlen(relname)) {
strcat(path, "/");
-@@ -763,7 +763,7 @@
+@@ -771,7 +771,7 @@
// get total and free space on current filesystem (in bytes)
//
#if defined(_WIN32) && !(defined(WXDEBUG) || defined(WXNDEBUG))
@@ -320,7 +320,7 @@
int retval = 0;
HANDLE h = CreateFile(
path,
-@@ -823,7 +823,7 @@
+@@ -831,7 +831,7 @@
total_space = (double)dwTotalClusters * dwSectPerClust * dwBytesPerSect;
}
#else
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index 70b0fe9..c279709 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -1,7 +1,5 @@
-Index: boinc/tools/dir_hier_path.cpp
-===================================================================
---- boinc.orig/tools/dir_hier_path.cpp 2012-05-19 12:21:46.779836547 +0200
-+++ boinc/tools/dir_hier_path.cpp 2012-05-19 12:22:34.799171401 +0200
+--- a/tools/dir_hier_path.cpp
++++ b/tools/dir_hier_path.cpp
@@ -42,7 +42,7 @@
int retval;
@@ -11,11 +9,9 @@ Index: boinc/tools/dir_hier_path.cpp
exit(1);
}
-Index: boinc/tools/dir_hier_move.cpp
-===================================================================
---- boinc.orig/tools/dir_hier_move.cpp 2012-05-19 12:21:46.779836547 +0200
-+++ boinc/tools/dir_hier_move.cpp 2012-05-19 12:22:34.803171345 +0200
-@@ -42,7 +42,7 @@
+--- a/tools/dir_hier_move.cpp
++++ b/tools/dir_hier_move.cpp
+@@ -42,14 +42,14 @@
int retval;
if ( (argc == 1) || !strcmp(argv[1], "-h") || !strcmp(argv[1],"--help") || (argc != 4) ) {
@@ -24,7 +20,6 @@ Index: boinc/tools/dir_hier_move.cpp
exit(1);
}
src_dir = argv[1];
-@@ -49,7 +49,7 @@
dst_dir = argv[2];
fanout = atoi(argv[3]);
if (!fanout) {
@@ -33,30 +28,22 @@ Index: boinc/tools/dir_hier_move.cpp
exit(1);
}
-Index: boinc/clientgui/sg_ProjectPanel.cpp
-===================================================================
---- boinc.orig/clientgui/sg_ProjectPanel.cpp 2012-05-19 12:21:46.779836547 +0200
-+++ boinc/clientgui/sg_ProjectPanel.cpp 2012-05-19 12:22:34.807171290 +0200
-@@ -387,22 +387,22 @@
-
-
- void CSimpleProjectPanel::UpdateProjectList() {
-- CMainDocument* pDoc = wxGetApp().GetDocument();
-+ CMainDocument* pDoc = wxGetApp().GetDocument();
+--- a/clientgui/sg_ProjectPanel.cpp
++++ b/clientgui/sg_ProjectPanel.cpp
+@@ -390,8 +390,7 @@
+ CMainDocument* pDoc = wxGetApp().GetDocument();
ProjectSelectionData* selData;
PROJECT* project;
- char* ctrl_url;
- int i, j, oldProjectSelection, newProjectSelection;
+ int oldProjectSelection, newProjectSelection;
-- if ( pDoc->IsConnected() ) {
-- int projCnt = pDoc->GetSimpleProjectCount();
-+ if ( pDoc->IsConnected() ) {
-+ int projCnt = pDoc->GetSimpleProjectCount();
- int ctrlCount = m_ProjectSelectionCtrl->GetCount();
+ if ( pDoc->IsConnected() ) {
+ int projCnt = pDoc->GetSimpleProjectCount();
+@@ -399,10 +398,11 @@
oldProjectSelection = m_ProjectSelectionCtrl->GetSelection();
- // If a new project has been added, figure out which one
+ // If a new project has been added, figure out which one
- for(i=0; i<projCnt; i++) {
+ for(int i=0; i<projCnt; i++) {
+ char* ctrl_url;
@@ -76,15 +63,17 @@ Index: boinc/clientgui/sg_ProjectPanel.cpp
for(j = 0; j < ctrlCount; ++j) {
alphaOrder = (m_ProjectSelectionCtrl->GetString(j)).CmpNoCase(projname);
if (alphaOrder > 0) {
-@@ -446,7 +446,7 @@
+@@ -446,8 +446,8 @@
if ( projCnt < ctrlCount ) {
- project = NULL;
+ project = NULL;
// Check items in descending order so deletion won't change indexes of items yet to be checked
- for(j=ctrlCount-1; j>=0; --j) {
+- ctrl_url = ((ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j))->project_url;
+ for(int j=ctrlCount-1; j>=0; --j) {
- char* ctrl_url = ((ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j))->project_url;
- project = pDoc->state.lookup_project(ctrl_url);
- if ( project == NULL ) {
++ char* ctrl_url = ((ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j))->project_url;
+ project = pDoc->state.lookup_project(ctrl_url);
+ if ( project == NULL ) {
+ selData = (ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j);
@@ -475,9 +475,9 @@
// Check to see if we need to reload the project icon
@@ -97,12 +86,3 @@ Index: boinc/clientgui/sg_ProjectPanel.cpp
project = pDoc->state.lookup_project(ctrl_url);
if ( project->project_files_downloaded_time > selData->project_files_downloaded_time ) {
wxBitmap* projectBM = GetProjectSpecificBitmap(ctrl_url);
-@@ -485,7 +485,7 @@
- m_ProjectSelectionCtrl->SetItemBitmap(j, *projectBM);
- }
- }
-- }
-+ }
- }
-
-
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list