diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-19 10:54:36 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-19 10:54:36 -0400 |
| commit | d2478b4cdd6f1db44f4725b39489aca89d3d9180 (patch) | |
| tree | bc4714453fd9b7a2e64fcd5f58c24d371dbb91d8 /gnu/packages/patches/kobodeluxe-const-charp-conversion.patch | |
| parent | c9a71c6fdab6914dd648b76c349c3af9018cad35 (diff) | |
| parent | 152ffe7cb6ba02915d8645102e0f6dfeb639090d (diff) | |
| download | guix-d2478b4cdd6f1db44f4725b39489aca89d3d9180.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/kobodeluxe-const-charp-conversion.patch')
| -rw-r--r-- | gnu/packages/patches/kobodeluxe-const-charp-conversion.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/patches/kobodeluxe-const-charp-conversion.patch b/gnu/packages/patches/kobodeluxe-const-charp-conversion.patch new file mode 100644 index 0000000000..8386cf83fc --- /dev/null +++ b/gnu/packages/patches/kobodeluxe-const-charp-conversion.patch @@ -0,0 +1,17 @@ +Description: Avoid compilation error with gcc-4.4. + "const char* -> char*" conversion is fatal in that version +Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/kobodeluxe/+bug/461373 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/kobodeluxe/+bug/461373 +Bug-Debian: http://bugs.debian.org/552548 +Forwarded: http://www.freelists.org/post/olofsonprojects/kobodlpatch-compile-error-in-windowcpp-with-g44 +--- a/graphics/window.cpp ++++ b/graphics/window.cpp +@@ -398,7 +398,7 @@ void window_t::center_token_fxp(int _x, + */ + if(token) + { +- char *tok = strchr(txt, token); ++ const char *tok = strchr(txt, token); + if(tok) + tokpos = tok-txt; + else |