rpms/zhcon/devel zhcon-0.2.6.gcc43.patch, 1.1, 1.2 zhcon.spec, 1.6, 1.7

Hu Zheng (zhu) fedora-extras-commits at redhat.com
Mon Mar 3 06:14:02 UTC 2008


Author: zhu

Update of /cvs/pkgs/rpms/zhcon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2021

Modified Files:
	zhcon-0.2.6.gcc43.patch zhcon.spec 
Log Message:
i386 build fix

zhcon-0.2.6.gcc43.patch:

Index: zhcon-0.2.6.gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zhcon/devel/zhcon-0.2.6.gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zhcon-0.2.6.gcc43.patch	26 Feb 2008 09:13:06 -0000	1.1
+++ zhcon-0.2.6.gcc43.patch	3 Mar 2008 06:13:52 -0000	1.2
@@ -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
 --- 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
@@ -9,14 +18,21 @@
  #include <unistd.h>
  #include <fcntl.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
 --- 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 @@
   *                                                                         *
   ***************************************************************************/
  
-+#include <cstring>
++#include <string.h>
  #include <assert.h>
  #include <endian.h>
  #include "global.h"
@@ -42,6 +58,7 @@
  #ifdef USING_VGA
  #include <assert.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
 --- 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
@@ -98,6 +115,7 @@
  #include <cassert>
  #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
 --- 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
@@ -131,3 +149,6 @@
  #include <iostream>
  #include <unistd.h>
  #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


Index: zhcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zhcon/devel/zhcon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zhcon.spec	26 Feb 2008 09:13:06 -0000	1.6
+++ zhcon.spec	3 Mar 2008 06:13:52 -0000	1.7
@@ -1,7 +1,7 @@
 Name: zhcon
 Summary: A Fast Console CJK System Using FrameBuffer
 Version: 0.2.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/System
 License: GPL
 URL: http://www.sourceforge.net/projects/%{name}/
@@ -67,6 +67,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Mar 03 2008 Hu Zheng <zhu at redhat.com> - 0.2.6-8
+- i386 build fix.
+
 * Tue Feb 26 2008 Hu Zheng <zhu at redhat.com> - 0.2.6-7
 - Gcc-4.3 compile fix.
 




More information about the fedora-extras-commits mailing list