rpms
/
zhcon
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i386 build fix

This commit is contained in:
Hu Zheng 2008-03-03 06:13:52 +00:00
parent d40c236830
commit e713dac411
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zhcon-0.2.6.gcc43.patch
View File

@ -1,3 +1,12 @@
Only in zhcon-0.2.5: config.h
Only in zhcon-0.2.5: config.log
Only in zhcon-0.2.5: config.status
Only in zhcon-0.2.5/debian: Makefile
Only in zhcon-0.2.5/doc: Makefile
Only in zhcon-0.2.5/doc: zhcon.1
Only in zhcon-0.2.5/font: Makefile
Only in zhcon-0.2.5/input: Makefile
Only in zhcon-0.2.5: Makefile
diff -u -r zhcon-0.2.5/src/basefont.cpp zhcon-0.2.5.fix/src/basefont.cpp 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/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 +++ zhcon-0.2.5.fix/src/basefont.cpp 2008-02-26 17:00:11.000000000 +0800
@ -9,14 +18,21 @@ diff -u -r zhcon-0.2.5/src/basefont.cpp zhcon-0.2.5.fix/src/basefont.cpp
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
Only in zhcon-0.2.5/src: .deps
Only in zhcon-0.2.5/src/display: .deps
Only in zhcon-0.2.5/src/display: fbdev.o
Only in zhcon-0.2.5/src/display: fblinear15.o
Only in zhcon-0.2.5/src/display: fblinear16.o
Only in zhcon-0.2.5/src/display: fblinear24.o
Only in zhcon-0.2.5/src/display: fblinear32.o
diff -u -r zhcon-0.2.5/src/display/fblinear4.cpp zhcon-0.2.5.fix/src/display/fblinear4.cpp 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/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 +++ zhcon-0.2.5.fix/src/display/fblinear4.cpp 2008-03-03 14:10:32.000000000 +0800
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
* * * *
***************************************************************************/ ***************************************************************************/
+#include <cstring> +#include <string.h>
#include <assert.h> #include <assert.h>
#include <endian.h> #include <endian.h>
#include "global.h" #include "global.h"
@ -42,6 +58,7 @@ diff -u -r zhcon-0.2.5/src/display/fbvgaplanes.cpp zhcon-0.2.5.fix/src/display/f
#ifdef USING_VGA #ifdef USING_VGA
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>
Only in zhcon-0.2.5/src/display: Makefile
diff -u -r zhcon-0.2.5/src/display/vgadev.cpp zhcon-0.2.5.fix/src/display/vgadev.cpp 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/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 +++ zhcon-0.2.5.fix/src/display/vgadev.cpp 2008-02-26 16:59:57.000000000 +0800
@ -98,6 +115,7 @@ diff -u -r zhcon-0.2.5/src/inputmanager.h zhcon-0.2.5.fix/src/inputmanager.h
#include <cassert> #include <cassert>
#include <vector> #include <vector>
Only in zhcon-0.2.5/src: Makefile
diff -u -r zhcon-0.2.5/src/window.cpp zhcon-0.2.5.fix/src/window.cpp 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/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 +++ zhcon-0.2.5.fix/src/window.cpp 2008-02-26 17:00:29.000000000 +0800
@ -131,3 +149,6 @@ diff -u -r zhcon-0.2.5/src/zhcon.cpp zhcon-0.2.5.fix/src/zhcon.cpp
#include <iostream> #include <iostream>
#include <unistd.h> #include <unistd.h>
#include <cstdlib> #include <cstdlib>
Only in zhcon-0.2.5: stamp-h1
Only in zhcon-0.2.5/tools: .deps
Only in zhcon-0.2.5/tools: Makefile

5
zhcon.spec
View File

@ -1,7 +1,7 @@
Name: zhcon Name: zhcon
Summary: A Fast Console CJK System Using FrameBuffer Summary: A Fast Console CJK System Using FrameBuffer
Version: 0.2.6 Version: 0.2.6
Release: 7%{?dist} Release: 8%{?dist}
Group: Applications/System Group: Applications/System
License: GPL License: GPL
URL: http://www.sourceforge.net/projects/%{name}/ URL: http://www.sourceforge.net/projects/%{name}/
@ -67,6 +67,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%changelog %changelog
* Mon Mar 03 2008 Hu Zheng <zhu@redhat.com> - 0.2.6-8
- i386 build fix.
* Tue Feb 26 2008 Hu Zheng <zhu@redhat.com> - 0.2.6-7 * Tue Feb 26 2008 Hu Zheng <zhu@redhat.com> - 0.2.6-7
- Gcc-4.3 compile fix. - Gcc-4.3 compile fix.