From 3068cdf1ecb1361891fac91206539e49f79cea8c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Mar 2007 07:27:16 +0000 Subject: [PATCH 01/52] Initialize branch FC-6 for zhcon --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 6aac5ea762c341b0f76849aa1db3a577b99b7d86 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Tue, 27 Mar 2007 07:25:36 +0000 Subject: [PATCH 02/52] add source files --- .cvsignore | 2 + sources | 2 + zhcon-0.2.6-flags.patch | 14 ++++ zhcon-0.2.6-path-define.patch | 117 ++++++++++++++++++++++++++++++++++ zhcon-0.2.6-path.patch | 67 +++++++++++++++++++ zhcon.spec | 84 ++++++++++++++++++++++++ 6 files changed, 286 insertions(+) create mode 100644 zhcon-0.2.6-flags.patch create mode 100644 zhcon-0.2.6-path-define.patch create mode 100644 zhcon-0.2.6-path.patch create mode 100644 zhcon.spec diff --git a/.cvsignore b/.cvsignore index e69de29..994e4f3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +zhcon-0.2.5.tar.gz +zhcon-0.2.5-to-0.2.6.diff.gz diff --git a/sources b/sources index e69de29..acf9e58 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +79e1c68aab8341e32129f61c1670baeb zhcon-0.2.5.tar.gz +971f68507f9c48a6b5cbee4ba0c1e2a6 zhcon-0.2.5-to-0.2.6.diff.gz diff --git a/zhcon-0.2.6-flags.patch b/zhcon-0.2.6-flags.patch new file mode 100644 index 0000000..2b2939c --- /dev/null +++ b/zhcon-0.2.6-flags.patch @@ -0,0 +1,14 @@ +--- zhcon-0.2.5/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 ++++ zhcon-0.2.5/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 +@@ -9,11 +9,6 @@ + #getbpsf_LDADD = -L/usr/X11R6/lib -lX11 + #getbpsf_CPPFLAGS = -I/usr/X11R6/include + +-LDFLAGS= +-CXXFLAGS= +-CCFLAGS= +-LIBS= +- + EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\ + gpm-1.19.6-patched.tar.gz + diff --git a/zhcon-0.2.6-path-define.patch b/zhcon-0.2.6-path-define.patch new file mode 100644 index 0000000..7fb129a --- /dev/null +++ b/zhcon-0.2.6-path-define.patch @@ -0,0 +1,117 @@ +--- zhcon-0.2.5/configure.in.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/configure.in 2007-02-16 03:48:31.000000000 +0900 +@@ -175,6 +175,16 @@ + AC_CHECK_LIB(gpm,main,,usegpm="no") + + dnl----------------------------------------------------------------------- ++dnl Fedora specific fix ++dnl----------------------------------------------------------------------- ++CFLAGS="$CFLAGS -DDATADIR=\\\"$datadir\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\"" ++CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\"" ++ ++eval DATADIR=${datadir} ++eval DATADIR=$DATADIR ++AC_SUBST(DATADIR) ++ ++dnl----------------------------------------------------------------------- + dnl Checks for libggi + dnl----------------------------------------------------------------------- + useggi="yes" +@@ -208,7 +218,7 @@ + libggi support: ${useggi} + unicon support: ${useunicon} + zhcon binary dir: `eval "echo \`eval \"echo ${bindir}\"\`"` +- zhcon files dir: `eval "echo \`eval \"echo ${libdir}/${PACKAGE}\"\`"` ++ zhcon files dir: `eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"` + + Config complete, now type make to build zhcon. + Good Luck! +--- zhcon-0.2.5/font/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/font/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +@@ -1,8 +1,8 @@ + EXTRA_DIST = *.bpsf + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ +- $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/ ++ $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/ + + uninstall-local: +- -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf ++ -rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf +--- zhcon-0.2.5/input/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/input/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +@@ -1,8 +1,8 @@ + EXTRA_DIST = *.mb + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ +- $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/ ++ $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/ + + uninstall-local: +- -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb ++ -rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb +--- zhcon-0.2.5/src/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/src/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +@@ -11,11 +11,11 @@ + chmod 4755 $(DESTDIR)$(bindir)/zhcon + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(prefix)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf + + uninstall-local: +- -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf ++ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf + + # set the include path found by configure + INCLUDES= $(all_includes) +--- zhcon-0.2.5/src/nativeinputserver.cpp.path_define 2006-04-25 01:38:27.000000000 +0900 ++++ zhcon-0.2.5/src/nativeinputserver.cpp 2007-02-16 03:47:08.000000000 +0900 +@@ -30,7 +30,7 @@ + #include "nativeinputserver.h" + #include "keymap.h" + +-string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; ++string NativeInputServer::mDataPath = DATADIR"/zhcon/"; + + NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { + {'.', "¡£"} +--- zhcon-0.2.5/src/zhcon.cpp.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/src/zhcon.cpp 2007-02-16 03:47:08.000000000 +0900 +@@ -123,7 +123,7 @@ + string cfgfile = getenv("HOME"); + cfgfile += "/.zhconrc"; + if (access(cfgfile.c_str(), R_OK) != 0) +- cfgfile = PREFIX "/etc/zhcon.conf"; ++ cfgfile = SYSCONFDIR "/zhcon.conf"; + + //for debug,a pause enable us to attach zhcon's pid in gdb + //char c;cin>>c; +@@ -621,7 +621,7 @@ + if (getenv("LC_ALL")) + mOldLocale = getenv("LC_ALL"); + +- string prefix = PREFIX"/lib/zhcon/"; ++ string prefix = DATADIR "/zhcon/"; + mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT)); + mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT)); + mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT)); +@@ -752,10 +752,10 @@ + InputManager::SetTty(mConFd, ttyno, mTtyFd); + + string s; +- s = f.GetOption(string("zhconpath"), string(PREFIX"/lib/zhcon/")); ++ s = f.GetOption(string("zhconpath"), string(DATADIR "/zhcon/")); + NativeInputServer::SetDataPath(s); + #ifdef HAVE_UNICON_LIB +- s = f.GetOption(string("uniconpath"), string("/usr/lib/unicon/")); ++ s = f.GetOption(string("uniconpath"), string(DATADIR "/unicon/")); + UniconInputServer::SetDataPath(s); + #endif + string sOverSpot, sNativeBar; diff --git a/zhcon-0.2.6-path.patch b/zhcon-0.2.6-path.patch new file mode 100644 index 0000000..274417a --- /dev/null +++ b/zhcon-0.2.6-path.patch @@ -0,0 +1,67 @@ +diff -ru zhcon-0.2.5/doc/Makefile.am zhcon-0.2.6/doc/Makefile.am +--- zhcon-0.2.5/doc/Makefile.am 2006-05-03 01:57:18.000000000 +0800 ++++ zhcon-0.2.6/doc/Makefile.am 2007-02-12 17:46:12.000000000 +0800 +@@ -3,8 +3,8 @@ + EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz + + install-data-local: +- $(mkinstalldirs) $(mandir)/man1/ +- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ ++ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1 + + uninstall-local: +- -rm -f $(mandir)/man1/zhcon.1 ++ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1 +diff -ru zhcon-0.2.5/font/Makefile.am zhcon-0.2.6/font/Makefile.am +--- zhcon-0.2.5/font/Makefile.am 2006-04-25 00:39:04.000000000 +0800 ++++ zhcon-0.2.6/font/Makefile.am 2007-02-12 17:47:32.000000000 +0800 +@@ -1,8 +1,8 @@ + EXTRA_DIST = *.bpsf + + install-data-local: +- $(mkinstalldirs) $(libdir)/zhcon/font/ +- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/ ++ $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ ++ $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ + + uninstall-local: +- -rm -f $(libdir)/zhcon/font/*.bpsf ++ -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf +diff -ru zhcon-0.2.5/input/Makefile.am zhcon-0.2.6/input/Makefile.am +--- zhcon-0.2.5/input/Makefile.am 2006-04-25 00:38:44.000000000 +0800 ++++ zhcon-0.2.6/input/Makefile.am 2007-02-12 17:48:22.000000000 +0800 +@@ -1,8 +1,8 @@ + EXTRA_DIST = *.mb + + install-data-local: +- $(mkinstalldirs) $(libdir)/zhcon/input/ +- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/ ++ $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ ++ $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ + + uninstall-local: +- -rm -f $(libdir)/zhcon/input/*.mb ++ -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb +diff -ru zhcon-0.2.5/src/Makefile.am zhcon-0.2.6/src/Makefile.am +--- zhcon-0.2.5/src/Makefile.am 2006-05-03 01:12:41.000000000 +0800 ++++ zhcon-0.2.6/src/Makefile.am 2007-02-12 17:45:59.000000000 +0800 +@@ -8,14 +8,14 @@ + SUBDIRS = display + + install-exec-local: +- chmod 4755 $(bindir)/zhcon ++ chmod 4755 $(DESTDIR)$(bindir)/zhcon + + install-data-local: +- $(mkinstalldirs) $(prefix)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf ++ $(mkinstalldirs) $(DESTDIR)$(prefix)/etc ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf + + uninstall-local: +- -rm -f $(prefix)/etc/zhcon.conf ++ -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf + + # set the include path found by configure + INCLUDES= $(all_includes) diff --git a/zhcon.spec b/zhcon.spec new file mode 100644 index 0000000..a44fde3 --- /dev/null +++ b/zhcon.spec @@ -0,0 +1,84 @@ +Name: zhcon +Summary: A Fast Console CJK System Using FrameBuffer +Version: 0.2.6 +Release: 3%{?dist} +Group: Applications/System +License: GPL +URL: http://www.sourceforge.net/projects/%{name}/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5.tar.gz +Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz +Patch1: zhcon-0.2.6-path.patch +Patch2: zhcon-0.2.6-path-define.patch +Patch3: zhcon-0.2.6-flags.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Buildrequires: autoconf automake +Buildrequires: gettext-devel ncurses-devel gpm-devel + +%description +Zhcon is a fast Linux Console Chinese System which supports +framebuffer device.It can display Chinese, Japanese or Korean +double byte characters.Supported language encodings include: +GB2312, GBK, BIG5, JIS and KSC. + +%description -l zh_CN +zhcon是一个工作在Linux控制å°ä¸‹çš„多内ç ä¸­æ–‡å¹³å°ã€‚ +它能够控制å°ä¸Šæ˜¾ç¤ºç®€ä½“中文ã€ç¹ä½“中文ã€æ—¥æ–‡ã€éŸ©æ–‡ +ç­‰åŒå­—节字符。支æŒå¤šç§è¾“入法。 + +%prep +%setup -q -n zhcon-0.2.5 +%patch0 -p1 -b .0.26 +%patch1 -p1 -b .instpath +%patch2 -p1 -b .path_define +%patch3 -p1 -b .flags +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) + +%build +# exit if bootstrap fails +# missing config.rpath causes automake failure +sed -i -e 's|set -x|set -e -x|' bootstrap +touch config.rpath + +./bootstrap +%configure +make %{?_smp_mflags} + +%install +rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html +%lang(zh_CN) %doc doc/manual* doc/poem.gb doc/poem.gb.utf8 +%lang(zh_TW) %doc doc/poem.big5 +%{_mandir}/man1/* +%config(noreplace) %{_sysconfdir}/%{name}.conf +%attr(4755,root,root) %{_bindir}/%{name} +%{_datadir}/%{name}/ + +%changelog +* Tue Feb 27 2007 Hu Zheng - 0.2.6-3 +- Update for review. + +* Thu Feb 15 2007 Mamoru Tasaka - 0.2.6-2.1 +- Add source URL +- Check if bootstrap exited with success +- Change the directory of %%{name}.conf +- Move all files in %%{_libdir} to %%{_datadir} (no libraries is + found) +- Add BR gpm-devel +- Pass optflags correctly +- Keep timestamps + +* Thu Feb 15 2007 Hu Zheng - 0.2.6-2 +- Fix spec file. + +* Mon Feb 12 2007 Hu Zheng - 0.2.6-1 +- Initial build for Fedora Extra + From a5d2356436cb7ac52a922efca90d3cee55872bca Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Tue, 27 Mar 2007 07:25:40 +0000 Subject: [PATCH 03/52] add source files --- .cvsignore | 2 + sources | 2 + zhcon-0.2.6-flags.patch | 14 ++++ zhcon-0.2.6-path-define.patch | 117 ++++++++++++++++++++++++++++++++++ zhcon-0.2.6-path.patch | 67 +++++++++++++++++++ zhcon.spec | 84 ++++++++++++++++++++++++ 6 files changed, 286 insertions(+) create mode 100644 zhcon-0.2.6-flags.patch create mode 100644 zhcon-0.2.6-path-define.patch create mode 100644 zhcon-0.2.6-path.patch create mode 100644 zhcon.spec diff --git a/.cvsignore b/.cvsignore index e69de29..994e4f3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +zhcon-0.2.5.tar.gz +zhcon-0.2.5-to-0.2.6.diff.gz diff --git a/sources b/sources index e69de29..acf9e58 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +79e1c68aab8341e32129f61c1670baeb zhcon-0.2.5.tar.gz +971f68507f9c48a6b5cbee4ba0c1e2a6 zhcon-0.2.5-to-0.2.6.diff.gz diff --git a/zhcon-0.2.6-flags.patch b/zhcon-0.2.6-flags.patch new file mode 100644 index 0000000..2b2939c --- /dev/null +++ b/zhcon-0.2.6-flags.patch @@ -0,0 +1,14 @@ +--- zhcon-0.2.5/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 ++++ zhcon-0.2.5/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 +@@ -9,11 +9,6 @@ + #getbpsf_LDADD = -L/usr/X11R6/lib -lX11 + #getbpsf_CPPFLAGS = -I/usr/X11R6/include + +-LDFLAGS= +-CXXFLAGS= +-CCFLAGS= +-LIBS= +- + EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\ + gpm-1.19.6-patched.tar.gz + diff --git a/zhcon-0.2.6-path-define.patch b/zhcon-0.2.6-path-define.patch new file mode 100644 index 0000000..7fb129a --- /dev/null +++ b/zhcon-0.2.6-path-define.patch @@ -0,0 +1,117 @@ +--- zhcon-0.2.5/configure.in.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/configure.in 2007-02-16 03:48:31.000000000 +0900 +@@ -175,6 +175,16 @@ + AC_CHECK_LIB(gpm,main,,usegpm="no") + + dnl----------------------------------------------------------------------- ++dnl Fedora specific fix ++dnl----------------------------------------------------------------------- ++CFLAGS="$CFLAGS -DDATADIR=\\\"$datadir\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\"" ++CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\"" ++ ++eval DATADIR=${datadir} ++eval DATADIR=$DATADIR ++AC_SUBST(DATADIR) ++ ++dnl----------------------------------------------------------------------- + dnl Checks for libggi + dnl----------------------------------------------------------------------- + useggi="yes" +@@ -208,7 +218,7 @@ + libggi support: ${useggi} + unicon support: ${useunicon} + zhcon binary dir: `eval "echo \`eval \"echo ${bindir}\"\`"` +- zhcon files dir: `eval "echo \`eval \"echo ${libdir}/${PACKAGE}\"\`"` ++ zhcon files dir: `eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"` + + Config complete, now type make to build zhcon. + Good Luck! +--- zhcon-0.2.5/font/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/font/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +@@ -1,8 +1,8 @@ + EXTRA_DIST = *.bpsf + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ +- $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/ ++ $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/ + + uninstall-local: +- -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf ++ -rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf +--- zhcon-0.2.5/input/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/input/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +@@ -1,8 +1,8 @@ + EXTRA_DIST = *.mb + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ +- $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/ ++ $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/ + + uninstall-local: +- -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb ++ -rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb +--- zhcon-0.2.5/src/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/src/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +@@ -11,11 +11,11 @@ + chmod 4755 $(DESTDIR)$(bindir)/zhcon + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(prefix)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf + + uninstall-local: +- -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf ++ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf + + # set the include path found by configure + INCLUDES= $(all_includes) +--- zhcon-0.2.5/src/nativeinputserver.cpp.path_define 2006-04-25 01:38:27.000000000 +0900 ++++ zhcon-0.2.5/src/nativeinputserver.cpp 2007-02-16 03:47:08.000000000 +0900 +@@ -30,7 +30,7 @@ + #include "nativeinputserver.h" + #include "keymap.h" + +-string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; ++string NativeInputServer::mDataPath = DATADIR"/zhcon/"; + + NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { + {'.', "¡£"} +--- zhcon-0.2.5/src/zhcon.cpp.path_define 2007-02-16 03:47:08.000000000 +0900 ++++ zhcon-0.2.5/src/zhcon.cpp 2007-02-16 03:47:08.000000000 +0900 +@@ -123,7 +123,7 @@ + string cfgfile = getenv("HOME"); + cfgfile += "/.zhconrc"; + if (access(cfgfile.c_str(), R_OK) != 0) +- cfgfile = PREFIX "/etc/zhcon.conf"; ++ cfgfile = SYSCONFDIR "/zhcon.conf"; + + //for debug,a pause enable us to attach zhcon's pid in gdb + //char c;cin>>c; +@@ -621,7 +621,7 @@ + if (getenv("LC_ALL")) + mOldLocale = getenv("LC_ALL"); + +- string prefix = PREFIX"/lib/zhcon/"; ++ string prefix = DATADIR "/zhcon/"; + mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT)); + mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT)); + mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT)); +@@ -752,10 +752,10 @@ + InputManager::SetTty(mConFd, ttyno, mTtyFd); + + string s; +- s = f.GetOption(string("zhconpath"), string(PREFIX"/lib/zhcon/")); ++ s = f.GetOption(string("zhconpath"), string(DATADIR "/zhcon/")); + NativeInputServer::SetDataPath(s); + #ifdef HAVE_UNICON_LIB +- s = f.GetOption(string("uniconpath"), string("/usr/lib/unicon/")); ++ s = f.GetOption(string("uniconpath"), string(DATADIR "/unicon/")); + UniconInputServer::SetDataPath(s); + #endif + string sOverSpot, sNativeBar; diff --git a/zhcon-0.2.6-path.patch b/zhcon-0.2.6-path.patch new file mode 100644 index 0000000..274417a --- /dev/null +++ b/zhcon-0.2.6-path.patch @@ -0,0 +1,67 @@ +diff -ru zhcon-0.2.5/doc/Makefile.am zhcon-0.2.6/doc/Makefile.am +--- zhcon-0.2.5/doc/Makefile.am 2006-05-03 01:57:18.000000000 +0800 ++++ zhcon-0.2.6/doc/Makefile.am 2007-02-12 17:46:12.000000000 +0800 +@@ -3,8 +3,8 @@ + EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz + + install-data-local: +- $(mkinstalldirs) $(mandir)/man1/ +- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ ++ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1 + + uninstall-local: +- -rm -f $(mandir)/man1/zhcon.1 ++ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1 +diff -ru zhcon-0.2.5/font/Makefile.am zhcon-0.2.6/font/Makefile.am +--- zhcon-0.2.5/font/Makefile.am 2006-04-25 00:39:04.000000000 +0800 ++++ zhcon-0.2.6/font/Makefile.am 2007-02-12 17:47:32.000000000 +0800 +@@ -1,8 +1,8 @@ + EXTRA_DIST = *.bpsf + + install-data-local: +- $(mkinstalldirs) $(libdir)/zhcon/font/ +- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/ ++ $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ ++ $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ + + uninstall-local: +- -rm -f $(libdir)/zhcon/font/*.bpsf ++ -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf +diff -ru zhcon-0.2.5/input/Makefile.am zhcon-0.2.6/input/Makefile.am +--- zhcon-0.2.5/input/Makefile.am 2006-04-25 00:38:44.000000000 +0800 ++++ zhcon-0.2.6/input/Makefile.am 2007-02-12 17:48:22.000000000 +0800 +@@ -1,8 +1,8 @@ + EXTRA_DIST = *.mb + + install-data-local: +- $(mkinstalldirs) $(libdir)/zhcon/input/ +- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/ ++ $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ ++ $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ + + uninstall-local: +- -rm -f $(libdir)/zhcon/input/*.mb ++ -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb +diff -ru zhcon-0.2.5/src/Makefile.am zhcon-0.2.6/src/Makefile.am +--- zhcon-0.2.5/src/Makefile.am 2006-05-03 01:12:41.000000000 +0800 ++++ zhcon-0.2.6/src/Makefile.am 2007-02-12 17:45:59.000000000 +0800 +@@ -8,14 +8,14 @@ + SUBDIRS = display + + install-exec-local: +- chmod 4755 $(bindir)/zhcon ++ chmod 4755 $(DESTDIR)$(bindir)/zhcon + + install-data-local: +- $(mkinstalldirs) $(prefix)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf ++ $(mkinstalldirs) $(DESTDIR)$(prefix)/etc ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf + + uninstall-local: +- -rm -f $(prefix)/etc/zhcon.conf ++ -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf + + # set the include path found by configure + INCLUDES= $(all_includes) diff --git a/zhcon.spec b/zhcon.spec new file mode 100644 index 0000000..a44fde3 --- /dev/null +++ b/zhcon.spec @@ -0,0 +1,84 @@ +Name: zhcon +Summary: A Fast Console CJK System Using FrameBuffer +Version: 0.2.6 +Release: 3%{?dist} +Group: Applications/System +License: GPL +URL: http://www.sourceforge.net/projects/%{name}/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5.tar.gz +Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz +Patch1: zhcon-0.2.6-path.patch +Patch2: zhcon-0.2.6-path-define.patch +Patch3: zhcon-0.2.6-flags.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Buildrequires: autoconf automake +Buildrequires: gettext-devel ncurses-devel gpm-devel + +%description +Zhcon is a fast Linux Console Chinese System which supports +framebuffer device.It can display Chinese, Japanese or Korean +double byte characters.Supported language encodings include: +GB2312, GBK, BIG5, JIS and KSC. + +%description -l zh_CN +zhcon是一个工作在Linux控制å°ä¸‹çš„多内ç ä¸­æ–‡å¹³å°ã€‚ +它能够控制å°ä¸Šæ˜¾ç¤ºç®€ä½“中文ã€ç¹ä½“中文ã€æ—¥æ–‡ã€éŸ©æ–‡ +ç­‰åŒå­—节字符。支æŒå¤šç§è¾“入法。 + +%prep +%setup -q -n zhcon-0.2.5 +%patch0 -p1 -b .0.26 +%patch1 -p1 -b .instpath +%patch2 -p1 -b .path_define +%patch3 -p1 -b .flags +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) + +%build +# exit if bootstrap fails +# missing config.rpath causes automake failure +sed -i -e 's|set -x|set -e -x|' bootstrap +touch config.rpath + +./bootstrap +%configure +make %{?_smp_mflags} + +%install +rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html +%lang(zh_CN) %doc doc/manual* doc/poem.gb doc/poem.gb.utf8 +%lang(zh_TW) %doc doc/poem.big5 +%{_mandir}/man1/* +%config(noreplace) %{_sysconfdir}/%{name}.conf +%attr(4755,root,root) %{_bindir}/%{name} +%{_datadir}/%{name}/ + +%changelog +* Tue Feb 27 2007 Hu Zheng - 0.2.6-3 +- Update for review. + +* Thu Feb 15 2007 Mamoru Tasaka - 0.2.6-2.1 +- Add source URL +- Check if bootstrap exited with success +- Change the directory of %%{name}.conf +- Move all files in %%{_libdir} to %%{_datadir} (no libraries is + found) +- Add BR gpm-devel +- Pass optflags correctly +- Keep timestamps + +* Thu Feb 15 2007 Hu Zheng - 0.2.6-2 +- Fix spec file. + +* Mon Feb 12 2007 Hu Zheng - 0.2.6-1 +- Initial build for Fedora Extra + From 2de9368690dd2ec1bc21eb04be55c315cebb65b0 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Wed, 28 Mar 2007 05:53:54 +0000 Subject: [PATCH 04/52] add 64bit fix --- zhcon-0.2.6-64bit-fix.patch | 51 +++++++++++++++++++++++++++++++++++++ zhcon.spec | 2 ++ 2 files changed, 53 insertions(+) create mode 100644 zhcon-0.2.6-64bit-fix.patch diff --git a/zhcon-0.2.6-64bit-fix.patch b/zhcon-0.2.6-64bit-fix.patch new file mode 100644 index 0000000..067bb8c --- /dev/null +++ b/zhcon-0.2.6-64bit-fix.patch @@ -0,0 +1,51 @@ +diff -r -u zhcon-0.2.5.orig/src/winime.cpp zhcon-0.2.5.new/src/winime.cpp +--- zhcon-0.2.5.orig/src/winime.cpp 2007-03-28 13:33:26.000000000 +0800 ++++ zhcon-0.2.5.new/src/winime.cpp 2007-03-28 13:42:41.000000000 +0800 +@@ -74,7 +74,7 @@ + return false; + } + //add a word to candilist then push rp forward +-void WinIme::AddCandilist(char *&rp,unsigned int& buflen) { ++void WinIme::AddCandilist(char *&rp,unsigned long& buflen) { + assert(mpList->mCount < 10); + assert(!IsHzCode1(*rp)); //*rp is last matched latter + +@@ -163,7 +163,7 @@ + count--; + break; + } +- AddCandilist(t,(unsigned int&)buflen); ++ AddCandilist(t,(unsigned long&)buflen); + } //search next word + else { + if (len == 1) //special for first char +@@ -250,7 +250,7 @@ + + if (p == (char *) 0xffffffff) + found = false; +- p = (unsigned int) p + mpText; ++ p = (unsigned long) p + mpText; + } //2nd level index + else if (mNum == 1) { + int l = strlen(mHead.mCodeSet); +@@ -271,7 +271,7 @@ + if (p == (char *) 0xffffffff) + found = false; + +- p = (unsigned int) p + mpText; ++ p = (unsigned long) p + mpText; + } else if (mNum < mHead.mMaxCodes) { + p = mpOffset[mNum - 1]; + if (p == (char *) 0xffffffff) +diff -r -u zhcon-0.2.5.orig/src/winime.h zhcon-0.2.5.new/src/winime.h +--- zhcon-0.2.5.orig/src/winime.h 2007-03-28 13:33:26.000000000 +0800 ++++ zhcon-0.2.5.new/src/winime.h 2007-03-28 13:42:45.000000000 +0800 +@@ -69,7 +69,7 @@ + return c >= 0xA1 && c <= 0xFE; + } + +- void AddCandilist(char*& p,unsigned& buflen); ++ void AddCandilist(char*& p,unsigned long& buflen); + void SkipNext(char*& rp); + int MatchWord(char* p, int len, int offset); + bool IsGB2312(char* p); diff --git a/zhcon.spec b/zhcon.spec index a44fde3..42cfdb0 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -10,6 +10,7 @@ Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf automake @@ -32,6 +33,7 @@ zhcon是一个工作在Linux控制å°ä¸‹çš„多内ç ä¸­æ–‡å¹³å°ã€‚ %patch1 -p1 -b .instpath %patch2 -p1 -b .path_define %patch3 -p1 -b .flags +%patch4 -p1 -b .64bit_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) From 0d89ac85cd382ad06ac16fc94110400e7b0e36d2 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Wed, 28 Mar 2007 05:53:57 +0000 Subject: [PATCH 05/52] add 64bit fix --- zhcon-0.2.6-64bit-fix.patch | 51 +++++++++++++++++++++++++++++++++++++ zhcon.spec | 2 ++ 2 files changed, 53 insertions(+) create mode 100644 zhcon-0.2.6-64bit-fix.patch diff --git a/zhcon-0.2.6-64bit-fix.patch b/zhcon-0.2.6-64bit-fix.patch new file mode 100644 index 0000000..067bb8c --- /dev/null +++ b/zhcon-0.2.6-64bit-fix.patch @@ -0,0 +1,51 @@ +diff -r -u zhcon-0.2.5.orig/src/winime.cpp zhcon-0.2.5.new/src/winime.cpp +--- zhcon-0.2.5.orig/src/winime.cpp 2007-03-28 13:33:26.000000000 +0800 ++++ zhcon-0.2.5.new/src/winime.cpp 2007-03-28 13:42:41.000000000 +0800 +@@ -74,7 +74,7 @@ + return false; + } + //add a word to candilist then push rp forward +-void WinIme::AddCandilist(char *&rp,unsigned int& buflen) { ++void WinIme::AddCandilist(char *&rp,unsigned long& buflen) { + assert(mpList->mCount < 10); + assert(!IsHzCode1(*rp)); //*rp is last matched latter + +@@ -163,7 +163,7 @@ + count--; + break; + } +- AddCandilist(t,(unsigned int&)buflen); ++ AddCandilist(t,(unsigned long&)buflen); + } //search next word + else { + if (len == 1) //special for first char +@@ -250,7 +250,7 @@ + + if (p == (char *) 0xffffffff) + found = false; +- p = (unsigned int) p + mpText; ++ p = (unsigned long) p + mpText; + } //2nd level index + else if (mNum == 1) { + int l = strlen(mHead.mCodeSet); +@@ -271,7 +271,7 @@ + if (p == (char *) 0xffffffff) + found = false; + +- p = (unsigned int) p + mpText; ++ p = (unsigned long) p + mpText; + } else if (mNum < mHead.mMaxCodes) { + p = mpOffset[mNum - 1]; + if (p == (char *) 0xffffffff) +diff -r -u zhcon-0.2.5.orig/src/winime.h zhcon-0.2.5.new/src/winime.h +--- zhcon-0.2.5.orig/src/winime.h 2007-03-28 13:33:26.000000000 +0800 ++++ zhcon-0.2.5.new/src/winime.h 2007-03-28 13:42:45.000000000 +0800 +@@ -69,7 +69,7 @@ + return c >= 0xA1 && c <= 0xFE; + } + +- void AddCandilist(char*& p,unsigned& buflen); ++ void AddCandilist(char*& p,unsigned long& buflen); + void SkipNext(char*& rp); + int MatchWord(char* p, int len, int offset); + bool IsGB2312(char* p); diff --git a/zhcon.spec b/zhcon.spec index a44fde3..42cfdb0 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -10,6 +10,7 @@ Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf automake @@ -32,6 +33,7 @@ zhcon是一个工作在Linux控制å°ä¸‹çš„多内ç ä¸­æ–‡å¹³å°ã€‚ %patch1 -p1 -b .instpath %patch2 -p1 -b .path_define %patch3 -p1 -b .flags +%patch4 -p1 -b .64bit_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) From a19253e443f0768f5aae768f708173e1638d0b59 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Thu, 29 Mar 2007 03:43:19 +0000 Subject: [PATCH 06/52] update spec files --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 42cfdb0..3397dec 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: 3%{?dist} +Release: 4%{?dist} Group: Applications/System License: GPL URL: http://www.sourceforge.net/projects/%{name}/ @@ -65,6 +65,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Thu Mar 29 2007 Hu Zheng - 0.2.6-4 +- Fix x86_64 compile error. + * Tue Feb 27 2007 Hu Zheng - 0.2.6-3 - Update for review. From 30dd2cca7b6aff839392b3430369adffa09e2730 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Thu, 29 Mar 2007 03:43:22 +0000 Subject: [PATCH 07/52] update spec files --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 42cfdb0..3397dec 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: 3%{?dist} +Release: 4%{?dist} Group: Applications/System License: GPL URL: http://www.sourceforge.net/projects/%{name}/ @@ -65,6 +65,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Thu Mar 29 2007 Hu Zheng - 0.2.6-4 +- Fix x86_64 compile error. + * Tue Feb 27 2007 Hu Zheng - 0.2.6-3 - Update for review. From 757110deffe8b9dc803adfa808f2ec1d7cd1fd82 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Thu, 29 Mar 2007 04:06:25 +0000 Subject: [PATCH 08/52] to fix cvs tag error --- zhcon.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zhcon.spec b/zhcon.spec index 3397dec..ed19bd2 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: 4%{?dist} +Release: 5%{?dist} Group: Applications/System License: GPL URL: http://www.sourceforge.net/projects/%{name}/ @@ -65,7 +65,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog -* Thu Mar 29 2007 Hu Zheng - 0.2.6-4 +* Thu Mar 29 2007 Hu Zheng - 0.2.6-5 - Fix x86_64 compile error. * Tue Feb 27 2007 Hu Zheng - 0.2.6-3 From e43c1e1a232cf7bff1110cfb8ce18f79ec013e24 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Thu, 29 Mar 2007 04:06:29 +0000 Subject: [PATCH 09/52] to fix cvs tag error --- zhcon.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zhcon.spec b/zhcon.spec index 3397dec..ed19bd2 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: 4%{?dist} +Release: 5%{?dist} Group: Applications/System License: GPL URL: http://www.sourceforge.net/projects/%{name}/ @@ -65,7 +65,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog -* Thu Mar 29 2007 Hu Zheng - 0.2.6-4 +* Thu Mar 29 2007 Hu Zheng - 0.2.6-5 - Fix x86_64 compile error. * Tue Feb 27 2007 Hu Zheng - 0.2.6-3 From e669245c332a902ebbac2b09e5716904c51d9e0e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 20 Feb 2008 08:43:57 +0000 Subject: [PATCH 10/52] - Autorebuild for GCC 4.3 --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index ed19bd2..8061f14 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: 5%{?dist} +Release: 6%{?dist} Group: Applications/System License: GPL URL: http://www.sourceforge.net/projects/%{name}/ @@ -65,6 +65,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Wed Feb 20 2008 Fedora Release Engineering - 0.2.6-6 +- Autorebuild for GCC 4.3 + * Thu Mar 29 2007 Hu Zheng - 0.2.6-5 - Fix x86_64 compile error. From d40c23683074a4b31ba8d6971f2305e3dbfdd812 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Tue, 26 Feb 2008 09:13:06 +0000 Subject: [PATCH 11/52] gcc-4.3 compile fix --- zhcon-0.2.6.gcc43.patch | 133 ++++++++++++++++++++++++++++++++++++++++ zhcon.spec | 7 ++- 2 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 zhcon-0.2.6.gcc43.patch 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 From e713dac411380127e46208ee011ead19b0505017 Mon Sep 17 00:00:00 2001 From: Hu Zheng Date: Mon, 3 Mar 2008 06:13:52 +0000 Subject: [PATCH 12/52] i386 build fix --- zhcon-0.2.6.gcc43.patch | 25 +++++++++++++++++++++++-- zhcon.spec | 5 ++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/zhcon-0.2.6.gcc43.patch b/zhcon-0.2.6.gcc43.patch index f397220..dea7e6d 100644 --- a/zhcon-0.2.6.gcc43.patch +++ b/zhcon-0.2.6.gcc43.patch @@ -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 @@ diff -u -r zhcon-0.2.5/src/basefont.cpp zhcon-0.2.5.fix/src/basefont.cpp #include #include #include +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 ++#include #include #include #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 #include #include +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 @@ diff -u -r zhcon-0.2.5/src/inputmanager.h zhcon-0.2.5.fix/src/inputmanager.h #include #include +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 @@ diff -u -r zhcon-0.2.5/src/zhcon.cpp zhcon-0.2.5.fix/src/zhcon.cpp #include #include #include +Only in zhcon-0.2.5: stamp-h1 +Only in zhcon-0.2.5/tools: .deps +Only in zhcon-0.2.5/tools: Makefile diff --git a/zhcon.spec b/zhcon.spec index 5cb2619..88b0eaf 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: 7%{?dist} +Release: 8%{?dist} Group: Applications/System License: GPL URL: http://www.sourceforge.net/projects/%{name}/ @@ -67,6 +67,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Mon Mar 03 2008 Hu Zheng - 0.2.6-8 +- i386 build fix. + * Tue Feb 26 2008 Hu Zheng - 0.2.6-7 - Gcc-4.3 compile fix. From 7809dc7f130edba2604bb7d7982b9bd894879316 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 15 Jul 2008 04:31:25 +0000 Subject: [PATCH 13/52] Fix Bug 441203,449625,454228 --- .cvsignore | 4 +- import.log | 1 + sources | 4 +- zhcon-0.2.6-64bit-fix.patch | 51 ------ zhcon-0.2.6-flags.patch | 4 +- zhcon-0.2.6-gcc43.patch | 327 ++++++++++++++++++++++++++++++++++ zhcon-0.2.6-keyswitch.patch | 49 +++++ zhcon-0.2.6-locale.patch | 69 +++++++ zhcon-0.2.6-path-define.patch | 119 ++++++++----- zhcon-0.2.6-path.patch | 67 ------- zhcon-0.2.6.gcc43.patch | 154 ---------------- zhcon.spec | 54 ++++-- 12 files changed, 563 insertions(+), 340 deletions(-) create mode 100644 import.log delete mode 100644 zhcon-0.2.6-64bit-fix.patch create mode 100644 zhcon-0.2.6-gcc43.patch create mode 100644 zhcon-0.2.6-keyswitch.patch create mode 100644 zhcon-0.2.6-locale.patch delete mode 100644 zhcon-0.2.6-path.patch delete mode 100644 zhcon-0.2.6.gcc43.patch diff --git a/.cvsignore b/.cvsignore index 994e4f3..836cbe5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -zhcon-0.2.5.tar.gz -zhcon-0.2.5-to-0.2.6.diff.gz +zhcon_0.2.6-4.1.diff.gz +zhcon_0.2.6.orig.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..f34c0f7 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288 diff --git a/sources b/sources index acf9e58..08051eb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -79e1c68aab8341e32129f61c1670baeb zhcon-0.2.5.tar.gz -971f68507f9c48a6b5cbee4ba0c1e2a6 zhcon-0.2.5-to-0.2.6.diff.gz +0357d334637fc2fecf042eb9043f8b69 zhcon_0.2.6-4.1.diff.gz +0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz diff --git a/zhcon-0.2.6-64bit-fix.patch b/zhcon-0.2.6-64bit-fix.patch deleted file mode 100644 index 067bb8c..0000000 --- a/zhcon-0.2.6-64bit-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -r -u zhcon-0.2.5.orig/src/winime.cpp zhcon-0.2.5.new/src/winime.cpp ---- zhcon-0.2.5.orig/src/winime.cpp 2007-03-28 13:33:26.000000000 +0800 -+++ zhcon-0.2.5.new/src/winime.cpp 2007-03-28 13:42:41.000000000 +0800 -@@ -74,7 +74,7 @@ - return false; - } - //add a word to candilist then push rp forward --void WinIme::AddCandilist(char *&rp,unsigned int& buflen) { -+void WinIme::AddCandilist(char *&rp,unsigned long& buflen) { - assert(mpList->mCount < 10); - assert(!IsHzCode1(*rp)); //*rp is last matched latter - -@@ -163,7 +163,7 @@ - count--; - break; - } -- AddCandilist(t,(unsigned int&)buflen); -+ AddCandilist(t,(unsigned long&)buflen); - } //search next word - else { - if (len == 1) //special for first char -@@ -250,7 +250,7 @@ - - if (p == (char *) 0xffffffff) - found = false; -- p = (unsigned int) p + mpText; -+ p = (unsigned long) p + mpText; - } //2nd level index - else if (mNum == 1) { - int l = strlen(mHead.mCodeSet); -@@ -271,7 +271,7 @@ - if (p == (char *) 0xffffffff) - found = false; - -- p = (unsigned int) p + mpText; -+ p = (unsigned long) p + mpText; - } else if (mNum < mHead.mMaxCodes) { - p = mpOffset[mNum - 1]; - if (p == (char *) 0xffffffff) -diff -r -u zhcon-0.2.5.orig/src/winime.h zhcon-0.2.5.new/src/winime.h ---- zhcon-0.2.5.orig/src/winime.h 2007-03-28 13:33:26.000000000 +0800 -+++ zhcon-0.2.5.new/src/winime.h 2007-03-28 13:42:45.000000000 +0800 -@@ -69,7 +69,7 @@ - return c >= 0xA1 && c <= 0xFE; - } - -- void AddCandilist(char*& p,unsigned& buflen); -+ void AddCandilist(char*& p,unsigned long& buflen); - void SkipNext(char*& rp); - int MatchWord(char* p, int len, int offset); - bool IsGB2312(char* p); diff --git a/zhcon-0.2.6-flags.patch b/zhcon-0.2.6-flags.patch index 2b2939c..75c593c 100644 --- a/zhcon-0.2.6-flags.patch +++ b/zhcon-0.2.6-flags.patch @@ -1,5 +1,5 @@ ---- zhcon-0.2.5/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 -+++ zhcon-0.2.5/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 +--- zhcon-0.2.6/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 ++++ zhcon-0.2.6/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 @@ -9,11 +9,6 @@ #getbpsf_LDADD = -L/usr/X11R6/lib -lX11 #getbpsf_CPPFLAGS = -I/usr/X11R6/include diff --git a/zhcon-0.2.6-gcc43.patch b/zhcon-0.2.6-gcc43.patch new file mode 100644 index 0000000..5a348a7 --- /dev/null +++ b/zhcon-0.2.6-gcc43.patch @@ -0,0 +1,327 @@ +diff -up ./src/basefont.cpp.gcc43 ./src/basefont.cpp +--- ./src/basefont.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 ++++ ./src/basefont.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "global.h" + #include "debug.h" + #include "hzdecoder.h" +diff -up ./src/big5decoder.cpp.gcc43 ./src/big5decoder.cpp +--- ./src/big5decoder.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 ++++ ./src/big5decoder.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -27,7 +27,8 @@ bool BIG5Decoder::IsCode1(char c) { + } + + bool BIG5Decoder::IsCode2(char c) { +- return c >= 40 && c <= 0xff; ++// return c >= 40 && c <= 0xff; ++ return c>=40; + } + + unsigned int BIG5Decoder::Index(char c1, char c2) { +diff -up ./src/display/fblinear16.cpp.gcc43 ./src/display/fblinear16.cpp +--- ./src/display/fblinear16.cpp.gcc43 2006-04-25 02:38:24.000000000 +1000 ++++ ./src/display/fblinear16.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -86,7 +86,8 @@ void FBLinear16::RevRect(int x1,int y1,i + for(; height--; dest += mNextLine) { + dest32 = (__u32*)dest; + for (cnt = width/2; cnt--;) { +- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); ++ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); ++ dest32++; + } + if (width & 1) { + dest16 = (__u16*)dest32; +diff -up ./src/display/fblinear24.cpp.gcc43 ./src/display/fblinear24.cpp +--- ./src/display/fblinear24.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 ++++ ./src/display/fblinear24.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -136,19 +136,25 @@ void FBLinear24::RevRect(int x1,int y1,i + for(; height--; dest += mNextLine) { + dest32 = (__u32*)dest; + for (cnt = width/4; cnt--;) { +- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); +- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); +- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); ++ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); ++ dest32++; ++ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); ++ dest32++; ++ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); ++ dest32++; + } + if (width & 2) { +- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); ++ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); ++ dest32++; + dest16 = (__u16*)dest32; +- fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); ++ fb_writew(fb_readw(dest16) ^ 0xffff, dest16); ++ dest16++; + dest32 = (__u32*)dest16; + } + if (width & 1) { + dest16 = (__u16*)dest32; +- fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); ++ fb_writew(fb_readw(dest16) ^ 0xffff, dest16); ++ dest16++; + dest8 = (__u8*)dest16; + fb_writeb(fb_readb(dest8) ^ 0xff, dest8); + } +diff -up ./src/display/fblinear32.cpp.gcc43 ./src/display/fblinear32.cpp +--- ./src/display/fblinear32.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 ++++ ./src/display/fblinear32.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -74,7 +74,8 @@ void FBLinear32::RevRect(int x1,int y1,i + for(; height--; dest += mNextLine) { + dest32 = (__u32*)dest; + for (cnt = width; cnt--;) { +- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); ++ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); ++ dest32++; + } + } + } +diff -up ./src/display/fblinear4.cpp.gcc43 ./src/display/fblinear4.cpp +--- ./src/display/fblinear4.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 ++++ ./src/display/fblinear4.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include "global.h" + #include "fblinear4.h" + +diff -up ./src/display/fblinear8.cpp.gcc43 ./src/display/fblinear8.cpp +--- ./src/display/fblinear8.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 ++++ ./src/display/fblinear8.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include "global.h" + #include "fblinear8.h" + +@@ -63,11 +64,13 @@ void FBLinear8::RevRect(int x1,int y1,in + for(; height--; dest += mNextLine) { + dest32 = (__u32*)dest; + for (cnt = width/4; cnt--;) { +- fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32++); ++ fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32); ++ dest32++; + } + if (width & 2) { + dest16 = (__u16*)dest32; +- fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16++); ++ fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16); ++ dest16++; + dest32 = (__u32*)dest16; + } + if (width & 1) { +diff -up ./src/display/fbvgaplanes.cpp.gcc43 ./src/display/fbvgaplanes.cpp +--- ./src/display/fbvgaplanes.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 ++++ ./src/display/fbvgaplanes.cpp 2008-07-15 12:53:18.000000000 +1000 +@@ -22,6 +22,7 @@ + #ifdef USING_VGA + #include + #include ++#include + #include "debug.h" + #include "fbvgaplanes.h" + +diff -up ./src/encfilter.c.gcc43 ./src/encfilter.c +--- ./src/encfilter.c.gcc43 2006-04-29 05:09:33.000000000 +1000 ++++ ./src/encfilter.c 2008-07-15 12:31:16.000000000 +1000 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include "encfilter.h" + +@@ -46,7 +47,9 @@ + #error ICONV_CONST not defined + #endif /* ICONV_CONST */ + +-#define BUFSIZ 8192 ++#ifndef BUFSIZ ++# define BUFSIZ 8192 ++#endif + int UseEncodingFilter; /* use filter such as UTF-8 */ + char EncodingFilterBuff[BUFSIZ]; /* global buffer used by ConsoleHandler() and TextCopy() */ + size_t EncodingFilterLen; +diff -up ./src/gbkdecoder.cpp.gcc43 ./src/gbkdecoder.cpp +--- ./src/gbkdecoder.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 ++++ ./src/gbkdecoder.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -27,13 +27,15 @@ bool GBKDecoder::IsCode1(char c) { + } + + bool GBKDecoder::IsCode2(char c) { +- return c >= 0x40 && c <= 0xff; ++// return c >= 0x40 && c <= 0xff; ++ return c>=0x40; + } + + unsigned int GBKDecoder::Index(char c1, char c2) { + int n; + n = (c1 - 0x81) * 192; +- if (c2 <= 0xff && c2 >= 0x40) ++ // if (c2 <= 0xff && c2 >= 0x40) ++ if (c2 >= 0x40) + n += (c2 - 0x40); + return n; + } +diff -up ./src/graphdev.cpp.gcc43 ./src/graphdev.cpp +--- ./src/graphdev.cpp.gcc43 2006-04-25 02:38:26.000000000 +1000 ++++ ./src/graphdev.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -20,12 +20,14 @@ + #include + #endif + ++#include + #include + #include + #include + #include + #include + #include ++#include + #include "debug.h" + + #include "display/fbdev.h" +diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c +--- ./src/iconv_string.c.gcc43 2006-04-25 02:38:27.000000000 +1000 ++++ ./src/iconv_string.c 2008-07-15 12:31:16.000000000 +1000 +@@ -69,7 +69,7 @@ int iconv_string (const char* tocode, co + { + size_t count = 0; + char tmpbuf[tmpbufsize]; +- const char* inptr = start; ++ char* inptr = (char *) start; + size_t insize = end-start; + while (insize > 0) { + char* outptr = tmpbuf; +@@ -121,7 +121,7 @@ int iconv_string (const char* tocode, co + iconv(cd,NULL,NULL,NULL,NULL); /* return to the initial state */ + /* Do the conversion for real. */ + { +- const char* inptr = start; ++ char* inptr = (char *) start; + size_t insize = end-start; + char* outptr = result; + size_t outsize = length; +diff -up ./src/inputclient.cpp.gcc43 ./src/inputclient.cpp +--- ./src/inputclient.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 ++++ ./src/inputclient.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -16,6 +16,7 @@ + * * + ***************************************************************************/ + ++#include + #include "inputclient.h" + + Console* InputClient::mpCon = NULL; +diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp +--- ./src/inputmanager.cpp.gcc43 2006-05-03 03:18:39.000000000 +1000 ++++ ./src/inputmanager.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -24,6 +24,7 @@ using namespace std; + #include + #include + #include ++#include + + #include "global.h" + #include "debug.h" +--- ./src/inputmanager.h.gcc43 2006-04-25 02:38:26.000000000 +1000 ++++ ./src/inputmanager.h 2008-07-15 12:31:16.000000000 +1000 +@@ -26,6 +26,7 @@ + using namespace std; + #include + #include ++#include + + #include "mouse.h" + #if defined(__FreeBSD__) +--- ./src/nativeinputserver.h.gcc43 2006-04-25 02:38:26.000000000 +1000 ++++ ./src/nativeinputserver.h 2008-07-15 12:31:16.000000000 +1000 +@@ -62,7 +62,7 @@ class NativeInputServer : public InputSe + bool mAutoSelectUnique; + static struct Symbol { + char mKey; +- char *mpSymbol; ++ const char *mpSymbol; + } + mFullSymbolTable[]; + static char mFullCharTable[]; +--- ./src/window.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 ++++ ./src/window.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -20,6 +20,8 @@ + #include + #include + #include ++#include ++#include + #include "global.h" + #include "debug.h" + #include "window.h" +--- ./src/winime.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 ++++ ./src/winime.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -47,7 +47,7 @@ mCandilistBufLen(0) + throw (runtime_error("can not get gbfont size!")); + + mBufSize = st.st_size; +- mpBuf = (char *) mmap(0, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); ++ mpBuf = (char *) mmap(NULL, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); + if (mpBuf == MAP_FAILED) + throw (runtime_error("mmap failed!")); + +@@ -163,7 +163,8 @@ int WinIme::MatchWord(char *p, int len, + count--; + break; + } +- AddCandilist(t,(unsigned int&)buflen); ++ unsigned int buflength=buflen; ++ AddCandilist(t,(unsigned int&)buflength); + } //search next word + else { + if (len == 1) //special for first char +--- ./src/zhcon.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 ++++ ./src/zhcon.cpp 2008-07-15 12:31:16.000000000 +1000 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #if defined(linux) +@@ -452,9 +457,11 @@ void Zhcon::InitTty() { + return; + } + char *pCap = mCapBuf; +- mpCapClearScr = tgetstr("cl", &pCap); +- mpCapCursorOff = tgetstr("vi", &pCap); +- mpCapCursorOn = tgetstr("ve", &pCap); ++ char ids[][3]={"cl","vi","ve"}; ++ ++ mpCapClearScr = tgetstr(ids[0], &pCap); ++ mpCapCursorOff = tgetstr(ids[1], &pCap); ++ mpCapCursorOn = tgetstr(ids[2], &pCap); + + if (mpCapClearScr) write(mConFd, mpCapClearScr, strlen(mpCapClearScr)); + if (mpCapCursorOff) write(mConFd, mpCapCursorOff, strlen(mpCapCursorOff)); + +--- src/display/vgadev.cpp.gcc43 2008-07-15 14:10:33.000000000 +1000 ++++ src/display/vgadev.cpp 2008-07-15 14:10:57.000000000 +1000 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include "debug.h" + #include "vgadev.h" + #include "lrmi.h" diff --git a/zhcon-0.2.6-keyswitch.patch b/zhcon-0.2.6-keyswitch.patch new file mode 100644 index 0000000..b730afd --- /dev/null +++ b/zhcon-0.2.6-keyswitch.patch @@ -0,0 +1,49 @@ +--- ./src/zhcon.cpp.keyswitch 2008-07-14 16:17:53.000000000 +1000 ++++ ./src/zhcon.cpp 2008-07-14 16:20:16.000000000 +1000 +@@ -132,6 +132,10 @@ + //the InitXXX sequence is important,do not change + //unless you know what you are doing + InitTty(); ++ ++ /* Set to K_XLATE (ascii) */ ++ ioctl(0, KDSKBMODE, K_XLATE); ++ + // set blank line height, must before init font + InitGraphDev(f); + GraphMode(); +--- ./src/inputmanager.cpp.keyswitch 2008-07-14 16:14:10.000000000 +1000 ++++ ./src/inputmanager.cpp 2008-07-14 16:23:45.000000000 +1000 +@@ -101,9 +101,12 @@ + + struct timeval tv; + int rcved, shift; ++ bool ctrlShiftPressed=false; + + shift = GetShiftState(); +- if (shift != 0) { ++ if (shift ==5){ ++ /* Ctrl-Shift Pressed */ ++ ctrlShiftPressed=true; + //printf("Shift stat %d\r\n", s); + } + +@@ -120,7 +123,7 @@ + tv.tv_sec = 0; + tv.tv_usec = 100000; /* 0.1 sec */ + rcved = select(FD_SETSIZE, &mFdSet, NULL, NULL, &tv); +- if (rcved <= 0) ++ if (rcved <= 0 && !ctrlShiftPressed) + return; + + #ifdef HAVE_GPM_H +@@ -154,7 +157,9 @@ + mOutputRead = 0; + } + } +- } ++ }else if (ctrlShiftPressed){ ++ DoCtrlShift(); ++ } + + if (FD_ISSET(mTtyFd, &mFdSet)) { + mInputRead += read(mTtyFd, mInputBuf+mInputRead, BUFSIZE-mInputRead); diff --git a/zhcon-0.2.6-locale.patch b/zhcon-0.2.6-locale.patch new file mode 100644 index 0000000..6297667 --- /dev/null +++ b/zhcon-0.2.6-locale.patch @@ -0,0 +1,69 @@ +--- ./src/zhcon.h.locale 2008-07-14 11:14:23.000000000 +1000 ++++ ./src/zhcon.h 2008-07-14 11:08:09.000000000 +1000 +@@ -27,6 +27,10 @@ + #include + #include "global.h" + #include "cmdline.h" ++#define LOCALE_STR_UTF8 "utf8" ++#define LOCALE_STR_GB2312 "gb2312" ++#define LOCALE_STR_GBK "gbk" ++#define LOCALE_STR_BIG5 "big5" + + using namespace std; + +--- ./src/zhcon.cpp.locale 2008-07-14 11:21:29.000000000 +1000 ++++ ./src/zhcon.cpp 2008-07-14 11:37:28.000000000 +1000 +@@ -485,13 +485,13 @@ + f = new BaseFont(mGB2312Font, 16, 16); + h = new GBDecoder(); + } +- locale = "zh_CN.GB2312"; ++ locale = "zh_CN." LOCALE_STR_GB2312; + break; + case GBK: + assert(font == GBK); + f = new BaseFont(mGBKFont, 16, 16); + h = new GBKDecoder(); +- locale = "zh_CN.GBK"; ++ locale = "zh_CN." LOCALE_STR_GBK; + break; + case BIG5: + assert(font == GB2312 || font == BIG5); +@@ -502,7 +502,7 @@ + f = new BaseFont(mBIG5Font, 16, 16); + h = new BIG5Decoder(); + } +- locale = "zh_TW.Big5"; ++ locale = "zh_TW." LOCALE_STR_BIG5; + break; + case JIS: + assert(font == e); +@@ -647,22 +647,22 @@ + setenv("LC_ALL", "zh_CN.EUC", 1); + #else + if (mArgs.utf8_flag) +- setenv("LC_ALL", "zh_CN.UTF-8", 1); ++ setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); + else +- setenv("LC_ALL", "zh_CN.GB2312", 1); ++ setenv("LC_ALL", "zh_CN." LOCALE_STR_GB2312, 1); + #endif + mDefaultEncode = GB2312; + } else if (s == "gbk") { + if (mArgs.utf8_flag) +- setenv("LC_ALL", "zh_CN.UTF-8", 1); ++ setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); + else +- setenv("LC_ALL", "zh_CN.GBK", 1); ++ setenv("LC_ALL", "zh_CN." LOCALE_STR_GBK, 1); + mDefaultEncode = GBK; + } else if (s == "big5") { + if (mArgs.utf8_flag) +- setenv("LC_ALL", "zh_TW.UTF-8", 1); ++ setenv("LC_ALL", "zh_TW." LOCALE_STR_UTF8, 1); + else +- setenv("LC_ALL", "zh_TW.Big5", 1); ++ setenv("LC_ALL", "zh_TW." LOCALE_STR_BIG5, 1); + mDefaultEncode = BIG5; + } else if (s == "jis") { + //SetEncode(JIS,JIS); diff --git a/zhcon-0.2.6-path-define.patch b/zhcon-0.2.6-path-define.patch index 7fb129a..79395c4 100644 --- a/zhcon-0.2.6-path-define.patch +++ b/zhcon-0.2.6-path-define.patch @@ -1,5 +1,19 @@ ---- zhcon-0.2.5/configure.in.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/configure.in 2007-02-16 03:48:31.000000000 +0900 +--- ./doc/Makefile.am.path-define 2006-05-03 03:57:18.000000000 +1000 ++++ ./doc/Makefile.am 2008-07-15 10:48:01.000000000 +1000 +@@ -3,8 +3,8 @@ + EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz + + install-data-local: +- $(mkinstalldirs) $(mandir)/man1/ +- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ ++ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1 + + uninstall-local: +- -rm -f $(mandir)/man1/zhcon.1 ++ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1 +--- ./configure.in.path-define 2006-07-06 04:20:09.000000000 +1000 ++++ ./configure.in 2008-07-15 10:48:01.000000000 +1000 @@ -175,6 +175,16 @@ AC_CHECK_LIB(gpm,main,,usegpm="no") @@ -26,74 +40,61 @@ Config complete, now type make to build zhcon. Good Luck! ---- zhcon-0.2.5/font/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/font/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +--- ./font/Makefile.am.path-define 2006-04-25 02:39:04.000000000 +1000 ++++ ./font/Makefile.am 2008-07-15 10:48:01.000000000 +1000 @@ -1,8 +1,8 @@ EXTRA_DIST = *.bpsf install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ -- $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ +- $(mkinstalldirs) $(libdir)/zhcon/font/ +- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/ + $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/ + $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/ uninstall-local: -- -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf +- -rm -f $(libdir)/zhcon/font/*.bpsf + -rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf ---- zhcon-0.2.5/input/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/input/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +--- ./input/Makefile.am.path-define 2006-04-25 02:38:44.000000000 +1000 ++++ ./input/Makefile.am 2008-07-15 10:48:01.000000000 +1000 @@ -1,8 +1,8 @@ EXTRA_DIST = *.mb install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ -- $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ +- $(mkinstalldirs) $(libdir)/zhcon/input/ +- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/ + $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/ + $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/ uninstall-local: -- -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb +- -rm -f $(libdir)/zhcon/input/*.mb + -rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb ---- zhcon-0.2.5/src/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/src/Makefile.am 2007-02-16 03:47:08.000000000 +0900 -@@ -11,11 +11,11 @@ - chmod 4755 $(DESTDIR)$(bindir)/zhcon +--- ./src/zhcon.conf.path-define 2008-07-15 11:15:09.000000000 +1000 ++++ ./src/zhcon.conf 2008-07-15 11:16:36.000000000 +1000 +@@ -2,10 +2,10 @@ + #it can be named as ~/.zhconrc or /etc/zhcon.conf + #you can edit it manually - install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(prefix)/etc -- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf +-zhconpath = /usr/lib/zhcon/ ++zhconpath = /usr/share/zhcon/ - uninstall-local: -- -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf -+ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf + #unicon(3.x) path +-uniconpath = /usr/lib/unicon/ ++uniconpath = /usr/share/unicon/ - # set the include path found by configure - INCLUDES= $(all_includes) ---- zhcon-0.2.5/src/nativeinputserver.cpp.path_define 2006-04-25 01:38:27.000000000 +0900 -+++ zhcon-0.2.5/src/nativeinputserver.cpp 2007-02-16 03:47:08.000000000 +0900 -@@ -30,7 +30,7 @@ - #include "nativeinputserver.h" - #include "keymap.h" - --string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; -+string NativeInputServer::mDataPath = DATADIR"/zhcon/"; - - NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { - {'.', "¡£"} ---- zhcon-0.2.5/src/zhcon.cpp.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/src/zhcon.cpp 2007-02-16 03:47:08.000000000 +0900 -@@ -123,7 +123,7 @@ + #defaultencode: default encoding can be :gb2312,gbk,big5,jis,ksc + defaultencode = gb2312 +--- ./src/zhcon.cpp.path-define 2008-07-15 10:48:01.000000000 +1000 ++++ ./src/zhcon.cpp 2008-07-15 10:49:15.000000000 +1000 +@@ -123,7 +124,7 @@ string cfgfile = getenv("HOME"); cfgfile += "/.zhconrc"; if (access(cfgfile.c_str(), R_OK) != 0) -- cfgfile = PREFIX "/etc/zhcon.conf"; +- cfgfile = "/etc/zhcon.conf"; + cfgfile = SYSCONFDIR "/zhcon.conf"; //for debug,a pause enable us to attach zhcon's pid in gdb //char c;cin>>c; -@@ -621,7 +621,7 @@ +@@ -621,7 +628,7 @@ if (getenv("LC_ALL")) mOldLocale = getenv("LC_ALL"); @@ -102,7 +103,7 @@ mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT)); mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT)); mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT)); -@@ -752,10 +752,10 @@ +@@ -752,10 +759,10 @@ InputManager::SetTty(mConFd, ttyno, mTtyFd); string s; @@ -115,3 +116,35 @@ UniconInputServer::SetDataPath(s); #endif string sOverSpot, sNativeBar; +--- ./src/nativeinputserver.cpp.path-define 2006-04-25 02:38:27.000000000 +1000 ++++ ./src/nativeinputserver.cpp 2008-07-15 10:48:01.000000000 +1000 +@@ -30,7 +30,7 @@ + #include "nativeinputserver.h" + #include "keymap.h" + +-string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; ++string NativeInputServer::mDataPath = DATADIR"/zhcon/"; + + NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { + {'.', "¡£"} +--- ./src/Makefile.am.path-define 2006-05-03 03:12:41.000000000 +1000 ++++ ./src/Makefile.am 2008-07-15 10:48:01.000000000 +1000 +@@ -8,14 +8,14 @@ + SUBDIRS = display + + install-exec-local: +- chmod 4755 $(bindir)/zhcon ++ chmod 4755 $(DESTDIR)$(bindir)/zhcon + + install-data-local: +- $(mkinstalldirs) $(prefix)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf + + uninstall-local: +- -rm -f $(prefix)/etc/zhcon.conf ++ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf + + # set the include path found by configure + INCLUDES= $(all_includes) diff --git a/zhcon-0.2.6-path.patch b/zhcon-0.2.6-path.patch deleted file mode 100644 index 274417a..0000000 --- a/zhcon-0.2.6-path.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ru zhcon-0.2.5/doc/Makefile.am zhcon-0.2.6/doc/Makefile.am ---- zhcon-0.2.5/doc/Makefile.am 2006-05-03 01:57:18.000000000 +0800 -+++ zhcon-0.2.6/doc/Makefile.am 2007-02-12 17:46:12.000000000 +0800 -@@ -3,8 +3,8 @@ - EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz - - install-data-local: -- $(mkinstalldirs) $(mandir)/man1/ -- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1 -+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ -+ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1 - - uninstall-local: -- -rm -f $(mandir)/man1/zhcon.1 -+ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1 -diff -ru zhcon-0.2.5/font/Makefile.am zhcon-0.2.6/font/Makefile.am ---- zhcon-0.2.5/font/Makefile.am 2006-04-25 00:39:04.000000000 +0800 -+++ zhcon-0.2.6/font/Makefile.am 2007-02-12 17:47:32.000000000 +0800 -@@ -1,8 +1,8 @@ - EXTRA_DIST = *.bpsf - - install-data-local: -- $(mkinstalldirs) $(libdir)/zhcon/font/ -- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/ -+ $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ -+ $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ - - uninstall-local: -- -rm -f $(libdir)/zhcon/font/*.bpsf -+ -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf -diff -ru zhcon-0.2.5/input/Makefile.am zhcon-0.2.6/input/Makefile.am ---- zhcon-0.2.5/input/Makefile.am 2006-04-25 00:38:44.000000000 +0800 -+++ zhcon-0.2.6/input/Makefile.am 2007-02-12 17:48:22.000000000 +0800 -@@ -1,8 +1,8 @@ - EXTRA_DIST = *.mb - - install-data-local: -- $(mkinstalldirs) $(libdir)/zhcon/input/ -- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/ -+ $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ -+ $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ - - uninstall-local: -- -rm -f $(libdir)/zhcon/input/*.mb -+ -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb -diff -ru zhcon-0.2.5/src/Makefile.am zhcon-0.2.6/src/Makefile.am ---- zhcon-0.2.5/src/Makefile.am 2006-05-03 01:12:41.000000000 +0800 -+++ zhcon-0.2.6/src/Makefile.am 2007-02-12 17:45:59.000000000 +0800 -@@ -8,14 +8,14 @@ - SUBDIRS = display - - install-exec-local: -- chmod 4755 $(bindir)/zhcon -+ chmod 4755 $(DESTDIR)$(bindir)/zhcon - - install-data-local: -- $(mkinstalldirs) $(prefix)/etc -- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf -+ $(mkinstalldirs) $(DESTDIR)$(prefix)/etc -+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf - - uninstall-local: -- -rm -f $(prefix)/etc/zhcon.conf -+ -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf - - # set the include path found by configure - INCLUDES= $(all_includes) diff --git a/zhcon-0.2.6.gcc43.patch b/zhcon-0.2.6.gcc43.patch deleted file mode 100644 index dea7e6d..0000000 --- a/zhcon-0.2.6.gcc43.patch +++ /dev/null @@ -1,154 +0,0 @@ -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 -@@ -16,6 +16,7 @@ - * * - ***************************************************************************/ - -+#include - #include - #include - #include -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-03-03 14:10:32.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 -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 -@@ -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 - -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 -@@ -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 -Only in zhcon-0.2.5: stamp-h1 -Only in zhcon-0.2.5/tools: .deps -Only in zhcon-0.2.5/tools: Makefile diff --git a/zhcon.spec b/zhcon.spec index 88b0eaf..d1057fb 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -1,41 +1,52 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 8%{?dist} +Release: 9%{?dist} Group: Applications/System -License: GPL +License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5.tar.gz -Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz -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 +Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz +Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-4.1.diff.gz +Patch1: %{name}-%{version}-flags.patch +Patch2: %{name}-%{version}-path-define.patch +Patch3: %{name}-%{version}-gcc43.patch +Patch4: %{name}-%{version}-locale.patch +Patch5: %{name}-%{version}-keyswitch.patch +Summary: A fast Linux Console Chinese System that supports framebuffer +Summary(zh_CN): Zhcon æ˜¯ä¸€ä¸ªæ”¯æŒ Framebuffer çš„ Linux ä¸­æ—¥éŸ©æ–‡æŽ§åˆ¶å° +Summary(zh_TW): Zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer åŠå¤šå…§ç¢¼ Linux ä¸­æ—¥éŸ“æ–‡ä¸»æŽ§å° BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf automake Buildrequires: gettext-devel ncurses-devel gpm-devel +Requires: ncurses-libs + %description Zhcon is a fast Linux Console Chinese System which supports framebuffer device.It can display Chinese, Japanese or Korean -double byte characters.Supported language encodings include: -GB2312, GBK, BIG5, JIS and KSC. +double byte characters. Supported language encodings include: +UTF8, GB2312, GBK, BIG5, JIS and KSC. %description -l zh_CN -zhcon是一个工作在Linux控制å°ä¸‹çš„多内ç ä¸­æ–‡å¹³å°ã€‚ +zhcon æ˜¯ä¸€ä¸ªæ”¯æŒ Framebuffer çš„ Linux 中日韩文控制å°ã€‚ 它能够控制å°ä¸Šæ˜¾ç¤ºç®€ä½“中文ã€ç¹ä½“中文ã€æ—¥æ–‡ã€éŸ©æ–‡ ç­‰åŒå­—节字符。支æŒå¤šç§è¾“入法。 +现支æŒçš„有： UTF8, GB2312, GBK, BIG5, JIS åŠ KSC。 +%description -l zh_TW +zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer 與多内碼的 Linux 中日韓文主控å°ã€‚ +它能够在控制å°ä¸Šé¡¯ç¤ºç°¡é«”中文ã€ç¹é«”中文ã€æ—¥æ–‡ã€éŸ“æ–‡ +等雙ä½å…ƒçµ„字元。支æ´å¤šç§è¾“入法。 +ç¾æ”¯æ´çš„內碼有： UTF8, GB2312, GBK, BIG5, JIS åŠ KSC。 %prep -%setup -q -n zhcon-0.2.5 -%patch0 -p1 -b .0.26 -%patch1 -p1 -b .instpath -%patch2 -p1 -b .path_define -%patch3 -p1 -b .flags -%patch4 -p1 -b .64bit_fix -%patch5 -p1 -b .gcc43_fix +%setup -q +%patch0 -p1 -b .4-1 +%patch1 -p1 -b .flags +%patch2 -p0 -b .path-define +%patch3 -p0 -b .gcc43 +%patch4 -p0 -b .locale +%patch5 -p0 -b .keyswitch 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) @@ -67,6 +78,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-9 +- [Bug 454228] [zhcon] Cannot start input method for x86_64 user +- [Bug 449625] FTBFS zhcon-0.2.6-8.fc9 +- [Bug 441203] [zhcon] The input methods other than the default one were not changable for use + * Mon Mar 03 2008 Hu Zheng - 0.2.6-8 - i386 build fix. From ecece1837f3256e0159a6340906414b6bc6bf4b4 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 28 Jul 2008 05:25:56 +0000 Subject: [PATCH 14/52] Fedora<=8 dependency --- import.log | 1 + zhcon.spec | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/import.log b/import.log index f34c0f7..04960ac 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288 +zhcon-0_2_6-10_fc9:HEAD:zhcon-0.2.6-10.fc9.src.rpm:1217222754 diff --git a/zhcon.spec b/zhcon.spec index d1057fb..9d747dc 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: 9%{?dist} +Release: 10%{?dist} Group: Applications/System License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ @@ -15,11 +15,16 @@ Patch5: %{name}-%{version}-keyswitch.patch Summary: A fast Linux Console Chinese System that supports framebuffer Summary(zh_CN): Zhcon æ˜¯ä¸€ä¸ªæ”¯æŒ Framebuffer çš„ Linux ä¸­æ—¥éŸ©æ–‡æŽ§åˆ¶å° Summary(zh_TW): Zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer åŠå¤šå…§ç¢¼ Linux ä¸­æ—¥éŸ“æ–‡ä¸»æŽ§å° -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildrequires: autoconf automake -Buildrequires: gettext-devel ncurses-devel gpm-devel -Requires: ncurses-libs +%if 0%{?fedora} >= 9 +%define ncurse_libs_postfix -libs +%endif + + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf automake +BuildRequires: gettext-devel ncurses-devel gpm-devel +Requires: gpm ncurses%{!?ncurse_libs_postfix: } %description @@ -78,6 +83,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Mon Jul 15 2008 Ding-Yi Chen - 0.2.6-10 +- Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs. +- Add gpm as Required + * Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-9 - [Bug 454228] [zhcon] Cannot start input method for x86_64 user - [Bug 449625] FTBFS zhcon-0.2.6-8.fc9 From c17efec8a41d54f825ff756adf2df2fd891c056c Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Tue, 29 Jul 2008 09:53:27 +0000 Subject: [PATCH 15/52] add zhcon-0.2.6-processor-flags.patch to build on rawhide --- zhcon-0.2.6-processor-flags.patch | 21 +++++++++++++++++++++ zhcon.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 zhcon-0.2.6-processor-flags.patch diff --git a/zhcon-0.2.6-processor-flags.patch b/zhcon-0.2.6-processor-flags.patch new file mode 100644 index 0000000..1eafa75 --- /dev/null +++ b/zhcon-0.2.6-processor-flags.patch @@ -0,0 +1,21 @@ +diff -ru zhcon-0.2.6.orig/src/display/lrmi.c zhcon-0.2.6/src/display/lrmi.c +--- zhcon-0.2.6.orig/src/display/lrmi.c 2008-07-29 10:38:13.000000000 +0100 ++++ zhcon-0.2.6/src/display/lrmi.c 2008-07-29 10:39:51.000000000 +0100 +@@ -176,7 +176,7 @@ + } + + +-#define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) ++#define DEFAULT_VM86_FLAGS (X86_EFLAGS_IF | X86_EFLAGS_IOPL) + #define DEFAULT_STACK_SIZE 0x1000 + #define RETURN_TO_32_INT 255 + +@@ -790,7 +790,7 @@ + + context.vm.regs.cs = get_int_seg(v); + context.vm.regs.eip = get_int_off(v); +- context.vm.regs.eflags &= ~(VIF_MASK | TF_MASK); ++ context.vm.regs.eflags &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF); + + continue; + } diff --git a/zhcon.spec b/zhcon.spec index 9d747dc..7df77d5 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: 10%{?dist} +Release: 11%{?dist} Group: Applications/System License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ @@ -12,6 +12,7 @@ Patch2: %{name}-%{version}-path-define.patch Patch3: %{name}-%{version}-gcc43.patch Patch4: %{name}-%{version}-locale.patch Patch5: %{name}-%{version}-keyswitch.patch +Patch6: %{name}-%{version}-processor-flags.patch Summary: A fast Linux Console Chinese System that supports framebuffer Summary(zh_CN): Zhcon æ˜¯ä¸€ä¸ªæ”¯æŒ Framebuffer çš„ Linux ä¸­æ—¥éŸ©æ–‡æŽ§åˆ¶å° Summary(zh_TW): Zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer åŠå¤šå…§ç¢¼ Linux ä¸­æ—¥éŸ“æ–‡ä¸»æŽ§å° @@ -52,6 +53,7 @@ zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer 與多内碼的 Linux 中日韓文主控å°ã€‚ %patch3 -p0 -b .gcc43 %patch4 -p0 -b .locale %patch5 -p0 -b .keyswitch +%patch6 -p1 -b .processor-flags 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) @@ -83,6 +85,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Tue Jul 29 2008 Caolán McNamara - 0.2.6-11 +- add zhcon-0.2.6-processor-flags.patch to build on rawhide + * Mon Jul 15 2008 Ding-Yi Chen - 0.2.6-10 - Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs. - Add gpm as Required From 85cac5eebd406e3c2cf78d066beec415f43b7558 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 25 Nov 2008 02:14:18 +0000 Subject: [PATCH 16/52] Apply Debian patch --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- zhcon-0.2.6-gcc43.patch | 30 +++++++++---------------- zhcon-0.2.6-processor-flags.patch | 21 ------------------ zhcon-0.2.6-xf86int10.patch | 37 +++++++++++++++++++++++++++++++ zhcon.spec | 14 ++++++------ 7 files changed, 57 insertions(+), 50 deletions(-) delete mode 100644 zhcon-0.2.6-processor-flags.patch create mode 100644 zhcon-0.2.6-xf86int10.patch diff --git a/.cvsignore b/.cvsignore index 836cbe5..39c91d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -zhcon_0.2.6-4.1.diff.gz zhcon_0.2.6.orig.tar.gz +zhcon_0.2.6-5.2.diff.gz diff --git a/import.log b/import.log index 04960ac..6933c66 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288 zhcon-0_2_6-10_fc9:HEAD:zhcon-0.2.6-10.fc9.src.rpm:1217222754 +zhcon-0_2_6-11_fc9:HEAD:zhcon-0.2.6-11.fc9.src.rpm:1227579222 diff --git a/sources b/sources index 08051eb..c7351e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0357d334637fc2fecf042eb9043f8b69 zhcon_0.2.6-4.1.diff.gz 0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz +e7f30d5ecc493ff8e090192fda0116b5 zhcon_0.2.6-5.2.diff.gz diff --git a/zhcon-0.2.6-gcc43.patch b/zhcon-0.2.6-gcc43.patch index 5a348a7..cfcd9f1 100644 --- a/zhcon-0.2.6-gcc43.patch +++ b/zhcon-0.2.6-gcc43.patch @@ -214,17 +214,17 @@ diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c size_t insize = end-start; char* outptr = result; size_t outsize = length; -diff -up ./src/inputclient.cpp.gcc43 ./src/inputclient.cpp ---- ./src/inputclient.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 -+++ ./src/inputclient.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -16,6 +16,7 @@ - * * - ***************************************************************************/ +diff -up src/inputmanager.h.gcc43 src/inputmanager.h +--- src/inputmanager.h.gcc43 2008-11-21 17:18:50.000000000 +1000 ++++ src/inputmanager.h 2008-11-21 17:20:28.000000000 +1000 +@@ -27,6 +27,7 @@ using namespace std; + #include + #include + #include ++#include -+#include - #include "inputclient.h" - - Console* InputClient::mpCon = NULL; + #include "mouse.h" + #if defined(__FreeBSD__) diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp --- ./src/inputmanager.cpp.gcc43 2006-05-03 03:18:39.000000000 +1000 +++ ./src/inputmanager.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -236,16 +236,6 @@ diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp #include "global.h" #include "debug.h" ---- ./src/inputmanager.h.gcc43 2006-04-25 02:38:26.000000000 +1000 -+++ ./src/inputmanager.h 2008-07-15 12:31:16.000000000 +1000 -@@ -26,6 +26,7 @@ - using namespace std; - #include - #include -+#include - - #include "mouse.h" - #if defined(__FreeBSD__) --- ./src/nativeinputserver.h.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/nativeinputserver.h 2008-07-15 12:31:16.000000000 +1000 @@ -62,7 +62,7 @@ class NativeInputServer : public InputSe diff --git a/zhcon-0.2.6-processor-flags.patch b/zhcon-0.2.6-processor-flags.patch deleted file mode 100644 index 1eafa75..0000000 --- a/zhcon-0.2.6-processor-flags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru zhcon-0.2.6.orig/src/display/lrmi.c zhcon-0.2.6/src/display/lrmi.c ---- zhcon-0.2.6.orig/src/display/lrmi.c 2008-07-29 10:38:13.000000000 +0100 -+++ zhcon-0.2.6/src/display/lrmi.c 2008-07-29 10:39:51.000000000 +0100 -@@ -176,7 +176,7 @@ - } - - --#define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) -+#define DEFAULT_VM86_FLAGS (X86_EFLAGS_IF | X86_EFLAGS_IOPL) - #define DEFAULT_STACK_SIZE 0x1000 - #define RETURN_TO_32_INT 255 - -@@ -790,7 +790,7 @@ - - context.vm.regs.cs = get_int_seg(v); - context.vm.regs.eip = get_int_off(v); -- context.vm.regs.eflags &= ~(VIF_MASK | TF_MASK); -+ context.vm.regs.eflags &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF); - - continue; - } diff --git a/zhcon-0.2.6-xf86int10.patch b/zhcon-0.2.6-xf86int10.patch new file mode 100644 index 0000000..05094d8 --- /dev/null +++ b/zhcon-0.2.6-xf86int10.patch @@ -0,0 +1,37 @@ +diff -up ./src/display/lrmi.c.xf86int10 ./src/display/lrmi.c +--- ./src/display/lrmi.c.xf86int10 2006-04-25 02:38:23.000000000 +1000 ++++ ./src/display/lrmi.c 2008-11-24 17:01:19.000000000 +1000 +@@ -13,6 +13,15 @@ This software has NO WARRANTY. Use it a + #ifdef HAVE_CONFIG_H + #include + #endif ++#define X86_TF_MASK 0x00000100 ++#define X86_IF_MASK 0x00000200 ++#define X86_IOPL_MASK 0x00003000 ++#define X86_NT_MASK 0x00004000 ++#define X86_VM_MASK 0x00020000 ++#define X86_AC_MASK 0x00040000 ++#define X86_VIF_MASK 0x00080000 /* virtual interrupt flag */ ++#define X86_VIP_MASK 0x00100000 /* virtual interrupt pending */ ++#define X86_ID_MASK 0x00200000 + + #ifdef USING_VGA + #if defined(linux) +@@ -176,7 +185,7 @@ LRMI_free_real(void *m) + } + + +-#define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) ++#define DEFAULT_VM86_FLAGS (X86_IF_MASK | X86_IOPL_MASK) + #define DEFAULT_STACK_SIZE 0x1000 + #define RETURN_TO_32_INT 255 + +@@ -790,7 +799,7 @@ run_vm86(void) + + context.vm.regs.cs = get_int_seg(v); + context.vm.regs.eip = get_int_off(v); +- context.vm.regs.eflags &= ~(VIF_MASK | TF_MASK); ++ context.vm.regs.eflags &= ~(X86_VIF_MASK | X86_TF_MASK); + + continue; + } diff --git a/zhcon.spec b/zhcon.spec index 7df77d5..363d8f8 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -4,15 +4,15 @@ Version: 0.2.6 Release: 11%{?dist} Group: Applications/System License: GPLv2+ -URL: http://www.sourceforge.net/projects/%{name}/ +URL: http://zhcon.sourceforge.net/ Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz -Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-4.1.diff.gz +Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-5.2.diff.gz Patch1: %{name}-%{version}-flags.patch Patch2: %{name}-%{version}-path-define.patch Patch3: %{name}-%{version}-gcc43.patch Patch4: %{name}-%{version}-locale.patch Patch5: %{name}-%{version}-keyswitch.patch -Patch6: %{name}-%{version}-processor-flags.patch +Patch6: %{name}-%{version}-xf86int10.patch Summary: A fast Linux Console Chinese System that supports framebuffer Summary(zh_CN): Zhcon æ˜¯ä¸€ä¸ªæ”¯æŒ Framebuffer çš„ Linux ä¸­æ—¥éŸ©æ–‡æŽ§åˆ¶å° Summary(zh_TW): Zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer åŠå¤šå…§ç¢¼ Linux ä¸­æ—¥éŸ“æ–‡ä¸»æŽ§å° @@ -47,13 +47,13 @@ zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer 與多内碼的 Linux 中日韓文主控å°ã€‚ ç¾æ”¯æ´çš„內碼有： UTF8, GB2312, GBK, BIG5, JIS åŠ KSC。 %prep %setup -q -%patch0 -p1 -b .4-1 +%patch0 -p1 -b .5-2 %patch1 -p1 -b .flags %patch2 -p0 -b .path-define %patch3 -p0 -b .gcc43 %patch4 -p0 -b .locale %patch5 -p0 -b .keyswitch -%patch6 -p1 -b .processor-flags +%patch6 -p0 -b .xf86int10 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) @@ -85,8 +85,8 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog -* Tue Jul 29 2008 Caolán McNamara - 0.2.6-11 -- add zhcon-0.2.6-processor-flags.patch to build on rawhide +* Tue Nov 25 2008 Ding-Yi Chen - 0.2.6-11 +- Debian provide patch of zhcon_0.2.6-5.2.diff.gz * Mon Jul 15 2008 Ding-Yi Chen - 0.2.6-10 - Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs. From abb3f97a8b173dc6b68ba353b43c6e336f6e2e1c Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 25 Nov 2008 03:51:39 +0000 Subject: [PATCH 17/52] Apply Debian patch --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- zhcon.spec | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 39c91d4..3796e65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -zhcon_0.2.6.orig.tar.gz zhcon_0.2.6-5.2.diff.gz +zhcon_0.2.6.orig.tar.gz diff --git a/import.log b/import.log index 6933c66..1ee3587 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288 zhcon-0_2_6-10_fc9:HEAD:zhcon-0.2.6-10.fc9.src.rpm:1217222754 zhcon-0_2_6-11_fc9:HEAD:zhcon-0.2.6-11.fc9.src.rpm:1227579222 +zhcon-0_2_6-12_fc9:HEAD:zhcon-0.2.6-12.fc9.src.rpm:1227584988 diff --git a/sources b/sources index c7351e1..fa6badf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz e7f30d5ecc493ff8e090192fda0116b5 zhcon_0.2.6-5.2.diff.gz +0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz diff --git a/zhcon.spec b/zhcon.spec index 363d8f8..12ccfd4 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: 11%{?dist} +Release: 12%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -85,7 +85,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog -* Tue Nov 25 2008 Ding-Yi Chen - 0.2.6-11 +* Tue Nov 25 2008 Ding-Yi Chen - 0.2.6-12 - Debian provide patch of zhcon_0.2.6-5.2.diff.gz * Mon Jul 15 2008 Ding-Yi Chen - 0.2.6-10 From 5cdfdf4ab5260f17b7ddcb4ceba26da6f21b873e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:38:58 +0000 Subject: [PATCH 18/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 12ccfd4..9d4a579 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: 12%{?dist} +Release: 13%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -85,6 +85,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.2.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Nov 25 2008 Ding-Yi Chen - 0.2.6-12 - Debian provide patch of zhcon_0.2.6-5.2.diff.gz From 4a9d1d1504866d2e4964ddf9a5d5fed72573ce1b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 09:01:33 +0000 Subject: [PATCH 19/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 9d4a579..5c0e316 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: 13%{?dist} +Release: 14%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -85,6 +85,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.2.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 34676333b53f67c90a1b7cba0f6aaa44c54af708 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:19 +0000 Subject: [PATCH 20/52] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b22be96..4b97190 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zhcon -# $Id$ +# $Id: Makefile,v 1.1 2007/03/26 07:27:07 petersen Exp $ NAME := zhcon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8eac10d9acd1b11fd32f3a3145d628e682301836 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:51 +0000 Subject: [PATCH 21/52] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b22be96..4b97190 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zhcon -# $Id$ +# $Id: Makefile,v 1.1 2007/03/26 07:27:07 petersen Exp $ NAME := zhcon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 19ba2968bc765bb88ed0c048e16bdd0dbb7ffc1e Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 4 Jan 2010 05:54:42 +0000 Subject: [PATCH 22/52] Fixed Bug 539125 - FTBFS zhcon-0.2.6-14 --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- zhcon-0.2.6-gcc43.patch | 29 ----------------------------- zhcon.spec | 10 +++++++--- 5 files changed, 10 insertions(+), 34 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3796e65..4af4688 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -zhcon_0.2.6-5.2.diff.gz zhcon_0.2.6.orig.tar.gz +zhcon_0.2.6-6.diff.gz diff --git a/import.log b/import.log index 1ee3587..93c10dc 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288 zhcon-0_2_6-10_fc9:HEAD:zhcon-0.2.6-10.fc9.src.rpm:1217222754 zhcon-0_2_6-11_fc9:HEAD:zhcon-0.2.6-11.fc9.src.rpm:1227579222 zhcon-0_2_6-12_fc9:HEAD:zhcon-0.2.6-12.fc9.src.rpm:1227584988 +zhcon-0_2_6-15_fc12:HEAD:zhcon-0.2.6-15.fc12.src.rpm:1262584345 diff --git a/sources b/sources index fa6badf..2800500 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e7f30d5ecc493ff8e090192fda0116b5 zhcon_0.2.6-5.2.diff.gz 0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz +a1d07899e465df3e0c9c2d4fcd8a23b4 zhcon_0.2.6-6.diff.gz diff --git a/zhcon-0.2.6-gcc43.patch b/zhcon-0.2.6-gcc43.patch index cfcd9f1..9ff57d9 100644 --- a/zhcon-0.2.6-gcc43.patch +++ b/zhcon-0.2.6-gcc43.patch @@ -175,24 +175,6 @@ diff -up ./src/gbkdecoder.cpp.gcc43 ./src/gbkdecoder.cpp n += (c2 - 0x40); return n; } -diff -up ./src/graphdev.cpp.gcc43 ./src/graphdev.cpp ---- ./src/graphdev.cpp.gcc43 2006-04-25 02:38:26.000000000 +1000 -+++ ./src/graphdev.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -20,12 +20,14 @@ - #include - #endif - -+#include - #include - #include - #include - #include - #include - #include -+#include - #include "debug.h" - - #include "display/fbdev.h" diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c --- ./src/iconv_string.c.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/iconv_string.c 2008-07-15 12:31:16.000000000 +1000 @@ -225,17 +207,6 @@ diff -up src/inputmanager.h.gcc43 src/inputmanager.h #include "mouse.h" #if defined(__FreeBSD__) -diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp ---- ./src/inputmanager.cpp.gcc43 2006-05-03 03:18:39.000000000 +1000 -+++ ./src/inputmanager.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -24,6 +24,7 @@ using namespace std; - #include - #include - #include -+#include - - #include "global.h" - #include "debug.h" --- ./src/nativeinputserver.h.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/nativeinputserver.h 2008-07-15 12:31:16.000000000 +1000 @@ -62,7 +62,7 @@ class NativeInputServer : public InputSe diff --git a/zhcon.spec b/zhcon.spec index 5c0e316..cfaee63 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -1,12 +1,12 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 14%{?dist} +Release: 15%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz -Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-5.2.diff.gz +Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-6.diff.gz Patch1: %{name}-%{version}-flags.patch Patch2: %{name}-%{version}-path-define.patch Patch3: %{name}-%{version}-gcc43.patch @@ -47,7 +47,7 @@ zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer 與多内碼的 Linux 中日韓文主控å°ã€‚ ç¾æ”¯æ´çš„內碼有： UTF8, GB2312, GBK, BIG5, JIS åŠ KSC。 %prep %setup -q -%patch0 -p1 -b .5-2 +%patch0 -p1 -b .6-diff %patch1 -p1 -b .flags %patch2 -p0 -b .path-define %patch3 -p0 -b .gcc43 @@ -85,6 +85,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Mon Jan 04 2010 Ding-Yi Chen - 0.2.6-15 +- Applied Debian's zhcon_0.2.6-6.diff.gz patch. +- Fixed Bug 539125 - FTBFS zhcon-0.2.6-14.fc12 + * Mon Jul 27 2009 Fedora Release Engineering - 0.2.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From f5ffb03665dff558a84dc7828122b8016ec45f8e Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 4 Jan 2010 23:35:33 +0000 Subject: [PATCH 23/52] Fixed Bug 539125 - FTBFS --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4af4688..944997f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -zhcon_0.2.6.orig.tar.gz zhcon_0.2.6-6.diff.gz +zhcon_0.2.6.orig.tar.gz diff --git a/import.log b/import.log index 93c10dc..fcd589c 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ zhcon-0_2_6-10_fc9:HEAD:zhcon-0.2.6-10.fc9.src.rpm:1217222754 zhcon-0_2_6-11_fc9:HEAD:zhcon-0.2.6-11.fc9.src.rpm:1227579222 zhcon-0_2_6-12_fc9:HEAD:zhcon-0.2.6-12.fc9.src.rpm:1227584988 zhcon-0_2_6-15_fc12:HEAD:zhcon-0.2.6-15.fc12.src.rpm:1262584345 +zhcon-0_2_6-15_fc12:HEAD:zhcon-0.2.6-15.fc12.src.rpm:1262647897 diff --git a/sources b/sources index 2800500..6eb2e1a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz a1d07899e465df3e0c9c2d4fcd8a23b4 zhcon_0.2.6-6.diff.gz +0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz From ff5a8c80a5bd1be3905afdc6cfb2c74cc3383741 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:29:39 +0000 Subject: [PATCH 24/52] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 6 ------ 3 files changed, 27 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4b97190..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zhcon -# $Id: Makefile,v 1.1 2007/03/26 07:27:07 petersen Exp $ -NAME := zhcon -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index fcd589c..0000000 --- a/import.log +++ /dev/null @@ -1,6 +0,0 @@ -zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288 -zhcon-0_2_6-10_fc9:HEAD:zhcon-0.2.6-10.fc9.src.rpm:1217222754 -zhcon-0_2_6-11_fc9:HEAD:zhcon-0.2.6-11.fc9.src.rpm:1227579222 -zhcon-0_2_6-12_fc9:HEAD:zhcon-0.2.6-12.fc9.src.rpm:1227584988 -zhcon-0_2_6-15_fc12:HEAD:zhcon-0.2.6-15.fc12.src.rpm:1262584345 -zhcon-0_2_6-15_fc12:HEAD:zhcon-0.2.6-15.fc12.src.rpm:1262647897 From fb31f654eaf562c09c8f4cbb5755b9ae7a97163c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:29:42 +0000 Subject: [PATCH 25/52] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4b97190..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zhcon -# $Id: Makefile,v 1.1 2007/03/26 07:27:07 petersen Exp $ -NAME := zhcon -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6 From 67676889905159bc25e4453c8c0d80c8b9686f6c Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Fri, 19 Nov 2010 15:31:48 +1000 Subject: [PATCH 26/52] - Applied Debian's zhcon_0.2.6-6-1.diff.gz patch. - Remove input/big5-liu5.mb, as it may cause license issue. --- .gitignore | 2 ++ sources | 2 +- zhcon.spec | 10 ++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 944997f..dc2476e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ zhcon_0.2.6-6.diff.gz zhcon_0.2.6.orig.tar.gz +/zhcon_0.2.6-6.1.diff.gz +/zhcon_0.2.6.orig.tar.gz diff --git a/sources b/sources index 6eb2e1a..a0b2f05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a1d07899e465df3e0c9c2d4fcd8a23b4 zhcon_0.2.6-6.diff.gz +3d60dc62f734d32b909c6ef631729bbe zhcon_0.2.6-6.1.diff.gz 0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz diff --git a/zhcon.spec b/zhcon.spec index cfaee63..6ae7647 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -1,12 +1,12 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 15%{?dist} +Release: 16%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz -Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-6.diff.gz +Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-6.1.diff.gz Patch1: %{name}-%{version}-flags.patch Patch2: %{name}-%{version}-path-define.patch Patch3: %{name}-%{version}-gcc43.patch @@ -56,6 +56,8 @@ zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer 與多内碼的 Linux 中日韓文主控å°ã€‚ %patch6 -p0 -b .xf86int10 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) +# liu5 is a non-free input method +rm -f input/big5-liu5.mb %build # exit if bootstrap fails @@ -85,6 +87,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Fri Nov 19 2010 Ding-Yi Chen - 0.2.6-16 +- Applied Debian's zhcon_0.2.6-6-1.diff.gz patch. +- Remove input/big5-liu5.mb, as it may cause license issue. + * Mon Jan 04 2010 Ding-Yi Chen - 0.2.6-15 - Applied Debian's zhcon_0.2.6-6.diff.gz patch. - Fixed Bug 539125 - FTBFS zhcon-0.2.6-14.fc12 From bd673afea5024aa5b3cfa1ebc8a78206f5f92162 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 02:51:07 -0600 Subject: [PATCH 27/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 6ae7647..46f2ca5 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: 16%{?dist} +Release: 17%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -87,6 +87,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Nov 19 2010 Ding-Yi Chen - 0.2.6-16 - Applied Debian's zhcon_0.2.6-6-1.diff.gz patch. - Remove input/big5-liu5.mb, as it may cause license issue. From 51c950cb7833aa842f5cf9b386a2d1cce2ce749f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:36:26 -0600 Subject: [PATCH 28/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 46f2ca5..ac99523 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: 17%{?dist} +Release: 18%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -87,6 +87,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.2.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 0.2.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e5396a0d9d605a44f9b5940cd4e5fe7319e45dd5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 14:42:27 -0600 Subject: [PATCH 29/52] - Rebuilt for c++ ABI breakage --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index ac99523..f2962f5 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: 18%{?dist} +Release: 19%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -87,6 +87,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 0.2.6-19 +- Rebuilt for c++ ABI breakage + * Sat Jan 14 2012 Fedora Release Engineering - 0.2.6-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From d8d409e84d4d83b94ecde1b7ee1c0602b5c1efd1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 03:15:59 -0500 Subject: [PATCH 30/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index f2962f5..d5d5852 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: 19%{?dist} +Release: 20%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -87,6 +87,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.2.6-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Feb 28 2012 Fedora Release Engineering - 0.2.6-19 - Rebuilt for c++ ABI breakage From e4668f3c618f46013fcf91ad39981900739e35b2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:19:49 -0600 Subject: [PATCH 31/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index d5d5852..a5a3328 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: 20%{?dist} +Release: 21%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -87,6 +87,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.2.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0.2.6-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 2988ec7fd062cf144ad4548d724b0fb495ae751f Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 15 Apr 2013 14:11:39 +1000 Subject: [PATCH 32/52] Resolves Bug 926861 --- zhcon.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index a5a3328..401b8d4 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: 21%{?dist} +Release: 22%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -66,6 +66,7 @@ sed -i -e 's|set -x|set -e -x|' bootstrap touch config.rpath ./bootstrap +autoreconf -ivf %configure make %{?_smp_mflags} @@ -87,6 +88,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Mon Apr 15 2013 Ding-Yi Chen - 0.2.6-22 +- Resolves: Bug 926861 - zhcon: Does not support aarch64 in f19 and rawhide + * Fri Feb 15 2013 Fedora Release Engineering - 0.2.6-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 64b14e54b82cca75734bc4ed74ef266e8298bbd6 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 22 May 2013 13:26:23 +1000 Subject: [PATCH 33/52] Resolves: Bug 965518 - zhcon package should be built with PIE flags --- zhcon.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 401b8d4..9d4bfd8 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: 22%{?dist} +Release: 23%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -67,6 +67,8 @@ touch config.rpath ./bootstrap autoreconf -ivf +%global _hardened_build 1 + %configure make %{?_smp_mflags} @@ -88,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Wed May 22 2013 Ding-Yi Chen - 0.2.6-23 +- Resolves: Bug 965518 - zhcon package should be built with PIE flags + * Mon Apr 15 2013 Ding-Yi Chen - 0.2.6-22 - Resolves: Bug 926861 - zhcon: Does not support aarch64 in f19 and rawhide From 172c0df53659c5f6372777c26b278f82b81e2c3f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:51:20 -0500 Subject: [PATCH 34/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 9d4bfd8..7b28dd9 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: 23%{?dist} +Release: 24%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.2.6-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed May 22 2013 Ding-Yi Chen - 0.2.6-23 - Resolves: Bug 965518 - zhcon package should be built with PIE flags From b695a9d37b8e90986222d678e6b15ec8ea717a43 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:09:03 -0500 Subject: [PATCH 35/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 7b28dd9..7eb6d4b 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: 24%{?dist} +Release: 25%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.2.6-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0.2.6-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d0fb156f4bed2ac9e40e6ccdad3489e2f4ac26b2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:38:23 +0000 Subject: [PATCH 36/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 7eb6d4b..e43ec4a 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: 25%{?dist} +Release: 26%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.2.6-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.2.6-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 5ae0e7e39150ef0f6820441eb1d2371fb7962bea Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:52:39 +0200 Subject: [PATCH 37/52] Rebuilt for GCC 5 C++11 ABI change --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index e43ec4a..e1e6e3d 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: 26%{?dist} +Release: 27%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Sat May 02 2015 Kalev Lember - 0.2.6-27 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 0.2.6-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 4cee9c85485cb595ccd5bbb963446cae856e86e1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:46:58 +0000 Subject: [PATCH 38/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index e1e6e3d..9e6a745 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: 27%{?dist} +Release: 28%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.2.6-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 0.2.6-27 - Rebuilt for GCC 5 C++11 ABI change From c787aa6953d29996e4f063d9e0c97e61ed204219 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:06:16 +0000 Subject: [PATCH 39/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 9e6a745..a208e27 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: 28%{?dist} +Release: 29%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.2.6-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0.2.6-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 64b3149418b4ff77694b84adca8ac022c9672ff2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:24:09 +0000 Subject: [PATCH 40/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index a208e27..44641e9 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: 29%{?dist} +Release: 30%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.2.6-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0.2.6-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 8c223d2dbd67a36680b9feeadf7fc084f17fb64e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:42:36 +0000 Subject: [PATCH 41/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 44641e9..dfda447 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: 30%{?dist} +Release: 31%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.2.6-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.2.6-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 02f05d9c5e4a966b3104b89868f04ed7a043bd49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:10:53 +0000 Subject: [PATCH 42/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index dfda447..4d0a361 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: 31%{?dist} +Release: 32%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.2.6-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.2.6-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From cc8e2954b3ed4a1e2269421ed97591af5f5666a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:27:21 +0000 Subject: [PATCH 43/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 4d0a361..0338e4d 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: 32%{?dist} +Release: 33%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/%{name}/ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.2.6-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.2.6-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 6bdbb2bcf50560f722d4c0aea03214cfa54b2076 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:52:58 +0100 Subject: [PATCH 44/52] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- zhcon.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 0338e4d..5b6649f 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -22,7 +22,6 @@ Summary(zh_TW): Zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer åŠå¤šå…§ç¢¼ Linux 中日韓 %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake BuildRequires: gettext-devel ncurses-devel gpm-devel Requires: gpm ncurses%{!?ncurse_libs_postfix: } From 3563d0fb2dd480a310c97097a081ed4851b83b2f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:08:05 +0100 Subject: [PATCH 45/52] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- zhcon.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/zhcon.spec b/zhcon.spec index 5b6649f..a208e88 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -75,9 +75,6 @@ make %{?_smp_mflags} rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install -%clean -rm -rf ${RPM_BUILD_ROOT} - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html From cc3b14a9919fa97e54c59e16c0bd30388d70453d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 46/52] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- zhcon.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zhcon.spec b/zhcon.spec index a208e88..cded0e8 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -22,6 +22,7 @@ Summary(zh_TW): Zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer åŠå¤šå…§ç¢¼ Linux 中日韓 %endif +BuildRequires: gcc BuildRequires: autoconf automake BuildRequires: gettext-devel ncurses-devel gpm-devel Requires: gpm ncurses%{!?ncurse_libs_postfix: } From d3fd9c46cf3b846b84b53843e36d7dd81a142c5f Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:14:27 -0500 Subject: [PATCH 47/52] Remove needless use of %defattr --- zhcon.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index cded0e8..374eb73 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -77,7 +77,6 @@ rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html %lang(zh_CN) %doc doc/manual* doc/poem.gb doc/poem.gb.utf8 %lang(zh_TW) %doc doc/poem.big5 From 6925eeff76ced0f013deb46ee539e809054666c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:49:58 +0000 Subject: [PATCH 48/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 374eb73..f773489 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: 33%{?dist} +Release: 34%{?dist} Group: Applications/System License: GPLv2+ URL: http://zhcon.sourceforge.net/ @@ -86,6 +86,9 @@ make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install %{_datadir}/%{name}/ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.2.6-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.2.6-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6047ac6c5d02ded447ea9f056ef1387c2b1c019c Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Tue, 21 Aug 2018 14:26:12 +0530 Subject: [PATCH 49/52] Fix FTBFS(rh#1606790) --- zhcon.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/zhcon.spec b/zhcon.spec index f773489..5997d1d 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -1,8 +1,6 @@ Name: zhcon -Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 34%{?dist} -Group: Applications/System +Release: 35%{?dist} License: GPLv2+ URL: http://zhcon.sourceforge.net/ Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz @@ -22,7 +20,7 @@ Summary(zh_TW): Zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer åŠå¤šå…§ç¢¼ Linux 中日韓 %endif -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: autoconf automake BuildRequires: gettext-devel ncurses-devel gpm-devel Requires: gpm ncurses%{!?ncurse_libs_postfix: } @@ -45,6 +43,7 @@ zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer 與多内碼的 Linux 中日韓文主控å°ã€‚ 它能够在控制å°ä¸Šé¡¯ç¤ºç°¡é«”中文ã€ç¹é«”中文ã€æ—¥æ–‡ã€éŸ“æ–‡ 等雙ä½å…ƒçµ„字元。支æ´å¤šç§è¾“入法。 ç¾æ”¯æ´çš„內碼有： UTF8, GB2312, GBK, BIG5, JIS åŠ KSC。 + %prep %setup -q %patch0 -p1 -b .6-diff @@ -73,11 +72,11 @@ autoreconf -ivf make %{?_smp_mflags} %install -rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install %files -%doc AUTHORS ChangeLog COPYING README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html +%doc AUTHORS ChangeLog README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html +%license COPYING %lang(zh_CN) %doc doc/manual* doc/poem.gb doc/poem.gb.utf8 %lang(zh_TW) %doc doc/poem.big5 %{_mandir}/man1/* @@ -86,6 +85,9 @@ make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install %{_datadir}/%{name}/ %changelog +* Tue Aug 21 2018 Parag Nemade - 0.2.6-35 +- Fix FTBFS(rh#1606790) + * Sat Jul 14 2018 Fedora Release Engineering - 0.2.6-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -157,7 +159,7 @@ make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install * Tue Nov 25 2008 Ding-Yi Chen - 0.2.6-12 - Debian provide patch of zhcon_0.2.6-5.2.diff.gz -* Mon Jul 15 2008 Ding-Yi Chen - 0.2.6-10 +* Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-10 - Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs. - Add gpm as Required From 089f54e0288c75fb0e7fa4fc3e60ac2c3bf57bad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:10:32 +0000 Subject: [PATCH 50/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 5997d1d..692944f 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -1,6 +1,6 @@ Name: zhcon Version: 0.2.6 -Release: 35%{?dist} +Release: 36%{?dist} License: GPLv2+ URL: http://zhcon.sourceforge.net/ Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz @@ -85,6 +85,9 @@ make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install %{_datadir}/%{name}/ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.2.6-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Aug 21 2018 Parag Nemade - 0.2.6-35 - Fix FTBFS(rh#1606790) From b2ded47d83839237db5a6f12d6650550240cb49e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:59:43 +0000 Subject: [PATCH 51/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zhcon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zhcon.spec b/zhcon.spec index 692944f..236eba6 100644 --- a/zhcon.spec +++ b/zhcon.spec @@ -1,6 +1,6 @@ Name: zhcon Version: 0.2.6 -Release: 36%{?dist} +Release: 37%{?dist} License: GPLv2+ URL: http://zhcon.sourceforge.net/ Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz @@ -85,6 +85,9 @@ make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install %{_datadir}/%{name}/ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.2.6-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.2.6-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d76f852be53eb6eadb131e13adca82ebd85cf788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 16 Sep 2019 11:21:18 +0200 Subject: [PATCH 52/52] Orphaned for 6+ weeks --- .gitignore | 4 - dead.package | 1 + sources | 2 - zhcon-0.2.6-flags.patch | 14 -- zhcon-0.2.6-gcc43.patch | 288 ---------------------------------- zhcon-0.2.6-keyswitch.patch | 49 ------ zhcon-0.2.6-locale.patch | 69 -------- zhcon-0.2.6-path-define.patch | 150 ------------------ zhcon-0.2.6-xf86int10.patch | 37 ----- zhcon.spec | 207 ------------------------ 10 files changed, 1 insertion(+), 820 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 zhcon-0.2.6-flags.patch delete mode 100644 zhcon-0.2.6-gcc43.patch delete mode 100644 zhcon-0.2.6-keyswitch.patch delete mode 100644 zhcon-0.2.6-locale.patch delete mode 100644 zhcon-0.2.6-path-define.patch delete mode 100644 zhcon-0.2.6-xf86int10.patch delete mode 100644 zhcon.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index dc2476e..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -zhcon_0.2.6-6.diff.gz -zhcon_0.2.6.orig.tar.gz -/zhcon_0.2.6-6.1.diff.gz -/zhcon_0.2.6.orig.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index a0b2f05..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -3d60dc62f734d32b909c6ef631729bbe zhcon_0.2.6-6.1.diff.gz -0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz diff --git a/zhcon-0.2.6-flags.patch b/zhcon-0.2.6-flags.patch deleted file mode 100644 index 75c593c..0000000 --- a/zhcon-0.2.6-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zhcon-0.2.6/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 -+++ zhcon-0.2.6/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 -@@ -9,11 +9,6 @@ - #getbpsf_LDADD = -L/usr/X11R6/lib -lX11 - #getbpsf_CPPFLAGS = -I/usr/X11R6/include - --LDFLAGS= --CXXFLAGS= --CCFLAGS= --LIBS= -- - EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\ - gpm-1.19.6-patched.tar.gz - diff --git a/zhcon-0.2.6-gcc43.patch b/zhcon-0.2.6-gcc43.patch deleted file mode 100644 index 9ff57d9..0000000 --- a/zhcon-0.2.6-gcc43.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -up ./src/basefont.cpp.gcc43 ./src/basefont.cpp ---- ./src/basefont.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 -+++ ./src/basefont.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include "global.h" - #include "debug.h" - #include "hzdecoder.h" -diff -up ./src/big5decoder.cpp.gcc43 ./src/big5decoder.cpp ---- ./src/big5decoder.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 -+++ ./src/big5decoder.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -27,7 +27,8 @@ bool BIG5Decoder::IsCode1(char c) { - } - - bool BIG5Decoder::IsCode2(char c) { -- return c >= 40 && c <= 0xff; -+// return c >= 40 && c <= 0xff; -+ return c>=40; - } - - unsigned int BIG5Decoder::Index(char c1, char c2) { -diff -up ./src/display/fblinear16.cpp.gcc43 ./src/display/fblinear16.cpp ---- ./src/display/fblinear16.cpp.gcc43 2006-04-25 02:38:24.000000000 +1000 -+++ ./src/display/fblinear16.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -86,7 +86,8 @@ void FBLinear16::RevRect(int x1,int y1,i - for(; height--; dest += mNextLine) { - dest32 = (__u32*)dest; - for (cnt = width/2; cnt--;) { -- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); -+ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); -+ dest32++; - } - if (width & 1) { - dest16 = (__u16*)dest32; -diff -up ./src/display/fblinear24.cpp.gcc43 ./src/display/fblinear24.cpp ---- ./src/display/fblinear24.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 -+++ ./src/display/fblinear24.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -136,19 +136,25 @@ void FBLinear24::RevRect(int x1,int y1,i - for(; height--; dest += mNextLine) { - dest32 = (__u32*)dest; - for (cnt = width/4; cnt--;) { -- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); -- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); -- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); -+ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); -+ dest32++; -+ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); -+ dest32++; -+ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); -+ dest32++; - } - if (width & 2) { -- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); -+ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); -+ dest32++; - dest16 = (__u16*)dest32; -- fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); -+ fb_writew(fb_readw(dest16) ^ 0xffff, dest16); -+ dest16++; - dest32 = (__u32*)dest16; - } - if (width & 1) { - dest16 = (__u16*)dest32; -- fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); -+ fb_writew(fb_readw(dest16) ^ 0xffff, dest16); -+ dest16++; - dest8 = (__u8*)dest16; - fb_writeb(fb_readb(dest8) ^ 0xff, dest8); - } -diff -up ./src/display/fblinear32.cpp.gcc43 ./src/display/fblinear32.cpp ---- ./src/display/fblinear32.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 -+++ ./src/display/fblinear32.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -74,7 +74,8 @@ void FBLinear32::RevRect(int x1,int y1,i - for(; height--; dest += mNextLine) { - dest32 = (__u32*)dest; - for (cnt = width; cnt--;) { -- fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); -+ fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); -+ dest32++; - } - } - } -diff -up ./src/display/fblinear4.cpp.gcc43 ./src/display/fblinear4.cpp ---- ./src/display/fblinear4.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 -+++ ./src/display/fblinear4.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include "global.h" - #include "fblinear4.h" - -diff -up ./src/display/fblinear8.cpp.gcc43 ./src/display/fblinear8.cpp ---- ./src/display/fblinear8.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 -+++ ./src/display/fblinear8.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include "global.h" - #include "fblinear8.h" - -@@ -63,11 +64,13 @@ void FBLinear8::RevRect(int x1,int y1,in - for(; height--; dest += mNextLine) { - dest32 = (__u32*)dest; - for (cnt = width/4; cnt--;) { -- fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32++); -+ fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32); -+ dest32++; - } - if (width & 2) { - dest16 = (__u16*)dest32; -- fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16++); -+ fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16); -+ dest16++; - dest32 = (__u32*)dest16; - } - if (width & 1) { -diff -up ./src/display/fbvgaplanes.cpp.gcc43 ./src/display/fbvgaplanes.cpp ---- ./src/display/fbvgaplanes.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 -+++ ./src/display/fbvgaplanes.cpp 2008-07-15 12:53:18.000000000 +1000 -@@ -22,6 +22,7 @@ - #ifdef USING_VGA - #include - #include -+#include - #include "debug.h" - #include "fbvgaplanes.h" - -diff -up ./src/encfilter.c.gcc43 ./src/encfilter.c ---- ./src/encfilter.c.gcc43 2006-04-29 05:09:33.000000000 +1000 -+++ ./src/encfilter.c 2008-07-15 12:31:16.000000000 +1000 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "encfilter.h" - -@@ -46,7 +47,9 @@ - #error ICONV_CONST not defined - #endif /* ICONV_CONST */ - --#define BUFSIZ 8192 -+#ifndef BUFSIZ -+# define BUFSIZ 8192 -+#endif - int UseEncodingFilter; /* use filter such as UTF-8 */ - char EncodingFilterBuff[BUFSIZ]; /* global buffer used by ConsoleHandler() and TextCopy() */ - size_t EncodingFilterLen; -diff -up ./src/gbkdecoder.cpp.gcc43 ./src/gbkdecoder.cpp ---- ./src/gbkdecoder.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 -+++ ./src/gbkdecoder.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -27,13 +27,15 @@ bool GBKDecoder::IsCode1(char c) { - } - - bool GBKDecoder::IsCode2(char c) { -- return c >= 0x40 && c <= 0xff; -+// return c >= 0x40 && c <= 0xff; -+ return c>=0x40; - } - - unsigned int GBKDecoder::Index(char c1, char c2) { - int n; - n = (c1 - 0x81) * 192; -- if (c2 <= 0xff && c2 >= 0x40) -+ // if (c2 <= 0xff && c2 >= 0x40) -+ if (c2 >= 0x40) - n += (c2 - 0x40); - return n; - } -diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c ---- ./src/iconv_string.c.gcc43 2006-04-25 02:38:27.000000000 +1000 -+++ ./src/iconv_string.c 2008-07-15 12:31:16.000000000 +1000 -@@ -69,7 +69,7 @@ int iconv_string (const char* tocode, co - { - size_t count = 0; - char tmpbuf[tmpbufsize]; -- const char* inptr = start; -+ char* inptr = (char *) start; - size_t insize = end-start; - while (insize > 0) { - char* outptr = tmpbuf; -@@ -121,7 +121,7 @@ int iconv_string (const char* tocode, co - iconv(cd,NULL,NULL,NULL,NULL); /* return to the initial state */ - /* Do the conversion for real. */ - { -- const char* inptr = start; -+ char* inptr = (char *) start; - size_t insize = end-start; - char* outptr = result; - size_t outsize = length; -diff -up src/inputmanager.h.gcc43 src/inputmanager.h ---- src/inputmanager.h.gcc43 2008-11-21 17:18:50.000000000 +1000 -+++ src/inputmanager.h 2008-11-21 17:20:28.000000000 +1000 -@@ -27,6 +27,7 @@ using namespace std; - #include - #include - #include -+#include - - #include "mouse.h" - #if defined(__FreeBSD__) ---- ./src/nativeinputserver.h.gcc43 2006-04-25 02:38:26.000000000 +1000 -+++ ./src/nativeinputserver.h 2008-07-15 12:31:16.000000000 +1000 -@@ -62,7 +62,7 @@ class NativeInputServer : public InputSe - bool mAutoSelectUnique; - static struct Symbol { - char mKey; -- char *mpSymbol; -+ const char *mpSymbol; - } - mFullSymbolTable[]; - static char mFullCharTable[]; ---- ./src/window.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 -+++ ./src/window.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -20,6 +20,8 @@ - #include - #include - #include -+#include -+#include - #include "global.h" - #include "debug.h" - #include "window.h" ---- ./src/winime.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 -+++ ./src/winime.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -47,7 +47,7 @@ mCandilistBufLen(0) - throw (runtime_error("can not get gbfont size!")); - - mBufSize = st.st_size; -- mpBuf = (char *) mmap(0, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); -+ mpBuf = (char *) mmap(NULL, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); - if (mpBuf == MAP_FAILED) - throw (runtime_error("mmap failed!")); - -@@ -163,7 +163,8 @@ int WinIme::MatchWord(char *p, int len, - count--; - break; - } -- AddCandilist(t,(unsigned int&)buflen); -+ unsigned int buflength=buflen; -+ AddCandilist(t,(unsigned int&)buflength); - } //search next word - else { - if (len == 1) //special for first char ---- ./src/zhcon.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 -+++ ./src/zhcon.cpp 2008-07-15 12:31:16.000000000 +1000 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #if defined(linux) -@@ -452,9 +457,11 @@ void Zhcon::InitTty() { - return; - } - char *pCap = mCapBuf; -- mpCapClearScr = tgetstr("cl", &pCap); -- mpCapCursorOff = tgetstr("vi", &pCap); -- mpCapCursorOn = tgetstr("ve", &pCap); -+ char ids[][3]={"cl","vi","ve"}; -+ -+ mpCapClearScr = tgetstr(ids[0], &pCap); -+ mpCapCursorOff = tgetstr(ids[1], &pCap); -+ mpCapCursorOn = tgetstr(ids[2], &pCap); - - if (mpCapClearScr) write(mConFd, mpCapClearScr, strlen(mpCapClearScr)); - if (mpCapCursorOff) write(mConFd, mpCapCursorOff, strlen(mpCapCursorOff)); - ---- src/display/vgadev.cpp.gcc43 2008-07-15 14:10:33.000000000 +1000 -+++ src/display/vgadev.cpp 2008-07-15 14:10:57.000000000 +1000 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include "debug.h" - #include "vgadev.h" - #include "lrmi.h" diff --git a/zhcon-0.2.6-keyswitch.patch b/zhcon-0.2.6-keyswitch.patch deleted file mode 100644 index b730afd..0000000 --- a/zhcon-0.2.6-keyswitch.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- ./src/zhcon.cpp.keyswitch 2008-07-14 16:17:53.000000000 +1000 -+++ ./src/zhcon.cpp 2008-07-14 16:20:16.000000000 +1000 -@@ -132,6 +132,10 @@ - //the InitXXX sequence is important,do not change - //unless you know what you are doing - InitTty(); -+ -+ /* Set to K_XLATE (ascii) */ -+ ioctl(0, KDSKBMODE, K_XLATE); -+ - // set blank line height, must before init font - InitGraphDev(f); - GraphMode(); ---- ./src/inputmanager.cpp.keyswitch 2008-07-14 16:14:10.000000000 +1000 -+++ ./src/inputmanager.cpp 2008-07-14 16:23:45.000000000 +1000 -@@ -101,9 +101,12 @@ - - struct timeval tv; - int rcved, shift; -+ bool ctrlShiftPressed=false; - - shift = GetShiftState(); -- if (shift != 0) { -+ if (shift ==5){ -+ /* Ctrl-Shift Pressed */ -+ ctrlShiftPressed=true; - //printf("Shift stat %d\r\n", s); - } - -@@ -120,7 +123,7 @@ - tv.tv_sec = 0; - tv.tv_usec = 100000; /* 0.1 sec */ - rcved = select(FD_SETSIZE, &mFdSet, NULL, NULL, &tv); -- if (rcved <= 0) -+ if (rcved <= 0 && !ctrlShiftPressed) - return; - - #ifdef HAVE_GPM_H -@@ -154,7 +157,9 @@ - mOutputRead = 0; - } - } -- } -+ }else if (ctrlShiftPressed){ -+ DoCtrlShift(); -+ } - - if (FD_ISSET(mTtyFd, &mFdSet)) { - mInputRead += read(mTtyFd, mInputBuf+mInputRead, BUFSIZE-mInputRead); diff --git a/zhcon-0.2.6-locale.patch b/zhcon-0.2.6-locale.patch deleted file mode 100644 index 6297667..0000000 --- a/zhcon-0.2.6-locale.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- ./src/zhcon.h.locale 2008-07-14 11:14:23.000000000 +1000 -+++ ./src/zhcon.h 2008-07-14 11:08:09.000000000 +1000 -@@ -27,6 +27,10 @@ - #include - #include "global.h" - #include "cmdline.h" -+#define LOCALE_STR_UTF8 "utf8" -+#define LOCALE_STR_GB2312 "gb2312" -+#define LOCALE_STR_GBK "gbk" -+#define LOCALE_STR_BIG5 "big5" - - using namespace std; - ---- ./src/zhcon.cpp.locale 2008-07-14 11:21:29.000000000 +1000 -+++ ./src/zhcon.cpp 2008-07-14 11:37:28.000000000 +1000 -@@ -485,13 +485,13 @@ - f = new BaseFont(mGB2312Font, 16, 16); - h = new GBDecoder(); - } -- locale = "zh_CN.GB2312"; -+ locale = "zh_CN." LOCALE_STR_GB2312; - break; - case GBK: - assert(font == GBK); - f = new BaseFont(mGBKFont, 16, 16); - h = new GBKDecoder(); -- locale = "zh_CN.GBK"; -+ locale = "zh_CN." LOCALE_STR_GBK; - break; - case BIG5: - assert(font == GB2312 || font == BIG5); -@@ -502,7 +502,7 @@ - f = new BaseFont(mBIG5Font, 16, 16); - h = new BIG5Decoder(); - } -- locale = "zh_TW.Big5"; -+ locale = "zh_TW." LOCALE_STR_BIG5; - break; - case JIS: - assert(font == e); -@@ -647,22 +647,22 @@ - setenv("LC_ALL", "zh_CN.EUC", 1); - #else - if (mArgs.utf8_flag) -- setenv("LC_ALL", "zh_CN.UTF-8", 1); -+ setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); - else -- setenv("LC_ALL", "zh_CN.GB2312", 1); -+ setenv("LC_ALL", "zh_CN." LOCALE_STR_GB2312, 1); - #endif - mDefaultEncode = GB2312; - } else if (s == "gbk") { - if (mArgs.utf8_flag) -- setenv("LC_ALL", "zh_CN.UTF-8", 1); -+ setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); - else -- setenv("LC_ALL", "zh_CN.GBK", 1); -+ setenv("LC_ALL", "zh_CN." LOCALE_STR_GBK, 1); - mDefaultEncode = GBK; - } else if (s == "big5") { - if (mArgs.utf8_flag) -- setenv("LC_ALL", "zh_TW.UTF-8", 1); -+ setenv("LC_ALL", "zh_TW." LOCALE_STR_UTF8, 1); - else -- setenv("LC_ALL", "zh_TW.Big5", 1); -+ setenv("LC_ALL", "zh_TW." LOCALE_STR_BIG5, 1); - mDefaultEncode = BIG5; - } else if (s == "jis") { - //SetEncode(JIS,JIS); diff --git a/zhcon-0.2.6-path-define.patch b/zhcon-0.2.6-path-define.patch deleted file mode 100644 index 79395c4..0000000 --- a/zhcon-0.2.6-path-define.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- ./doc/Makefile.am.path-define 2006-05-03 03:57:18.000000000 +1000 -+++ ./doc/Makefile.am 2008-07-15 10:48:01.000000000 +1000 -@@ -3,8 +3,8 @@ - EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz - - install-data-local: -- $(mkinstalldirs) $(mandir)/man1/ -- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1 -+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ -+ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1 - - uninstall-local: -- -rm -f $(mandir)/man1/zhcon.1 -+ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1 ---- ./configure.in.path-define 2006-07-06 04:20:09.000000000 +1000 -+++ ./configure.in 2008-07-15 10:48:01.000000000 +1000 -@@ -175,6 +175,16 @@ - AC_CHECK_LIB(gpm,main,,usegpm="no") - - dnl----------------------------------------------------------------------- -+dnl Fedora specific fix -+dnl----------------------------------------------------------------------- -+CFLAGS="$CFLAGS -DDATADIR=\\\"$datadir\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\"" -+CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\"" -+ -+eval DATADIR=${datadir} -+eval DATADIR=$DATADIR -+AC_SUBST(DATADIR) -+ -+dnl----------------------------------------------------------------------- - dnl Checks for libggi - dnl----------------------------------------------------------------------- - useggi="yes" -@@ -208,7 +218,7 @@ - libggi support: ${useggi} - unicon support: ${useunicon} - zhcon binary dir: `eval "echo \`eval \"echo ${bindir}\"\`"` -- zhcon files dir: `eval "echo \`eval \"echo ${libdir}/${PACKAGE}\"\`"` -+ zhcon files dir: `eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"` - - Config complete, now type make to build zhcon. - Good Luck! ---- ./font/Makefile.am.path-define 2006-04-25 02:39:04.000000000 +1000 -+++ ./font/Makefile.am 2008-07-15 10:48:01.000000000 +1000 -@@ -1,8 +1,8 @@ - EXTRA_DIST = *.bpsf - - install-data-local: -- $(mkinstalldirs) $(libdir)/zhcon/font/ -- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/ -+ $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/ -+ $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/ - - uninstall-local: -- -rm -f $(libdir)/zhcon/font/*.bpsf -+ -rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf ---- ./input/Makefile.am.path-define 2006-04-25 02:38:44.000000000 +1000 -+++ ./input/Makefile.am 2008-07-15 10:48:01.000000000 +1000 -@@ -1,8 +1,8 @@ - EXTRA_DIST = *.mb - - install-data-local: -- $(mkinstalldirs) $(libdir)/zhcon/input/ -- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/ -+ $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/ -+ $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/ - - uninstall-local: -- -rm -f $(libdir)/zhcon/input/*.mb -+ -rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb ---- ./src/zhcon.conf.path-define 2008-07-15 11:15:09.000000000 +1000 -+++ ./src/zhcon.conf 2008-07-15 11:16:36.000000000 +1000 -@@ -2,10 +2,10 @@ - #it can be named as ~/.zhconrc or /etc/zhcon.conf - #you can edit it manually - --zhconpath = /usr/lib/zhcon/ -+zhconpath = /usr/share/zhcon/ - - #unicon(3.x) path --uniconpath = /usr/lib/unicon/ -+uniconpath = /usr/share/unicon/ - - #defaultencode: default encoding can be :gb2312,gbk,big5,jis,ksc - defaultencode = gb2312 ---- ./src/zhcon.cpp.path-define 2008-07-15 10:48:01.000000000 +1000 -+++ ./src/zhcon.cpp 2008-07-15 10:49:15.000000000 +1000 -@@ -123,7 +124,7 @@ - string cfgfile = getenv("HOME"); - cfgfile += "/.zhconrc"; - if (access(cfgfile.c_str(), R_OK) != 0) -- cfgfile = "/etc/zhcon.conf"; -+ cfgfile = SYSCONFDIR "/zhcon.conf"; - - //for debug,a pause enable us to attach zhcon's pid in gdb - //char c;cin>>c; -@@ -621,7 +628,7 @@ - if (getenv("LC_ALL")) - mOldLocale = getenv("LC_ALL"); - -- string prefix = PREFIX"/lib/zhcon/"; -+ string prefix = DATADIR "/zhcon/"; - mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT)); - mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT)); - mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT)); -@@ -752,10 +759,10 @@ - InputManager::SetTty(mConFd, ttyno, mTtyFd); - - string s; -- s = f.GetOption(string("zhconpath"), string(PREFIX"/lib/zhcon/")); -+ s = f.GetOption(string("zhconpath"), string(DATADIR "/zhcon/")); - NativeInputServer::SetDataPath(s); - #ifdef HAVE_UNICON_LIB -- s = f.GetOption(string("uniconpath"), string("/usr/lib/unicon/")); -+ s = f.GetOption(string("uniconpath"), string(DATADIR "/unicon/")); - UniconInputServer::SetDataPath(s); - #endif - string sOverSpot, sNativeBar; ---- ./src/nativeinputserver.cpp.path-define 2006-04-25 02:38:27.000000000 +1000 -+++ ./src/nativeinputserver.cpp 2008-07-15 10:48:01.000000000 +1000 -@@ -30,7 +30,7 @@ - #include "nativeinputserver.h" - #include "keymap.h" - --string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; -+string NativeInputServer::mDataPath = DATADIR"/zhcon/"; - - NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { - {'.', "¡£"} ---- ./src/Makefile.am.path-define 2006-05-03 03:12:41.000000000 +1000 -+++ ./src/Makefile.am 2008-07-15 10:48:01.000000000 +1000 -@@ -8,14 +8,14 @@ - SUBDIRS = display - - install-exec-local: -- chmod 4755 $(bindir)/zhcon -+ chmod 4755 $(DESTDIR)$(bindir)/zhcon - - install-data-local: -- $(mkinstalldirs) $(prefix)/etc -- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf - - uninstall-local: -- -rm -f $(prefix)/etc/zhcon.conf -+ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf - - # set the include path found by configure - INCLUDES= $(all_includes) diff --git a/zhcon-0.2.6-xf86int10.patch b/zhcon-0.2.6-xf86int10.patch deleted file mode 100644 index 05094d8..0000000 --- a/zhcon-0.2.6-xf86int10.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up ./src/display/lrmi.c.xf86int10 ./src/display/lrmi.c ---- ./src/display/lrmi.c.xf86int10 2006-04-25 02:38:23.000000000 +1000 -+++ ./src/display/lrmi.c 2008-11-24 17:01:19.000000000 +1000 -@@ -13,6 +13,15 @@ This software has NO WARRANTY. Use it a - #ifdef HAVE_CONFIG_H - #include - #endif -+#define X86_TF_MASK 0x00000100 -+#define X86_IF_MASK 0x00000200 -+#define X86_IOPL_MASK 0x00003000 -+#define X86_NT_MASK 0x00004000 -+#define X86_VM_MASK 0x00020000 -+#define X86_AC_MASK 0x00040000 -+#define X86_VIF_MASK 0x00080000 /* virtual interrupt flag */ -+#define X86_VIP_MASK 0x00100000 /* virtual interrupt pending */ -+#define X86_ID_MASK 0x00200000 - - #ifdef USING_VGA - #if defined(linux) -@@ -176,7 +185,7 @@ LRMI_free_real(void *m) - } - - --#define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) -+#define DEFAULT_VM86_FLAGS (X86_IF_MASK | X86_IOPL_MASK) - #define DEFAULT_STACK_SIZE 0x1000 - #define RETURN_TO_32_INT 255 - -@@ -790,7 +799,7 @@ run_vm86(void) - - context.vm.regs.cs = get_int_seg(v); - context.vm.regs.eip = get_int_off(v); -- context.vm.regs.eflags &= ~(VIF_MASK | TF_MASK); -+ context.vm.regs.eflags &= ~(X86_VIF_MASK | X86_TF_MASK); - - continue; - } diff --git a/zhcon.spec b/zhcon.spec deleted file mode 100644 index 236eba6..0000000 --- a/zhcon.spec +++ /dev/null @@ -1,207 +0,0 @@ -Name: zhcon -Version: 0.2.6 -Release: 37%{?dist} -License: GPLv2+ -URL: http://zhcon.sourceforge.net/ -Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz -Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-6.1.diff.gz -Patch1: %{name}-%{version}-flags.patch -Patch2: %{name}-%{version}-path-define.patch -Patch3: %{name}-%{version}-gcc43.patch -Patch4: %{name}-%{version}-locale.patch -Patch5: %{name}-%{version}-keyswitch.patch -Patch6: %{name}-%{version}-xf86int10.patch -Summary: A fast Linux Console Chinese System that supports framebuffer -Summary(zh_CN): Zhcon æ˜¯ä¸€ä¸ªæ”¯æŒ Framebuffer çš„ Linux ä¸­æ—¥éŸ©æ–‡æŽ§åˆ¶å° -Summary(zh_TW): Zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer åŠå¤šå…§ç¢¼ Linux ä¸­æ—¥éŸ“æ–‡ä¸»æŽ§å° - -%if 0%{?fedora} >= 9 -%define ncurse_libs_postfix -libs -%endif - - -BuildRequires: gcc-c++ -BuildRequires: autoconf automake -BuildRequires: gettext-devel ncurses-devel gpm-devel -Requires: gpm ncurses%{!?ncurse_libs_postfix: } - - -%description -Zhcon is a fast Linux Console Chinese System which supports -framebuffer device.It can display Chinese, Japanese or Korean -double byte characters. Supported language encodings include: -UTF8, GB2312, GBK, BIG5, JIS and KSC. - -%description -l zh_CN -zhcon æ˜¯ä¸€ä¸ªæ”¯æŒ Framebuffer çš„ Linux 中日韩文控制å°ã€‚ -它能够控制å°ä¸Šæ˜¾ç¤ºç®€ä½“中文ã€ç¹ä½“中文ã€æ—¥æ–‡ã€éŸ©æ–‡ -ç­‰åŒå­—节字符。支æŒå¤šç§è¾“入法。 -现支æŒçš„有： UTF8, GB2312, GBK, BIG5, JIS åŠ KSC。 - -%description -l zh_TW -zhcon æ˜¯ä¸€å€‹æ”¯æ´ Framebuffer 與多内碼的 Linux 中日韓文主控å°ã€‚ -它能够在控制å°ä¸Šé¡¯ç¤ºç°¡é«”中文ã€ç¹é«”中文ã€æ—¥æ–‡ã€éŸ“æ–‡ -等雙ä½å…ƒçµ„字元。支æ´å¤šç§è¾“入法。 -ç¾æ”¯æ´çš„內碼有： UTF8, GB2312, GBK, BIG5, JIS åŠ KSC。 - -%prep -%setup -q -%patch0 -p1 -b .6-diff -%patch1 -p1 -b .flags -%patch2 -p0 -b .path-define -%patch3 -p0 -b .gcc43 -%patch4 -p0 -b .locale -%patch5 -p0 -b .keyswitch -%patch6 -p0 -b .xf86int10 -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) -# liu5 is a non-free input method -rm -f input/big5-liu5.mb - -%build -# exit if bootstrap fails -# missing config.rpath causes automake failure -sed -i -e 's|set -x|set -e -x|' bootstrap -touch config.rpath - -./bootstrap -autoreconf -ivf -%global _hardened_build 1 - -%configure -make %{?_smp_mflags} - -%install -make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install - -%files -%doc AUTHORS ChangeLog README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html -%license COPYING -%lang(zh_CN) %doc doc/manual* doc/poem.gb doc/poem.gb.utf8 -%lang(zh_TW) %doc doc/poem.big5 -%{_mandir}/man1/* -%config(noreplace) %{_sysconfdir}/%{name}.conf -%attr(4755,root,root) %{_bindir}/%{name} -%{_datadir}/%{name}/ - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 0.2.6-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.2.6-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Aug 21 2018 Parag Nemade - 0.2.6-35 -- Fix FTBFS(rh#1606790) - -* Sat Jul 14 2018 Fedora Release Engineering - 0.2.6-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.2.6-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.2.6-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.2.6-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.2.6-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.2.6-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.2.6-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.2.6-27 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 0.2.6-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.2.6-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.2.6-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed May 22 2013 Ding-Yi Chen - 0.2.6-23 -- Resolves: Bug 965518 - zhcon package should be built with PIE flags - -* Mon Apr 15 2013 Ding-Yi Chen - 0.2.6-22 -- Resolves: Bug 926861 - zhcon: Does not support aarch64 in f19 and rawhide - -* Fri Feb 15 2013 Fedora Release Engineering - 0.2.6-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.2.6-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 0.2.6-19 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 0.2.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 0.2.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Nov 19 2010 Ding-Yi Chen - 0.2.6-16 -- Applied Debian's zhcon_0.2.6-6-1.diff.gz patch. -- Remove input/big5-liu5.mb, as it may cause license issue. - -* Mon Jan 04 2010 Ding-Yi Chen - 0.2.6-15 -- Applied Debian's zhcon_0.2.6-6.diff.gz patch. -- Fixed Bug 539125 - FTBFS zhcon-0.2.6-14.fc12 - -* Mon Jul 27 2009 Fedora Release Engineering - 0.2.6-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.2.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Nov 25 2008 Ding-Yi Chen - 0.2.6-12 -- Debian provide patch of zhcon_0.2.6-5.2.diff.gz - -* Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-10 -- Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs. -- Add gpm as Required - -* Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-9 -- [Bug 454228] [zhcon] Cannot start input method for x86_64 user -- [Bug 449625] FTBFS zhcon-0.2.6-8.fc9 -- [Bug 441203] [zhcon] The input methods other than the default one were not changable for use - -* Mon Mar 03 2008 Hu Zheng - 0.2.6-8 -- i386 build fix. - -* 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 - -* Thu Mar 29 2007 Hu Zheng - 0.2.6-5 -- Fix x86_64 compile error. - -* Tue Feb 27 2007 Hu Zheng - 0.2.6-3 -- Update for review. - -* Thu Feb 15 2007 Mamoru Tasaka - 0.2.6-2.1 -- Add source URL -- Check if bootstrap exited with success -- Change the directory of %%{name}.conf -- Move all files in %%{_libdir} to %%{_datadir} (no libraries is - found) -- Add BR gpm-devel -- Pass optflags correctly -- Keep timestamps - -* Thu Feb 15 2007 Hu Zheng - 0.2.6-2 -- Fix spec file. - -* Mon Feb 12 2007 Hu Zheng - 0.2.6-1 -- Initial build for Fedora Extra -