[gentoo-commits] gentoo-x86 commit in app-i18n/zhcon/files: zhcon-0.2.5.make-fix.patch zhcon-0.2.6-curses.patch zhcon-0.2.6+linux-headers-2.6.26.patch zhcon-0.2.6-amd64.patch

[Diego Petteno (flameeyes)]

flameeyes    08/10/25 11:29:36

  Modified:             zhcon-0.2.5.make-fix.patch
  Added:                zhcon-0.2.6-curses.patch
                        zhcon-0.2.6+linux-headers-2.6.26.patch
                        zhcon-0.2.6-amd64.patch
  Log:
  Add patches by Zhang Le for fixing bug #240024 (fix curses/gpm search, fix amd64, fix building with new linux-headers).
  (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)

Revision  Changes    Path
1.2                  app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch?r1=1.1&r2=1.2

Index: zhcon-0.2.5.make-fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zhcon-0.2.5.make-fix.patch	22 Oct 2006 20:49:17 -0000	1.1
+++ zhcon-0.2.5.make-fix.patch	25 Oct 2008 11:29:36 -0000	1.2
@@ -13,24 +13,6 @@
  uninstall-local:
 -	-rm -f $(mandir)/man1/zhcon.1
 +	-rm -f $(DESTDIR)$(mandir)/man1/zhcon.1
-diff -Nur zhcon-0.2.5.orig/doc/Makefile.in zhcon-0.2.5/doc/Makefile.in
---- zhcon-0.2.5.orig/doc/Makefile.in	2006-06-21 18:02:23.000000000 +0800
-+++ zhcon-0.2.5/doc/Makefile.in	2006-06-21 18:13:30.000000000 +0800
-@@ -326,11 +326,11 @@
- 
- 
- 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
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
 diff -Nur zhcon-0.2.5.orig/font/Makefile.am zhcon-0.2.5/font/Makefile.am
 --- zhcon-0.2.5.orig/font/Makefile.am	2006-06-21 18:02:23.000000000 +0800
 +++ zhcon-0.2.5/font/Makefile.am	2006-06-21 18:14:30.000000000 +0800
