Bug#556817: patches

[René Mayorga]

On Tue, Jan 26, 2010 at 04:21:54PM +0300, Ilya Barygin wrote:
> 
> Attached patches were used to fix the build in Ubuntu. Note that they
> won't work until a newer version of boinc [1] is in the archive (it should
> install a header in correct directory).

Thanks for the patchs, I was also working on the same fixes, but I did not
commit it yet to the git repo,

Regarding boinc, I'm planning to do an upload the next week.


Cheers

--
René Mayorga



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#556817: patches

[Ilya Barygin]

tags 556817 patch
thanks

Attached patches were used to fix the build in Ubuntu. Note that they
won't work until a newer version of boinc [1] is in the archive (it should
install a header in correct directory).

[1] 
http://git.debian.org/?p=pkg-boinc/boinc.git;a=commitdiff;h=7560ffc2ee2b326014d6fe308860093e2c0e06b8Description: header std_fixes.h is not provided by boinc-dev anymore, so
 don't include it.
Author: Ilya Barygin 
Bug-Debian: http://bugs.debian.org/556817

Index: b/configure.ac
===
--- a/configure.ac
+++ b/configure.ac
@@ -355,7 +355,6 @@
 #define USE_NAMESPACES
 #endif
 
-#include "std_fixes.h"
 
 #endif
 ])
Index: b/db/xml_util.cpp
===
--- a/db/xml_util.cpp
+++ b/db/xml_util.cpp
@@ -87,7 +87,6 @@
 #include 
 #include 
 
-#include "std_fixes.h"
 #include "str_util.h"
 #include "util.h"
 #include "xml_util.h"
Description: some functions are now provided by str_replace.h header,
 include it where necessary.
Author: Ilya Barygin 
Bug-Debian: http://bugs.debian.org/556817

Index: b/db/xml_util.h
===
--- a/db/xml_util.h
+++ b/db/xml_util.h
@@ -71,6 +71,7 @@
 #include 
 
 #include "error_numbers.h"
+#include "str_replace.h"
 
 // Just in case, undef min and max
 #ifdef min
Index: b/client/timecvt.cpp
===
--- a/client/timecvt.cpp
+++ b/client/timecvt.cpp
@@ -50,6 +50,7 @@
 #include "util.h"
 #include "s_util.h"
 #include "str_util.h"
+#include "str_replace.h"
 #include "timecvt.h"
 
 void timecvt_start() {}
Description: fix build with gcc 4.4 and eglibc 2.10. strchr() now returns
 const char*.
Author: Ilya Barygin 
Bug-Debian: http://bugs.debian.org/556817

Index: b/db/xml_util.h
===
--- a/db/xml_util.h
+++ b/db/xml_util.h
@@ -669,7 +669,7 @@
 length=strlen((const char *)input);
   }
   std::vector rv;
-  char *p;
+  const char *p;
   rv.reserve(length);
   for (i=0; i rv;
-  char *p;
+  const char *p;
   rv.reserve(length);
   for (i=0; i