101559 2005-03-15 16:34:26 +0000 konsole compile errors on amd64 with gcc4 2005-03-28 21:38:44 +0000 1 1 2 Applications konsole general unspecified Debian testing Linux RESOLVED FIXED NOR normal --- 0 ana konsole-bugs-null 0 oldest_to_newest 324188 0 ana 2005-03-15 16:34:26 +0000 Version: (using KDE KDE 3.4.0) Installed from: Debian testing/unstable Packages Compiler: gcc 4.0 prerelease OS: Linux A number of amd64/gcc4 compile fixes were posted to kde-devel a while ago, but not all were applied. One patch in particular (attached) (from http://lists.kde.org/?l=kde-core-devel&m=110651989125333&w=2 - this thread explains the problem in more detail) is still missing in konsole. Please apply the patch, and backport to 3_4_BRANCH as needed. Thanks! 324189 1 10131 ana 2005-03-15 16:34:55 +0000 Created attachment 10131 konsole compile fixes for amd64/gcc4 324235 2 khindenburg 2005-03-15 19:39:39 +0000 Waldo changed the (int) to a (long) in Jan. I/We thought that fixed this issue. Revision 1.50 - (view) (download) (as text) (annotate) - [select for diffs] Tue Jan 25 17:56:47 2005 UTC (7 weeks ago) by waba Branch: MAIN CVS Tags: HEAD, KDE_3_4_0_BETA_2, KDE_3_4_0_RELEASE Branch point for: KDE_3_4_BRANCH Changes since 1.49: +3 -3 lines Diff to previous 1.49 gcc4/amd64 fix: Don't cast pointer to int, use long instead. RCS file: /home/kde/kdebase/konsole/konsole/keytrans.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- kdebase/konsole/konsole/keytrans.cpp 2005/01/23 22:28:06 1.49 +++ kdebase/konsole/konsole/keytrans.cpp 2005/01/25 17:56:47 1.50 @@ -372,7 +372,7 @@ //printf("line %3d: ",startofsym); getSymbol(); assertSyntax(sym == SYMName, "Name expected") assertSyntax(syms->keysyms[res], "Unknown key name") - int key = (int)syms->keysyms[res]-1; + int key = (long)( syms->keysyms[res] ) -1; //printf(" key %s (%04x)",res.latin1(),(int)syms->keysyms[res]-1); getSymbol(); // + - : int mode = 0; @@ -384,7 +384,7 @@ // mode name assertSyntax(sym == SYMName, "Name expected") assertSyntax(syms->modsyms[res], "Unknown mode name") - int bits = (int)syms->modsyms[res]-1; + int bits = (long)syms->modsyms[res]-1; if (mask & (1 << bits)) { fprintf(stderr,"%s(%d,%d): mode name used multible times.\n",path.ascii(),slinno,scolno); @@ -405,7 +405,7 @@ if (sym == SYMName) { assertSyntax(syms->oprsyms[res], "Unknown operator name") - cmd = (int)syms->oprsyms[res]-1; + cmd = (long)syms->oprsyms[res]-1; //printf(": do %s(%d)",res.latin1(),(int)syms->oprsyms[res]-1); } if (sym == SYMString) 324262 3 ana 2005-03-15 20:50:11 +0000 That's true, though Waldo's commit made only 3 of the 4 changes proposed in the original patch. Furthermore, the proposed patch was improved after suggestions by Thiago Macieira (the thread I linked to explains this). I've attached this improved patch, but modified to apply to HEAD. 324407 4 khindenburg 2005-03-16 06:35:20 +0000 | I've attached this improved patch, but modified to apply to HEAD. Where new patch? I had to add #include <stddef.h> in order to compile on gcc3.3.5 324899 5 10168 khindenburg 2005-03-17 19:52:46 +0000 Created attachment 10168 patch for gcc4 fix This work for you? 325667 6 ana 2005-03-19 16:22:13 +0000 Yes, it works here. Thanks! 329175 7 khindenburg 2005-03-28 21:38:43 +0000 CVS commit by hindenburg: Fix compile errors on amd64 with gcc4 BUG: 101559 M +5 -4 keytrans.cpp 1.51 --- kdebase/konsole/konsole/keytrans.cpp #1.50:1.51 @@ -27,4 +27,5 @@ #include <stdio.h> +#include <stddef.h> #ifndef HERE @@ -373,5 +374,5 @@ Loop: getSymbol(); assertSyntax(sym == SYMName, "Name expected") assertSyntax(syms->keysyms[res], "Unknown key name") - int key = (long)( syms->keysyms[res] ) -1; + ptrdiff_t key = (ptrdiff_t)(syms->keysyms[res]) - 1; //printf(" key %s (%04x)",res.latin1(),(int)syms->keysyms[res]-1); getSymbol(); // + - : @@ -385,5 +386,5 @@ Loop: assertSyntax(sym == SYMName, "Name expected") assertSyntax(syms->modsyms[res], "Unknown mode name") - int bits = (long)syms->modsyms[res]-1; + ptrdiff_t bits = (ptrdiff_t)(syms->modsyms[res]) - 1; if (mask & (1 << bits)) { @@ -402,9 +403,9 @@ Loop: // string or command assertSyntax(sym == SYMName || sym == SYMString,"Command or string expected") - int cmd = 0; + ptrdiff_t cmd = 0; if (sym == SYMName) { assertSyntax(syms->oprsyms[res], "Unknown operator name") - cmd = (long)syms->oprsyms[res]-1; + cmd = (ptrdiff_t)(syms->oprsyms[res]) - 1; //printf(": do %s(%d)",res.latin1(),(int)syms->oprsyms[res]-1); } 10131 2005-03-15 16:34:55 +0000 2005-03-15 16:34:55 +0000 konsole compile fixes for amd64/gcc4 kdebase_ftbfs.patch text/plain 1363 ana LS0tIGtkZWJhc2Uub3JpZy9rb25zb2xlL2tvbnNvbGUva2V5dHJhbnMuY3BwCisrKyBrZGViYXNl L2tvbnNvbGUva29uc29sZS9rZXl0cmFucy5jcHAKQEAgLTM3Miw3ICszNzIsNyBAQAogLy9wcmlu dGYoImxpbmUgJTNkOiAiLHN0YXJ0b2ZzeW0pOwogICAgIGdldFN5bWJvbCgpOyBhc3NlcnRTeW50 YXgoc3ltID09IFNZTU5hbWUsICJOYW1lIGV4cGVjdGVkIikKICAgICBhc3NlcnRTeW50YXgoc3lt cy0+a2V5c3ltc1tyZXNdLCAiVW5rbm93biBrZXkgbmFtZSIpCi0gICAgaW50IGtleSA9IChsb25n KSggc3ltcy0+a2V5c3ltc1tyZXNdICkgLTE7CisgICAgcHRyZGlmZl90IGtleSA9IChwdHJkaWZm X3Qpc3ltcy0+a2V5c3ltc1tyZXNdLTE7CiAvL3ByaW50ZigiIGtleSAlcyAoJTA0eCkiLHJlcy5s YXRpbjEoKSwoaW50KXN5bXMtPmtleXN5bXNbcmVzXS0xKTsKICAgICBnZXRTeW1ib2woKTsgLy8g KyAtIDoKICAgICBpbnQgbW9kZSA9IDA7CkBAIC0zODQsNyArMzg0LDcgQEAgTG9vcDoKICAgICAg IC8vIG1vZGUgbmFtZQogICAgICAgYXNzZXJ0U3ludGF4KHN5bSA9PSBTWU1OYW1lLCAiTmFtZSBl eHBlY3RlZCIpCiAgICAgICBhc3NlcnRTeW50YXgoc3ltcy0+bW9kc3ltc1tyZXNdLCAiVW5rbm93 biBtb2RlIG5hbWUiKQotICAgICAgaW50IGJpdHMgPSAobG9uZylzeW1zLT5tb2RzeW1zW3Jlc10t MTsKKyAgICAgIHB0cmRpZmZfdCBiaXRzID0gKHB0cmRpZmZfdClzeW1zLT5tb2RzeW1zW3Jlc10t MTsKICAgICAgIGlmIChtYXNrICYgKDEgPDwgYml0cykpCiAgICAgICB7CiAgICAgICAgIGZwcmlu dGYoc3RkZXJyLCIlcyglZCwlZCk6IG1vZGUgbmFtZSB1c2VkIG11bHRpYmxlIHRpbWVzLlxuIixw YXRoLmFzY2lpKCksc2xpbm5vLHNjb2xubyk7CkBAIC00MDEsMTEgKzQwMSwxMSBAQCBMb29wOgog ICAgIGdldFN5bWJvbCgpOwogICAgIC8vIHN0cmluZyBvciBjb21tYW5kCiAgICAgYXNzZXJ0U3lu dGF4KHN5bSA9PSBTWU1OYW1lIHx8IHN5bSA9PSBTWU1TdHJpbmcsIkNvbW1hbmQgb3Igc3RyaW5n IGV4cGVjdGVkIikKLSAgICBpbnQgY21kID0gMDsKKyAgICBwdHJkaWZmX3QgY21kID0gMDsKICAg ICBpZiAoc3ltID09IFNZTU5hbWUpCiAgICAgewogICAgICAgYXNzZXJ0U3ludGF4KHN5bXMtPm9w cnN5bXNbcmVzXSwgIlVua25vd24gb3BlcmF0b3IgbmFtZSIpCi0gICAgICBjbWQgPSAobG9uZylz eW1zLT5vcHJzeW1zW3Jlc10tMTsKKyAgICAgIGNtZCA9IChwdHJkaWZmX3Qpc3ltcy0+b3Byc3lt c1tyZXNdLTE7CiAvL3ByaW50ZigiOiBkbyAlcyglZCkiLHJlcy5sYXRpbjEoKSwoaW50KXN5bXMt Pm9wcnN5bXNbcmVzXS0xKTsKICAgICB9CiAgICAgaWYgKHN5bSA9PSBTWU1TdHJpbmcpCg== 10168 2005-03-17 19:52:46 +0000 2005-03-17 19:52:46 +0000 patch for gcc4 fix BR101559.diff text/plain 1739 khindenburg SW5kZXg6IGtleXRyYW5zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlYmFz ZS9rb25zb2xlL2tvbnNvbGUva2V5dHJhbnMuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjUw CmRpZmYgLXUgLXAgLXIxLjUwIGtleXRyYW5zLmNwcAotLS0ga2V5dHJhbnMuY3BwCTI1IEphbiAy MDA1IDE3OjU2OjQ3IC0wMDAwCTEuNTAKKysrIGtleXRyYW5zLmNwcAkxNyBNYXIgMjAwNSAxODo1 MToyOCAtMDAwMApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUgPGtsb2NhbGUuaD4KIAogI2lu Y2x1ZGUgPHN0ZGlvLmg+CisjaW5jbHVkZSA8c3RkZGVmLmg+CiAKICNpZm5kZWYgSEVSRQogI2Rl ZmluZSBIRVJFIHByaW50ZigiJXMoJWQpOiBoZXJlXG4iLF9fRklMRV9fLF9fTElORV9fKQpAQCAt MzcyLDcgKzM3Myw3IEBAIExvb3A6CiAvL3ByaW50ZigibGluZSAlM2Q6ICIsc3RhcnRvZnN5bSk7 CiAgICAgZ2V0U3ltYm9sKCk7IGFzc2VydFN5bnRheChzeW0gPT0gU1lNTmFtZSwgIk5hbWUgZXhw ZWN0ZWQiKQogICAgIGFzc2VydFN5bnRheChzeW1zLT5rZXlzeW1zW3Jlc10sICJVbmtub3duIGtl eSBuYW1lIikKLSAgICBpbnQga2V5ID0gKGxvbmcpKCBzeW1zLT5rZXlzeW1zW3Jlc10gKSAtMTsK KyAgICBwdHJkaWZmX3Qga2V5ID0gKHB0cmRpZmZfdCkoIHN5bXMtPmtleXN5bXNbcmVzXSApIC0x OwogLy9wcmludGYoIiBrZXkgJXMgKCUwNHgpIixyZXMubGF0aW4xKCksKGludClzeW1zLT5rZXlz eW1zW3Jlc10tMSk7CiAgICAgZ2V0U3ltYm9sKCk7IC8vICsgLSA6CiAgICAgaW50IG1vZGUgPSAw OwpAQCAtMzg0LDcgKzM4NSw3IEBAIExvb3A6CiAgICAgICAvLyBtb2RlIG5hbWUKICAgICAgIGFz c2VydFN5bnRheChzeW0gPT0gU1lNTmFtZSwgIk5hbWUgZXhwZWN0ZWQiKQogICAgICAgYXNzZXJ0 U3ludGF4KHN5bXMtPm1vZHN5bXNbcmVzXSwgIlVua25vd24gbW9kZSBuYW1lIikKLSAgICAgIGlu dCBiaXRzID0gKGxvbmcpc3ltcy0+bW9kc3ltc1tyZXNdLTE7CisgICAgICBwdHJkaWZmX3QgYml0 cyA9IChwdHJkaWZmX3Qpc3ltcy0+bW9kc3ltc1tyZXNdLTE7CiAgICAgICBpZiAobWFzayAmICgx IDw8IGJpdHMpKQogICAgICAgewogICAgICAgICBmcHJpbnRmKHN0ZGVyciwiJXMoJWQsJWQpOiBt b2RlIG5hbWUgdXNlZCBtdWx0aWJsZSB0aW1lcy5cbiIscGF0aC5hc2NpaSgpLHNsaW5ubyxzY29s bm8pOwpAQCAtNDAxLDExICs0MDIsMTEgQEAgTG9vcDoKICAgICBnZXRTeW1ib2woKTsKICAgICAv LyBzdHJpbmcgb3IgY29tbWFuZAogICAgIGFzc2VydFN5bnRheChzeW0gPT0gU1lNTmFtZSB8fCBz eW0gPT0gU1lNU3RyaW5nLCJDb21tYW5kIG9yIHN0cmluZyBleHBlY3RlZCIpCi0gICAgaW50IGNt ZCA9IDA7CisgICAgcHRyZGlmZl90IGNtZCA9IDA7CiAgICAgaWYgKHN5bSA9PSBTWU1OYW1lKQog ICAgIHsKICAgICAgIGFzc2VydFN5bnRheChzeW1zLT5vcHJzeW1zW3Jlc10sICJVbmtub3duIG9w ZXJhdG9yIG5hbWUiKQotICAgICAgY21kID0gKGxvbmcpc3ltcy0+b3Byc3ltc1tyZXNdLTE7Cisg ICAgICBjbWQgPSAocHRyZGlmZl90KXN5bXMtPm9wcnN5bXNbcmVzXS0xOwogLy9wcmludGYoIjog ZG8gJXMoJWQpIixyZXMubGF0aW4xKCksKGludClzeW1zLT5vcHJzeW1zW3Jlc10tMSk7CiAgICAg fQogICAgIGlmIChzeW0gPT0gU1lNU3RyaW5nKQo=