diff --git a/zhcon-0.2.6.gcc43.patch b/zhcon-0.2.6.gcc43.patch new file mode 100644 index 0000000..f397220 --- /dev/null +++ b/zhcon-0.2.6.gcc43.patch @@ -0,0 +1,133 @@ +diff -u -r zhcon-0.2.5/src/basefont.cpp zhcon-0.2.5.fix/src/basefont.cpp +--- zhcon-0.2.5/src/basefont.cpp 2006-04-25 00:38:27.000000000 +0800 ++++ zhcon-0.2.5.fix/src/basefont.cpp 2008-02-26 17:00:11.000000000 +0800 +@@ -16,6 +16,7 @@ + * * + ***************************************************************************/ + ++#include + #include + #include + #include +diff -u -r zhcon-0.2.5/src/display/fblinear4.cpp zhcon-0.2.5.fix/src/display/fblinear4.cpp +--- zhcon-0.2.5/src/display/fblinear4.cpp 2006-04-25 00:38:23.000000000 +0800 ++++ zhcon-0.2.5.fix/src/display/fblinear4.cpp 2008-02-26 16:59:08.000000000 +0800 +@@ -17,6 +17,7 @@ + * * + ***************************************************************************/ + ++#include + #include + #include + #include "global.h" +diff -u -r zhcon-0.2.5/src/display/fblinear8.cpp zhcon-0.2.5.fix/src/display/fblinear8.cpp +--- zhcon-0.2.5/src/display/fblinear8.cpp 2006-04-25 00:38:23.000000000 +0800 ++++ zhcon-0.2.5.fix/src/display/fblinear8.cpp 2008-02-26 16:59:23.000000000 +0800 +@@ -17,6 +17,7 @@ + * * + ***************************************************************************/ + ++#include + #include + #include + #include "global.h" +diff -u -r zhcon-0.2.5/src/display/fbvgaplanes.cpp zhcon-0.2.5.fix/src/display/fbvgaplanes.cpp +--- zhcon-0.2.5/src/display/fbvgaplanes.cpp 2006-04-25 00:38:23.000000000 +0800 ++++ zhcon-0.2.5.fix/src/display/fbvgaplanes.cpp 2008-02-26 16:59:36.000000000 +0800 +@@ -19,6 +19,7 @@ + #include + #endif + ++#include + #ifdef USING_VGA + #include + #include +diff -u -r zhcon-0.2.5/src/display/vgadev.cpp zhcon-0.2.5.fix/src/display/vgadev.cpp +--- zhcon-0.2.5/src/display/vgadev.cpp 2008-02-26 16:25:27.000000000 +0800 ++++ zhcon-0.2.5.fix/src/display/vgadev.cpp 2008-02-26 16:59:57.000000000 +0800 +@@ -23,6 +23,7 @@ + #endif + + ++#include + #ifdef USING_VGA + #if defined(linux) + +diff -u -r zhcon-0.2.5/src/graphdev.cpp zhcon-0.2.5.fix/src/graphdev.cpp +--- zhcon-0.2.5/src/graphdev.cpp 2006-04-25 00:38:26.000000000 +0800 ++++ zhcon-0.2.5.fix/src/graphdev.cpp 2008-02-26 17:00:19.000000000 +0800 +@@ -20,6 +20,8 @@ + #include + #endif + ++#include ++#include + #include + #include + #include +diff -u -r zhcon-0.2.5/src/inputclient.cpp zhcon-0.2.5.fix/src/inputclient.cpp +--- zhcon-0.2.5/src/inputclient.cpp 2006-04-25 00:38:27.000000000 +0800 ++++ zhcon-0.2.5.fix/src/inputclient.cpp 2008-02-26 17:00:59.000000000 +0800 +@@ -16,6 +16,7 @@ + * * + ***************************************************************************/ + ++#include + #include "inputclient.h" + + Console* InputClient::mpCon = NULL; +diff -u -r zhcon-0.2.5/src/inputmanager.cpp zhcon-0.2.5.fix/src/inputmanager.cpp +--- zhcon-0.2.5/src/inputmanager.cpp 2006-05-03 01:18:39.000000000 +0800 ++++ zhcon-0.2.5.fix/src/inputmanager.cpp 2008-02-26 17:00:52.000000000 +0800 +@@ -21,6 +21,7 @@ + + using namespace std; + ++#include + #include + #include + #include +diff -u -r zhcon-0.2.5/src/inputmanager.h zhcon-0.2.5.fix/src/inputmanager.h +--- zhcon-0.2.5/src/inputmanager.h 2006-04-25 00:38:26.000000000 +0800 ++++ zhcon-0.2.5.fix/src/inputmanager.h 2008-02-26 17:01:08.000000000 +0800 +@@ -24,6 +24,7 @@ + *@author ejoy + */ + using namespace std; ++#include + #include + #include + +diff -u -r zhcon-0.2.5/src/window.cpp zhcon-0.2.5.fix/src/window.cpp +--- zhcon-0.2.5/src/window.cpp 2006-04-25 00:38:25.000000000 +0800 ++++ zhcon-0.2.5.fix/src/window.cpp 2008-02-26 17:00:29.000000000 +0800 +@@ -16,6 +16,7 @@ + * * + ***************************************************************************/ + ++#include + #include + #include + #include +diff -u -r zhcon-0.2.5/src/winime.cpp zhcon-0.2.5.fix/src/winime.cpp +--- zhcon-0.2.5/src/winime.cpp 2008-02-26 16:25:27.000000000 +0800 ++++ zhcon-0.2.5.fix/src/winime.cpp 2008-02-26 17:00:35.000000000 +0800 +@@ -16,6 +16,7 @@ + * * + ***************************************************************************/ + ++#include + #include + #include + #include +diff -u -r zhcon-0.2.5/src/zhcon.cpp zhcon-0.2.5.fix/src/zhcon.cpp +--- zhcon-0.2.5/src/zhcon.cpp 2008-02-26 16:25:27.000000000 +0800 ++++ zhcon-0.2.5.fix/src/zhcon.cpp 2008-02-26 17:00:44.000000000 +0800 +@@ -19,6 +19,7 @@ + #include + #endif + ++#include + #include + #include + #include diff --git a/zhcon.spec b/zhcon.spec index 8061f14..5cb2619 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -1,7 +1,7 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 6%{?dist} +Release: 7%{?dist} Group: Applications/System License: GPL URL: http://www.sourceforge.net/projects/%{name}/ @@ -11,6 +11,7 @@ Patch1: zhcon-0.2.6-path.patch Patch2: zhcon-0.2.6-path-define.patch Patch3: zhcon-0.2.6-flags.patch Patch4: zhcon-0.2.6-64bit-fix.patch +Patch5: zhcon-0.2.6.gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf automake @@ -34,6 +35,7 @@ zhcon是一个工作在Linux控制台下的多内码中文平台。 %patch2 -p1 -b .path_define %patch3 -p1 -b .flags %patch4 -p1 -b .64bit_fix +%patch5 -p1 -b .gcc43_fix iconv -f GB2312 -t UTF-8 ChangeLog -o ChangeLog.utf && mv -f ChangeLog.utf ChangeLog ( cd doc; tar -zxf html.tar.gz; chmod 755 manual) @@ -65,6 +67,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Tue Feb 26 2008 Hu Zheng - 0.2.6-7 +- Gcc-4.3 compile fix. + * Wed Feb 20 2008 Fedora Release Engineering - 0.2.6-6 - Autorebuild for GCC 4.3