diff options
| author | Jaka Kranjc | 2007-01-29 18:35:24 +0100 |
|---|---|---|
| committer | Jaka Kranjc | 2007-01-29 21:31:47 +0100 |
| commit | 66d92e9278fbbb9e55b3fe80f631ff9f7699ad78 (patch) | |
| tree | 8dcb3aa871e7770712afa3c2d7ba698b9ce88410 | |
| parent | 725d1511fdbf53318de17c350f085858cb10f9a7 (diff) | |
zhcon: update fixes #11064
| -rwxr-xr-x | shell-term-fm/zhcon/BUILD | 7 | ||||
| -rwxr-xr-x | shell-term-fm/zhcon/DETAILS | 7 | ||||
| -rw-r--r-- | shell-term-fm/zhcon/HISTORY | 7 | ||||
| -rw-r--r-- | shell-term-fm/zhcon/gcc-3.3.patch | 22 | ||||
| -rw-r--r-- | shell-term-fm/zhcon/zhcon-smglcompat.patch | 6 |
5 files changed, 15 insertions, 34 deletions
diff --git a/shell-term-fm/zhcon/BUILD b/shell-term-fm/zhcon/BUILD index 4d06e0a5da..a8a045b48d 100755 --- a/shell-term-fm/zhcon/BUILD +++ b/shell-term-fm/zhcon/BUILD @@ -1,5 +1,2 @@ - patch -p0 < ${SCRIPT_DIRECTORY}/zhcon-smglcompat.patch && - patch -p0 < ${SCRIPT_DIRECTORY}/gcc-3.3.patch && - - ./configure --prefix=/usr && - make +patch -p0 < $SCRIPT_DIRECTORY/zhcon-smglcompat.patch && +default_build diff --git a/shell-term-fm/zhcon/DETAILS b/shell-term-fm/zhcon/DETAILS index 5e78f91178..5f4275c164 100755 --- a/shell-term-fm/zhcon/DETAILS +++ b/shell-term-fm/zhcon/DETAILS @@ -1,13 +1,12 @@ SPELL=zhcon - VERSION=0.2.3 + VERSION=0.2.5 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE - WEB_SITE=http://zhcon.gnuchina.org/ - SOURCE_HASH=sha512:9c2fd6a5947167ee8de378db326328cea47ceb89aecc1ec370ca8fc224538540e72ea7007646ae1f1fd0a015f665996b3981c621564b256299fb5808811ad709 + WEB_SITE=http://zhcon.sourceforge.net/ + SOURCE_HASH=sha512:35f1517b649e5afe3156eb1aa7735f3d3a988fad08c433b8f343df6ba3fdef89493afe61488a76059e4bfa1db4455d21d0bde7041bab37eb50e5ab0b622218fa LICENSE[0]=GPL ENTERED=20021012 - UPDATED=20030506 KEYWORDS="console" SHORT="A fast CJK frambuffer console" cat << EOF diff --git a/shell-term-fm/zhcon/HISTORY b/shell-term-fm/zhcon/HISTORY index d8bc6c7a25..c22e750d84 100644 --- a/shell-term-fm/zhcon/HISTORY +++ b/shell-term-fm/zhcon/HISTORY @@ -1,3 +1,10 @@ +2007-01-29 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * zhcon-smglcompat.patch: updated + * gcc3*.patch: removed + * BUILD: removed patch; use default_build + * DETAILS: updated spell to 0.2.5, fixes #11064 + fixed WEB_SITE + 2006-06-28 Eric Sandall <eric@sandall.us> * DETAILS: Removed BUILD_API=2, set grimoire-wide diff --git a/shell-term-fm/zhcon/gcc-3.3.patch b/shell-term-fm/zhcon/gcc-3.3.patch deleted file mode 100644 index 1f67352daf..0000000000 --- a/shell-term-fm/zhcon/gcc-3.3.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -uprN src.old/inputclient.h src/inputclient.h ---- src.old/inputclient.h 2003-09-20 21:41:59.219052200 -0700 -+++ src/inputclient.h 2003-09-20 21:42:09.611472312 -0700 -@@ -19,6 +19,7 @@ - #ifndef INPUTCLIENT_H - #define INPUTCLIENT_H - -+#include <assert.h> - #include <string> - #include "console.h" - -diff -uprN src.old/mouse.cpp src/mouse.cpp ---- src.old/mouse.cpp 2003-09-20 21:41:59.220052048 -0700 -+++ src/mouse.cpp 2003-09-20 21:42:18.347144288 -0700 -@@ -19,6 +19,7 @@ - #include "debug.h" - #include "mouse.h" - #include <sys/signal.h> -+#include <assert.h> - - #if defined(__FreeBSD__) - Mouse* Mouse::pMouse = NULL; diff --git a/shell-term-fm/zhcon/zhcon-smglcompat.patch b/shell-term-fm/zhcon/zhcon-smglcompat.patch index 06e867d3f5..6268d56018 100644 --- a/shell-term-fm/zhcon/zhcon-smglcompat.patch +++ b/shell-term-fm/zhcon/zhcon-smglcompat.patch @@ -8,6 +8,6 @@ diff -Naur /tmp/zhcon-0.2.1/src/zhcon.cpp src/zhcon.cpp - strncmp("/dev/vc/", TtyName, 8) == 0)) { + strncmp("/dev/vc/", TtyName, 8) == 0|| + strncmp("/devices/vc/", TtyName, 12) == 0)) { - printf("%s is not real tty or vc. Please exit current tty and try again.\r\n", TtyName); - exit(1); - } + fprintf(stderr, "warning!!!\n"); + fprintf(stderr, "%s is not real tty or vc, are your running under X-Window?\n", TtyName); + #ifndef HAVE_GGI_LIB |