1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 01_build-fixes.dpatch by Frank S. Thomas <frank@thomas-alfeld.de>
4
## All lines beginning with `## DP:' are a description of the patch.
8
diff -urNad boinc-app-seti-5.13+cvs20060510~/client/Makefile.am boinc-app-seti-5.13+cvs20060510/client/Makefile.am
9
--- boinc-app-seti-5.13+cvs20060510~/client/Makefile.am 2006-04-07 03:38:17.000000000 +0200
10
+++ boinc-app-seti-5.13+cvs20060510/client/Makefile.am 2006-05-17 13:37:56.000000000 +0200
12
seti_boinc_LDADD = $(CLIENT_LD_ADD)
13
seti_boinc_LINK = $(CXX) -o $@
17
# too much optimization on main.cpp breaks the client for some reason
19
- if $(CXX) --include ../config.h -DDYNAMIC_GRAPHICS=1 $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
22
+# if $(CXX) --include ../config.h -DDYNAMIC_GRAPHICS=1 $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
27
diff -urNad boinc-app-seti-5.13+cvs20060510~/db/sqlblob.h boinc-app-seti-5.13+cvs20060510/db/sqlblob.h
28
--- boinc-app-seti-5.13+cvs20060510~/db/sqlblob.h 2005-12-01 01:01:01.000000000 +0100
29
+++ boinc-app-seti-5.13+cvs20060510/db/sqlblob.h 2006-05-17 13:37:56.000000000 +0200
34
- b.mem=new std::vector<T>(xml_decode_string(buf.c_str()+start,end-start,enc_string));
35
+ b.mem=new std::vector<T>(xml_decode_string<T>(buf.c_str()+start,end-start,enc_string));
36
#ifdef DEBUG_ALLOCATIONS
37
fprintf(stderr,"sqlblob: allocated a vector at 0x%p\n",b.mem);
39
diff -urNad boinc-app-seti-5.13+cvs20060510~/db/xml_util.h boinc-app-seti-5.13+cvs20060510/db/xml_util.h
40
--- boinc-app-seti-5.13+cvs20060510~/db/xml_util.h 2005-12-01 01:01:01.000000000 +0100
41
+++ boinc-app-seti-5.13+cvs20060510/db/xml_util.h 2006-05-17 13:37:57.000000000 +0200
44
// decode an XML character string. Return a the decoded string in a vector
45
// (null not necessarily a terminator).
46
-//template <typename T>
47
-//vector<T> xml_decode_string(const char *input, size_t length=0,
48
-// const char *encoding="x_xml_entity");
49
+template <typename T>
50
+std::vector<T> xml_decode_string(const char *input, size_t length=0,
51
+ const char *encoding="x_xml_entity");
53
// do the same thing, but get the length and encoding type from the
54
// xml tag properties.