@@ -46,24 +28,6 @@
  uninstall-local:
 -	-rm -f $(libdir)/zhcon/font/*.bpsf
 +	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
-diff -Nur zhcon-0.2.5.orig/font/Makefile.in zhcon-0.2.5/font/Makefile.in
---- zhcon-0.2.5.orig/font/Makefile.in	2006-06-21 18:02:23.000000000 +0800
-+++ zhcon-0.2.5/font/Makefile.in	2006-06-21 18:15:02.000000000 +0800
-@@ -321,11 +321,11 @@
- 
- 
- 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
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
 diff -Nur zhcon-0.2.5.orig/input/Makefile.am zhcon-0.2.5/input/Makefile.am
 --- zhcon-0.2.5.orig/input/Makefile.am	2006-06-21 18:02:23.000000000 +0800
 +++ zhcon-0.2.5/input/Makefile.am	2006-06-21 18:15:35.000000000 +0800
@@ -79,24 +43,6 @@
  uninstall-local:
 -	-rm -f $(libdir)/zhcon/input/*.mb
 +	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
-diff -Nur zhcon-0.2.5.orig/input/Makefile.in zhcon-0.2.5/input/Makefile.in
---- zhcon-0.2.5.orig/input/Makefile.in	2006-06-21 18:02:23.000000000 +0800
-+++ zhcon-0.2.5/input/Makefile.in	2006-06-21 18:16:02.000000000 +0800
-@@ -321,11 +321,11 @@
- 
- 
- 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
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
 diff -Nur zhcon-0.2.5.orig/src/Makefile.am zhcon-0.2.5/src/Makefile.am
 --- zhcon-0.2.5.orig/src/Makefile.am	2006-06-21 18:02:23.000000000 +0800
 +++ zhcon-0.2.5/src/Makefile.am	2006-06-22 08:35:42.000000000 +0800
@@ -119,25 +65,3 @@
  
  # set the include path found by configure
  INCLUDES= $(all_includes)
-diff -Nur zhcon-0.2.5.orig/src/Makefile.in zhcon-0.2.5/src/Makefile.in
---- zhcon-0.2.5.orig/src/Makefile.in	2006-06-21 18:02:23.000000000 +0800
-+++ zhcon-0.2.5/src/Makefile.in	2006-06-22 08:36:05.000000000 +0800
-@@ -602,14 +602,14 @@
- 
- 
- 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)/etc
-+	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
- 
- uninstall-local:
--	-rm -f $(prefix)/etc/zhcon.conf
-+	-rm -f $(DESTDIR)/etc/zhcon.conf
- 
- # the library search path.
- #zhcon_LDFLAGS = $(all_libraries) -L/usr/lib/unicon 



1.1                  app-i18n/zhcon/files/zhcon-0.2.6-curses.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch?rev=1.1&content-type=text/plain

Index: zhcon-0.2.6-curses.patch
===================================================================
diff --git a/configure.in b/configure.in
index 63172e4..6c2afcc 100644
--- a/configure.in
+++ b/configure.in
@@ -132,7 +132,7 @@ fi
 AC_SUBST(ZHCON_LOCALE_DIR)
 
 AC_CHECK_LIB(util, forkpty)
-AC_CHECK_LIB(curses, main)
+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
 
 dnl for freebsd
 dnl AC_CHECK_LIB(c, i386_set_ioperm)
@@ -172,7 +172,7 @@ dnl Checks for gpm
 dnl-----------------------------------------------------------------------
 usegpm="yes"
 AC_CHECK_HEADERS(gpm.h,,usegpm="no")
-AC_CHECK_LIB(gpm,main,,usegpm="no")
+AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
 
 dnl-----------------------------------------------------------------------
 dnl Checks for libggi



1.1                  app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch?rev=1.1&content-type=text/plain

Index: zhcon-0.2.6+linux-headers-2.6.26.patch
===================================================================
diff --git a/src/display/lrmi.c b/src/display/lrmi.c
index 85c6fe6..5c74260 100644
--- a/src/display/lrmi.c
+++ b/src/display/lrmi.c
@@ -33,6 +33,13 @@ This software has NO WARRANTY.  Use it at your own risk.
 
 #include "lrmi.h"
 
+#if defined(__linux__) && !defined(TF_MASK)
+	#define TF_MASK X86_EFLAGS_TF
+	#define IF_MASK X86_EFLAGS_IF
+	#define VIF_MASK X86_EFLAGS_VIF
+	#define IOPL_MASK X86_EFLAGS_IOPL
+#endif
+
 #define REAL_MEM_BASE 	((void *)0x10000)
 #define REAL_MEM_SIZE 	0x10000
 #define REAL_MEM_BLOCKS 	0x100



1.1                  app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch?rev=1.1&content-type=text/plain

Index: zhcon-0.2.6-amd64.patch
===================================================================
diff --git a/src/winime.cpp b/src/winime.cpp
index 0c52393..85729a3 100644
--- a/src/winime.cpp
+++ b/src/winime.cpp
@@ -56,10 +56,10 @@ mCandilistBufLen(0)
 
     memcpy(&mHead, mpBuf, sizeof(mHead));
     int len = strlen(mHead.mCodeSet);
-    mpIndex1 = (char **) (mpBuf + sizeof(mHead));
-    mpIndex2 = (char **) (mpBuf + sizeof(mHead) + len * sizeof(char *));
-    mpText = mpBuf + sizeof(mHead) + len * sizeof(char *) +
-                len * len * sizeof(char *);
+    mpIndex1 = (int *) (mpBuf + sizeof(mHead));
+    mpIndex2 = (int *) (mpBuf + sizeof(mHead) + len * sizeof(int));
+    mpText = mpBuf + sizeof(mHead) + len * sizeof(int) +
+                len * len * sizeof(int);
 }
 
 WinIme::~WinIme() {
@@ -246,32 +246,33 @@ int WinIme::Search(char c) {
             //                p = *t;
         }
         else
-            p = mpIndex1[Index(c)];
+            p = (char *)mpIndex1[Index(c)];
 
         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);
         if (c == mHead.mWildChar) {
             char **t;
             t =
-                find_if(mpIndex2 + Index(mInput[0]) * l,
-                        mpIndex2 + (Index(mInput[0]) + 1) * l,
+                find_if((char **)(mpIndex2 + Index(mInput[0]) * l),
+                        (char **)(mpIndex2 + (Index(mInput[0]) + 1) * l),
                         bind2nd(not_equal_to < char *>(),
                                 (char *) 0xffffffff));
-            if (t == mpIndex2 + (Index(mInput[0]) + 1) * l)
+            if (t == ((char **)mpIndex2) + (Index(mInput[0]) + 1) * l)
                 p = (char *) 0xffffffff;
             else
                 p = *t;
-        } else
-            p = mpIndex2[Index(mInput[0]) * l + Index(c)];
+        } else {
+            int dd =  Index(mInput[0]) * l + Index(c);
+            p = (char *)(mpIndex2[Index(mInput[0]) * l + Index(c)]);
+        }
 
         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 --git a/src/winime.h b/src/winime.h
index c2f51ab..816a270 100644
--- a/src/winime.h
+++ b/src/winime.h
@@ -83,8 +83,8 @@ class WinIme {
         char* mpOffset[12];
         int mFd;
         char* mpBuf;
-        char** mpIndex1;
-        char** mpIndex2;
+        int *mpIndex1;
+        int *mpIndex2;
         char* mpText;
         char* mpCur;                  //current search position
         unsigned int mBufSize;