Bug#560439: stardict-tools: FTBFS: KangXi.cpp:61: error: invalid conversion from 'const char*' to 'char*'

[Luk Claes]

tags 560439 +patch
thanks

Hi

Find below a patch which fixes this FTBFS. I've not uploaded an NMU yet,
but will consider doing so within about a week.

Cheers

Luk

diff -Nru stardict-tools-3.0.1/debian/changelog
stardict-tools-3.0.1/debian/chan
gelog
--- stardict-tools-3.0.1/debian/changelog       2009-12-26 23:29:27.000000000 +0
000
+++ stardict-tools-3.0.1/debian/changelog       2009-12-26 23:29:28.000000000 +0
000
@@ -1,3 +1,10 @@
+stardict-tools (3.0.1-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't declare a char * const when it's not (Closes: #560439).
+
+ -- Luk Claes <l...@debian.org>  Sat, 26 Dec 2009 17:08:49 +0000
+
 stardict-tools (3.0.1-1.1) unstable; urgency=medium

   * Non-maintainer upload.
diff -Nru stardict-tools-3.0.1/src/KangXi.cpp
stardict-tools-3.0.1/src/KangXi.cp
p
--- stardict-tools-3.0.1/src/KangXi.cpp 2007-07-10 07:16:06.000000000 +0000
+++ stardict-tools-3.0.1/src/KangXi.cpp 2009-12-26 23:29:28.000000000 +0000
@@ -46,7 +46,7 @@

 std::map<int, std::list<std::string> > char_page_map;

-void parse_line(const char *line)
+void parse_line(char *line)
 {
        if (!g_str_has_prefix(line, "U+")) {
                g_print("Error: %s\n", line);
diff -Nru stardict-tools-3.0.1/src/Unihan.cpp
stardict-tools-3.0.1/src/Unihan.cpp
--- stardict-tools-3.0.1/src/Unihan.cpp 2007-07-10 07:16:06.000000000 +0000
+++ stardict-tools-3.0.1/src/Unihan.cpp 2009-12-26 23:29:28.000000000 +0000
@@ -46,7 +46,7 @@

 std::map<std::string, std::list<std::pair<std::string, std::string> > >
unihan_
map;

-void parse_line(const char *line)
+void parse_line(char *line)
 {
        if (line[0] == '#')
                return;
@@ -55,7 +55,7 @@
                g_print("Error: %s\n", line);
                return;
        }
-       const char *han = line+2;
+       char *han = line+2;

        char *p;
        p = strchr(han, '\t');
@@ -65,7 +65,7 @@
        }
        *p = '\0';
        p++;
-       const char *key = p;
+       char *key = p;

        p = strchr(key, '\t');
        if (!p) {
diff -Nru stardict-tools-3.0.1/src/bgl2txt.cpp
stardict-tools-3.0.1/src/bgl2txt.
cpp
--- stardict-tools-3.0.1/src/bgl2txt.cpp        2009-12-26 23:29:27.000000000 +0
000
+++ stardict-tools-3.0.1/src/bgl2txt.cpp        2009-12-26 23:29:28.000000000 +0
000
@@ -1,5 +1,6 @@
 #include "libbgl2txt.h"
 #include <cstring>
+#include <cstdio>

 int main(int argc, char * argv[])
 {



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