| 1 |
flameeyes 08/06/09 12:46:05 |
| 2 |
|
| 3 |
Added: zhcon-0.2.6+gcc-4.3.patch |
| 4 |
Log: |
| 5 |
Add patch to build with GCC 4.3. Thanks to Peter Alfredsen (loki_val) in bug #219769. |
| 6 |
(Portage version: 2.1.5.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: zhcon-0.2.6+gcc-4.3.patch |
| 15 |
=================================================================== |
| 16 |
diff -NrU5 zhcon-0.2.6.orig/src/basefont.cpp zhcon-0.2.6/src/basefont.cpp |
| 17 |
--- zhcon-0.2.6.orig/src/basefont.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 18 |
+++ zhcon-0.2.6/src/basefont.cpp 2008-04-29 23:15:37.000000000 +0200 |
| 19 |
@@ -27,10 +27,12 @@ |
| 20 |
#include "global.h" |
| 21 |
#include "debug.h" |
| 22 |
#include "hzdecoder.h" |
| 23 |
#include "basefont.h" |
| 24 |
|
| 25 |
+#include <cstring> |
| 26 |
+ |
| 27 |
BaseFont::BaseFont(string & fn, int w, int h) |
| 28 |
:mFd(0) |
| 29 |
,mpBuf(0) |
| 30 |
,mWidth(w) |
| 31 |
,mHeight(h) { |
| 32 |
diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear4.cpp zhcon-0.2.6/src/display/fblinear4.cpp |
| 33 |
--- zhcon-0.2.6.orig/src/display/fblinear4.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 34 |
+++ zhcon-0.2.6/src/display/fblinear4.cpp 2008-04-29 23:15:37.000000000 +0200 |
| 35 |
@@ -20,10 +20,12 @@ |
| 36 |
#include <assert.h> |
| 37 |
#include <endian.h> |
| 38 |
#include "global.h" |
| 39 |
#include "fblinear4.h" |
| 40 |
|
| 41 |
+#include <cstring> |
| 42 |
+ |
| 43 |
__u16 FBLinear4::nibbletab_cfb4[] = { |
| 44 |
#if BYTE_ORDER == LITTLE_ENDIAN |
| 45 |
0x0000,0xf000,0x0f00,0xff00, |
| 46 |
0x00f0,0xf0f0,0x0ff0,0xfff0, |
| 47 |
0x000f,0xf00f,0x0f0f,0xff0f, |
| 48 |
diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear8.cpp zhcon-0.2.6/src/display/fblinear8.cpp |
| 49 |
--- zhcon-0.2.6.orig/src/display/fblinear8.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 50 |
+++ zhcon-0.2.6/src/display/fblinear8.cpp 2008-04-29 23:15:37.000000000 +0200 |
| 51 |
@@ -20,10 +20,12 @@ |
| 52 |
#include <assert.h> |
| 53 |
#include <endian.h> |
| 54 |
#include "global.h" |
| 55 |
#include "fblinear8.h" |
| 56 |
|
| 57 |
+#include <cstring> |
| 58 |
+ |
| 59 |
__u32 FBLinear8::nibbletab_cfb8[] = { |
| 60 |
#if BYTE_ORDER == LITTLE_ENDIAN |
| 61 |
0x00000000,0xff000000,0x00ff0000,0xffff0000, |
| 62 |
0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00, |
| 63 |
0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff, |
| 64 |
diff -NrU5 zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp zhcon-0.2.6/src/display/fbvgaplanes.cpp |
| 65 |
--- zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 66 |
+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp 2008-04-29 23:15:37.000000000 +0200 |
| 67 |
@@ -36,10 +36,12 @@ |
| 68 |
: "a" ((char) value), |
| 69 |
"d" ((unsigned short) port)); |
| 70 |
} |
| 71 |
#endif |
| 72 |
|
| 73 |
+#include <cstring> |
| 74 |
+ |
| 75 |
/* based on kernel |
| 76 |
* Force strict CPU ordering. |
| 77 |
* And yes, this is required on UP too when we're talking |
| 78 |
* to devices. |
| 79 |
* |
| 80 |
diff -NrU5 zhcon-0.2.6.orig/src/display/vgadev.cpp zhcon-0.2.6/src/display/vgadev.cpp |
| 81 |
--- zhcon-0.2.6.orig/src/display/vgadev.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 82 |
+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.000000000 +0200 |
| 83 |
@@ -35,10 +35,12 @@ |
| 84 |
#include <cassert> |
| 85 |
#include "debug.h" |
| 86 |
#include "vgadev.h" |
| 87 |
#include "lrmi.h" |
| 88 |
|
| 89 |
+#include <cstring> |
| 90 |
+ |
| 91 |
#define GRAPH_BASE 0xA0000 |
| 92 |
#define GRAPH_ADDR 0x3ce |
| 93 |
#define GRAPH_DATA 0x3cf |
| 94 |
|
| 95 |
char *VGADev::mpBuf = NULL; |
| 96 |
diff -NrU5 zhcon-0.2.6.orig/src/graphdev.cpp zhcon-0.2.6/src/graphdev.cpp |
| 97 |
--- zhcon-0.2.6.orig/src/graphdev.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 98 |
+++ zhcon-0.2.6/src/graphdev.cpp 2008-04-29 23:16:14.000000000 +0200 |
| 99 |
@@ -24,20 +24,23 @@ |
| 100 |
#include <fcntl.h> |
| 101 |
#include <sys/ioctl.h> |
| 102 |
#include <sys/mman.h> |
| 103 |
#include <assert.h> |
| 104 |
#include <iostream> |
| 105 |
+#include <cstdlib> |
| 106 |
#include "debug.h" |
| 107 |
|
| 108 |
#include "display/fbdev.h" |
| 109 |
#include "display/vgadev.h" |
| 110 |
#if defined(linux) || defined(__FreeBSD__) |
| 111 |
#ifdef HAVE_GGI_LIB |
| 112 |
#include "display/libggi.h" |
| 113 |
#endif |
| 114 |
#endif |
| 115 |
|
| 116 |
+#include <cstring> |
| 117 |
+ |
| 118 |
using namespace std; |
| 119 |
// mmap framebuffer address |
| 120 |
GraphDev *GraphDev::mpGraphDev = NULL; |
| 121 |
|
| 122 |
// font |
| 123 |
diff -NrU5 zhcon-0.2.6.orig/src/inputclient.cpp zhcon-0.2.6/src/inputclient.cpp |
| 124 |
--- zhcon-0.2.6.orig/src/inputclient.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 125 |
+++ zhcon-0.2.6/src/inputclient.cpp 2008-04-29 23:15:37.000000000 +0200 |
| 126 |
@@ -14,10 +14,12 @@ |
| 127 |
* the Free Software Foundation; either version 2 of the License, or * |
| 128 |
* (at your option) any later version. * |
| 129 |
* * |
| 130 |
***************************************************************************/ |
| 131 |
|
| 132 |
+#include <cstdlib> |
| 133 |
+ |
| 134 |
#include "inputclient.h" |
| 135 |
|
| 136 |
Console* InputClient::mpCon = NULL; |
| 137 |
InputClient::InputClient() |
| 138 |
: mVisible(false), |
| 139 |
diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.cpp zhcon-0.2.6/src/inputmanager.cpp |
| 140 |
--- zhcon-0.2.6.orig/src/inputmanager.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 141 |
+++ zhcon-0.2.6/src/inputmanager.cpp 2008-04-29 23:19:01.000000000 +0200 |
| 142 |
@@ -22,10 +22,11 @@ |
| 143 |
using namespace std; |
| 144 |
|
| 145 |
#include <unistd.h> |
| 146 |
#include <sys/time.h> |
| 147 |
#include <string> |
| 148 |
+#include <cstdlib> |
| 149 |
|
| 150 |
#include "global.h" |
| 151 |
#include "debug.h" |
| 152 |
#include "keymap.h" |
| 153 |
#include "console.h" |
| 154 |
diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.h zhcon-0.2.6/src/inputmanager.h |
| 155 |
--- zhcon-0.2.6.orig/src/inputmanager.h 2008-04-29 23:15:08.000000000 +0200 |
| 156 |
+++ zhcon-0.2.6/src/inputmanager.h 2008-04-29 23:15:37.000000000 +0200 |
| 157 |
@@ -24,10 +24,11 @@ |
| 158 |
*@author ejoy |
| 159 |
*/ |
| 160 |
using namespace std; |
| 161 |
#include <cassert> |
| 162 |
#include <vector> |
| 163 |
+#include <sys/types.h> |
| 164 |
|
| 165 |
#include "mouse.h" |
| 166 |
#if defined(__FreeBSD__) |
| 167 |
#include <sys/kbio.h> |
| 168 |
#endif |
| 169 |
diff -NrU5 zhcon-0.2.6.orig/src/window.cpp zhcon-0.2.6/src/window.cpp |
| 170 |
--- zhcon-0.2.6.orig/src/window.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 171 |
+++ zhcon-0.2.6/src/window.cpp 2008-04-29 23:15:37.000000000 +0200 |
| 172 |
@@ -22,10 +22,12 @@ |
| 173 |
#include <algorithm> |
| 174 |
#include "global.h" |
| 175 |
#include "debug.h" |
| 176 |
#include "window.h" |
| 177 |
|
| 178 |
+#include <cstring> |
| 179 |
+ |
| 180 |
//static members for all the windows |
| 181 |
Window* Window::mpConsole = NULL; |
| 182 |
char* Window::mpOverlaps = NULL; |
| 183 |
|
| 184 |
Window::Window(int x1, int y1, int x2, int y2, int type) |
| 185 |
diff -NrU5 zhcon-0.2.6.orig/src/zhcon.cpp zhcon-0.2.6/src/zhcon.cpp |
| 186 |
--- zhcon-0.2.6.orig/src/zhcon.cpp 2008-04-29 23:15:08.000000000 +0200 |
| 187 |
+++ zhcon-0.2.6/src/zhcon.cpp 2008-04-29 23:15:37.000000000 +0200 |
| 188 |
@@ -81,10 +81,12 @@ |
| 189 |
#ifndef NDEBUG |
| 190 |
#include "debug.h" |
| 191 |
ofstream debug("debug"); |
| 192 |
#endif |
| 193 |
|
| 194 |
+#include <cstring> |
| 195 |
+ |
| 196 |
Zhcon* Zhcon::mpZhcon = NULL; |
| 197 |
int Zhcon::mTtyPid = 0; |
| 198 |
Zhcon::STATE Zhcon::mState = STOP; |
| 199 |
|
| 200 |
void Zhcon::SignalVtLeave(int signo) { |
| 201 |
|
| 202 |
|
| 203 |
|
| 204 |
-- |
| 205 |
gentoo-commits@l.g.o mailing list |
Archives