Package: motor
Version: 2:3.4.0-2
Severity: normal
Tags: patch
When building 'motor' on amd64/unstable with gcc-4.0,
I get the following error:
c++ -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -c kkstrtext.cc
kkstrtext.cc: In function 'int intcompare(void*, void*)':
kkstrtext.cc:434: error: cast from 'void*' to 'int' loses precision
kkstrtext.cc:434: error: cast from 'void*' to 'int' loses precision
make[3]: *** [kkstrtext.o] Error 1
make[3]: Leaving directory `/motor-3.4.0/kkstrtext'
The attached patch fixes these errors.
Please also remove
'libstdc++5-dev (>> 3.2.3) | libstdc++5-3.3-dev | libstdc++6-dev'
from the Build-Depends in debian/control because it is not necessary
anymore and it may confuse autobuilders.
Regards
Andreas Jochens
diff -urN ../tmp-orig/motor-3.4.0/debian/control ./debian/control
--- ../tmp-orig/motor-3.4.0/debian/control 2005-04-08 20:30:30.878851779
+0200
+++ ./debian/control 2005-04-08 20:29:06.186098884 +0200
@@ -3,7 +3,6 @@
Priority: optional
Maintainer: Krzysztof Krzyzaniak (eloy) <[EMAIL PROTECTED]>
-Build-Conflicts: libstdc++5-dev (<= 3.2.3)
-Build-Depends: debhelper (>= 4.1.37), dpatch, libgpmg1-dev, libncurses5-dev |
libncurses-dev, gettext, libfribidi-dev (>= 0.10.4-4), libstdc++5-dev (>>
3.2.3) | libstdc++5-3.3-dev | libstdc++6-dev
+Build-Depends: debhelper (>= 4.1.37), dpatch, libgpmg1-dev, libncurses5-dev |
libncurses-dev, gettext, libfribidi-dev (>= 0.10.4-4)
Standards-Version: 3.6.1.0
Package: motor-common
diff -urN ../tmp-orig/motor-3.4.0/kkconsui/src/texteditor.cc
./kkconsui/src/texteditor.cc
--- ../tmp-orig/motor-3.4.0/kkconsui/src/texteditor.cc 2003-09-09
23:51:33.000000000 +0200
+++ ./kkconsui/src/texteditor.cc 2005-04-08 20:30:03.690067218 +0200
@@ -1940,7 +1940,7 @@
}
int texteditor::findint(void *p1, void *p2) {
- return *(int *) p1 != (int) p2;
+ return *(int *) p1 != (long) p2;
}
int texteditor::findhighline(void *p1, void *p2) {
diff -urN ../tmp-orig/motor-3.4.0/kkstrtext/kkstrtext.cc
./kkstrtext/kkstrtext.cc
--- ../tmp-orig/motor-3.4.0/kkstrtext/kkstrtext.cc 2005-02-01
01:13:24.000000000 +0100
+++ ./kkstrtext/kkstrtext.cc 2005-04-08 20:30:03.691067026 +0200
@@ -431,7 +431,7 @@
}
int intcompare(void *s1, void *s2) {
- return (int) s1 != (int) s2;
+ return s1 != s2;
}
string i2str(int i) {
diff -urN ../tmp-orig/motor-3.4.0/src/ui/ncurses/ncursesui.cc
./src/ui/ncurses/ncursesui.cc
--- ../tmp-orig/motor-3.4.0/src/ui/ncurses/ncursesui.cc 2004-11-14
22:04:08.000000000 +0100
+++ ./src/ui/ncurses/ncursesui.cc 2005-04-08 20:30:03.691067026 +0200
@@ -1242,7 +1242,7 @@
populatesettingstree(*db.gettree());
if(fin = !db.open(n, b, &p)) break;
- switch((int) p) {
+ switch((long) p) {
case 10:
if(input(motorui::text, buf = project.getversion(),
_("version: ")) == motorui::yes) {
@@ -1356,7 +1356,8 @@
vector<shitpair> treeshit;
void ncursesui::populatecontentstree(treeview &tree, motorproject &mp,
projeditaction pea, bool setcurrent) {
- int foldid, id, cfid = -1, i, sid;
+ int foldid, id, cfid = -1, i;
+ long sid;
vector<motorfolder>::iterator ifold;
vector<motorfile>::iterator ifile;
static vector<string> cnodes;
@@ -1368,7 +1369,7 @@
id = tree.getid(i);
if(tree.isnode(id))
- if(sid = (int) tree.getref(id))
+ if(sid = (long) tree.getref(id))
if(!tree.isnodeopen(id))
cnodes.push_back(treeshit[sid-1].second->gettagname());
}
diff -urN ../tmp-orig/motor-3.4.0/src/ui/ncurses/uitagbrowser.cc
./src/ui/ncurses/uitagbrowser.cc
--- ../tmp-orig/motor-3.4.0/src/ui/ncurses/uitagbrowser.cc 2004-07-23
02:18:16.000000000 +0200
+++ ./src/ui/ncurses/uitagbrowser.cc 2005-04-08 20:30:03.692066835 +0200
@@ -95,7 +95,7 @@
cm.close();
if(n) {
- int c = (int) cm.getref(n-1);
+ long c = (long) cm.getref(n-1);
if(c != tagbrowser.getscope()) {
tagbrowser.setscope((motortagbrowser::viewscope) c);
@@ -142,7 +142,7 @@
switch(cm.open()) {
case -2:
iter = false;
- c = (char) (int) cm.getref(cm.getpos());
+ c = (char) (long) cm.getref(cm.getpos());
while((pos = nfilter.find(c)) != -1) {
nfilter.erase(pos, 1);
@@ -213,7 +213,7 @@
}
void uitagbrowser::exec() {
- int n, k;
+ long n, k;
bool r;
if(search.empty())
@@ -240,7 +240,7 @@
m.setpos(mpos);
if(r = (n = m.open())) {
- k = (int) m.getref(n-1);
+ k = (long) m.getref(n-1);
mpos = n-1;
}
diff -urN ../tmp-orig/motor-3.4.0/src/ui/ncurses/uivcs.cc
./src/ui/ncurses/uivcs.cc
--- ../tmp-orig/motor-3.4.0/src/ui/ncurses/uivcs.cc 2005-02-12
15:58:28.000000000 +0100
+++ ./src/ui/ncurses/uivcs.cc 2005-04-08 20:30:03.692066835 +0200
@@ -31,7 +31,8 @@
void uivcs::check() {
bool found;
dialogbox db;
- int n, b, i, nodes[motorvcs::remotely_modified+1];
+ int n, b, nodes[motorvcs::remotely_modified+1];
+ long i;
string comment, buf;
if(!enabled()) return;
@@ -98,7 +99,7 @@
switch(b) {
case 0:
if(!i) {
- i = (int) tree.getref(tree.getid(n));
+ i = (long) tree.getref(tree.getid(n));
ic = ch.begin()+i-1;
found = (ik = find(naffect.begin(), naffect.end(),
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
