[Chinese-commits] [zhcon] 01/01: Imported Debian patch 1:0.2.6-10
Anthony Fok
foka at debian.org
Thu Nov 19 07:46:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
foka pushed a commit to branch master
in repository zhcon.
commit 028ea93bdfebf78bdda17705a6f2ec9629f75267
Author: Aron Xu <aron at debian.org>
Date: Thu Jul 5 10:13:44 2012 +0800
Imported Debian patch 1:0.2.6-10
---
debian/changelog | 6 ++
debian/control | 2 +-
debian/patches/0006-enable-build-platforms.patch | 71 +++++++-----------------
3 files changed, 28 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c3c2dd7..27a2eb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zhcon (1:0.2.6-10) unstable; urgency=low
+
+ * Drop libggi support (Closes: #680238).
+
+ -- Aron Xu <aron at debian.org> Thu, 05 Jul 2012 10:13:44 +0800
+
zhcon (1:0.2.6-9) unstable; urgency=low
* Now build on kfreebsd.
diff --git a/debian/control b/debian/control
index 66a0bb6..817abbf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Chinese Team <chinese-developers at lists.alioth.debian.org>
Uploaders: Aron Xu <aron at debian.org>
Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, chrpath, libncurses5-dev,
- libggi2-dev (>= 1:2.2.1-4), libpth-dev, unicon-imc2,
+ bison, libpth-dev, unicon-imc2,
libgpm-dev [linux-any], libbsd-dev [kfreebsd-any]
Standards-Version: 3.9.3
Vcs-Git: git://anonscm.debian.org/chinese/zhcon.git
diff --git a/debian/patches/0006-enable-build-platforms.patch b/debian/patches/0006-enable-build-platforms.patch
index dff51b7..ee212a5 100644
--- a/debian/patches/0006-enable-build-platforms.patch
+++ b/debian/patches/0006-enable-build-platforms.patch
@@ -19,11 +19,9 @@ Subject: [PATCH] enable build platforms
src/zhcon.cpp | 22 ++++++++++++++--------
14 files changed, 55 insertions(+), 37 deletions(-)
-diff --git a/configure.in b/configure.in
-index c6b9b11..b3ff38d 100644
--- a/configure.in
+++ b/configure.in
-@@ -28,7 +28,7 @@ case "$host" in
+@@ -28,7 +28,7 @@
*-*-linux*)
echo "Linux detected"
ZHCON_ARCH="Linux";;
@@ -32,11 +30,9 @@ index c6b9b11..b3ff38d 100644
echo "FreeBsd detected"
ZHCON_ARCH="FreeBSD"
dnl gcc 2.95 on freebsd does not search /usr/local/include
-diff --git a/src/console.cpp b/src/console.cpp
-index 9ad4a48..ae57837 100644
--- a/src/console.cpp
+++ b/src/console.cpp
-@@ -1090,7 +1090,7 @@ void Console::SelClear() {
+@@ -1090,7 +1090,7 @@
// User settable table: what characters are to be considered alphabetic?
// 256 bits
@@ -45,8 +41,6 @@ index 9ad4a48..ae57837 100644
0x00000000, // control chars
0x03FF0000, // digits
0x87FFFFFE, // uppercase and '_'
-diff --git a/src/console.h b/src/console.h
-index cee787e..aa56976 100644
--- a/src/console.h
+++ b/src/console.h
@@ -22,6 +22,7 @@
@@ -57,7 +51,7 @@ index cee787e..aa56976 100644
#include "global.h"
#include "basefont.h"
#include "window.h"
-@@ -143,7 +144,7 @@ class Console : public Window {
+@@ -143,7 +144,7 @@
void SelHighlight(const int begin, const int end);
void SelPointer(const int offset);
int InWord(const unsigned char c);
@@ -66,8 +60,6 @@ index cee787e..aa56976 100644
int AtColEdge(const int p);
int mSelStart; // cleared by clear_selection
-diff --git a/src/display/fbdev.h b/src/display/fbdev.h
-index 347cbf7..96ed19b 100644
--- a/src/display/fbdev.h
+++ b/src/display/fbdev.h
@@ -20,6 +20,13 @@
@@ -84,8 +76,6 @@ index 347cbf7..96ed19b 100644
#include "basefont.h"
#include "graphdev.h"
-diff --git a/src/display/fbvgaplanes.cpp b/src/display/fbvgaplanes.cpp
-index 5647852..f50721e 100644
--- a/src/display/fbvgaplanes.cpp
+++ b/src/display/fbvgaplanes.cpp
@@ -28,7 +28,7 @@
@@ -97,7 +87,7 @@ index 5647852..f50721e 100644
#include <machine/sysarch.h>
static inline void outb(char value, unsigned short port)
{
-@@ -58,7 +58,7 @@ static inline void outb(char value, unsigned short port)
+@@ -58,7 +58,7 @@
#define mb() __asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory")
#define rmb() mb()
#define wmb() __asm__ __volatile__ ("": : :"memory")
@@ -106,7 +96,7 @@ index 5647852..f50721e 100644
#define mb()
#define rmb()
#define wmb()
-@@ -130,9 +130,12 @@ FBVgaPlanes::FBVgaPlanes() {
+@@ -130,9 +130,12 @@
#if defined(linux)
ioperm(GRAPHICS_ADDR_REG, 1, 1);
ioperm(GRAPHICS_DATA_REG, 1, 1);
@@ -120,7 +110,7 @@ index 5647852..f50721e 100644
#endif
SetDefaultMode();
}
-@@ -141,9 +144,12 @@ FBVgaPlanes::~FBVgaPlanes() {
+@@ -141,9 +144,12 @@
#if defined(linux)
ioperm(GRAPHICS_ADDR_REG, 1, 0);
ioperm(GRAPHICS_DATA_REG, 1, 0);
@@ -134,8 +124,6 @@ index 5647852..f50721e 100644
#endif
}
-diff --git a/src/encfilter.c b/src/encfilter.c
-index fa879fe..6351e8e 100644
--- a/src/encfilter.c
+++ b/src/encfilter.c
@@ -37,6 +37,7 @@
@@ -146,8 +134,6 @@ index fa879fe..6351e8e 100644
#include "encfilter.h"
-diff --git a/src/graphdev.cpp b/src/graphdev.cpp
-index 15a3262..6910617 100644
--- a/src/graphdev.cpp
+++ b/src/graphdev.cpp
@@ -32,7 +32,7 @@
@@ -159,8 +145,6 @@ index 15a3262..6910617 100644
#ifdef HAVE_GGI_LIB
#include "display/libggi.h"
#endif
-diff --git a/src/graphdev.h b/src/graphdev.h
-index 64434ec..8106896 100644
--- a/src/graphdev.h
+++ b/src/graphdev.h
@@ -21,7 +21,7 @@
@@ -172,11 +156,9 @@ index 64434ec..8106896 100644
#include "utypes.h"
#endif
#include <stdexcept>
-diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
-index 11f17ad..2a90f42 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
-@@ -670,7 +670,7 @@ void InputManager::KDInputRestore() {
+@@ -670,7 +670,7 @@
}
}
@@ -185,11 +167,9 @@ index 11f17ad..2a90f42 100644
#include <termios.h>
//#include <machine/console.h>
#include <sys/consio.h>
-diff --git a/src/inputmanager.h b/src/inputmanager.h
-index decfdb3..9876e0f 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
-@@ -28,10 +28,11 @@ using namespace std;
+@@ -28,10 +28,11 @@
#include <vector>
#include <sys/types.h>
@@ -203,7 +183,7 @@ index decfdb3..9876e0f 100644
#define BUFSIZE 8192
class Zhcon;
-@@ -105,7 +106,7 @@ class InputManager {
+@@ -105,7 +106,7 @@
};
static KeyMap mKDSysMap[];
static KeyMap mKDInputMap[];
@@ -212,8 +192,6 @@ index decfdb3..9876e0f 100644
static keymap_t mKDSysOld, mKDSysNew;
static keymap_t mKDInputOld, mKDInputNew;
#endif
-diff --git a/src/main.cpp b/src/main.cpp
-index 9802d25..49b6eab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,9 +31,10 @@
@@ -228,8 +206,6 @@ index 9802d25..49b6eab 100644
#endif
#include "zhcon.h"
#include "global.h"
-diff --git a/src/mouse.cpp b/src/mouse.cpp
-index 2ce03bd..4dbeff6 100644
--- a/src/mouse.cpp
+++ b/src/mouse.cpp
@@ -21,7 +21,7 @@
@@ -241,7 +217,7 @@ index 2ce03bd..4dbeff6 100644
Mouse* Mouse::pMouse = NULL;
void Mouse::SignalProcess(int signo) {
if (Mouse::pMouse != NULL) pMouse->Process();
-@@ -29,7 +29,7 @@ void Mouse::SignalProcess(int signo) {
+@@ -29,7 +29,7 @@
#endif
Mouse::Mouse() {
@@ -250,7 +226,7 @@ index 2ce03bd..4dbeff6 100644
Mouse::pMouse = this;
#endif
mFd = -1;
-@@ -42,7 +42,7 @@ Mouse::Mouse() {
+@@ -42,7 +42,7 @@
Mouse::~Mouse() {
Close();
@@ -259,7 +235,7 @@ index 2ce03bd..4dbeff6 100644
Mouse::pMouse = NULL;
#endif
}
-@@ -90,7 +90,7 @@ bool Mouse::Open(Console* pCon, int confd, int ttyno, int ttyfd) {
+@@ -90,7 +90,7 @@
event.vc,event.modifiers);
printf("The button mask is 0x%02X\n",event.buttons);
*/
@@ -268,7 +244,7 @@ index 2ce03bd..4dbeff6 100644
memset(&mMiPrev, 0, sizeof(mMiPrev));
memset(&mTV1, 0, sizeof(mTV1));
memset(&mTV2, 0, sizeof(mTV2));
-@@ -113,7 +113,7 @@ void Mouse::Close() {
+@@ -113,7 +113,7 @@
return;
while (Gpm_Close()); // close all mouse stack
mFd = -1;
@@ -277,7 +253,7 @@ index 2ce03bd..4dbeff6 100644
signal(SIGUSR2, SIG_DFL);
#endif
}
-@@ -217,7 +217,7 @@ void Mouse::Process() {
+@@ -217,7 +217,7 @@
return;
}
} /* switch above */
@@ -286,8 +262,6 @@ index 2ce03bd..4dbeff6 100644
struct mouse_info mi;
mi.operation = MOUSE_GETINFO;
if (ioctl(mConFd, CONS_MOUSECTL, &mi) < 0) {
-diff --git a/src/mouse.h b/src/mouse.h
-index 43a7c8b..2bb3386 100644
--- a/src/mouse.h
+++ b/src/mouse.h
@@ -25,13 +25,8 @@
@@ -315,7 +289,7 @@ index 43a7c8b..2bb3386 100644
static void SignalProcess(int signo);
static Mouse* pMouse;
#endif
-@@ -65,7 +60,7 @@ class Mouse {
+@@ -65,7 +60,7 @@
private:
#ifdef HAVE_GPM_H
Gpm_Connect mConn;
@@ -324,8 +298,6 @@ index 43a7c8b..2bb3386 100644
struct mouse_info mMiPrev;
int mClicks;
struct timeval mTV1;
-diff --git a/src/zhcon.cpp b/src/zhcon.cpp
-index 98b083e..f8a960f 100644
--- a/src/zhcon.cpp
+++ b/src/zhcon.cpp
@@ -30,14 +30,20 @@
@@ -351,7 +323,7 @@ index 98b083e..f8a960f 100644
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-@@ -322,7 +328,7 @@ void Zhcon::CleanUp() {
+@@ -322,7 +328,7 @@
sigaction(SIGFPE, &act, NULL);
VtSignalClean();
@@ -360,7 +332,7 @@ index 98b083e..f8a960f 100644
ioctl(0, VT_RELDISP, 1);
#endif
-@@ -338,7 +344,7 @@ void Zhcon::CleanUp() {
+@@ -338,7 +344,7 @@
// restore console blanking
#if defined(linux)
write(mConFd, "\033[9;10]",7); // default 10 minutes
@@ -369,7 +341,7 @@ index 98b083e..f8a960f 100644
int BlankTime = 5; // default 5 minutes
ioctl(mConFd, CONS_BLANKTIME, &BlankTime);
#endif
-@@ -406,7 +412,7 @@ void Zhcon::InitTty() {
+@@ -406,7 +412,7 @@
t.c_cc[VTIME] = 0;
#if defined(linux)
t.c_line = 0;
@@ -378,7 +350,7 @@ index 98b083e..f8a960f 100644
t.c_cc[VDISCARD] = _POSIX_VDISABLE;
t.c_cc[VLNEXT] = _POSIX_VDISABLE;
t.c_cc[VSTART] = _POSIX_VDISABLE;
-@@ -428,7 +434,7 @@ void Zhcon::InitTty() {
+@@ -428,7 +434,7 @@
#if defined(linux)
// see kernel's console.c, function setterm_command
write(mConFd, "\033[9;0]",6);
@@ -387,7 +359,7 @@ index 98b083e..f8a960f 100644
// man splash
// see /usr/src/sys/dev/syscons/syscons.c
int BlankTime = 0;
-@@ -639,7 +645,7 @@ void Zhcon::InitLocale(ConfigFile& f){
+@@ -639,7 +645,7 @@
//SetEncode(GB2312,GB2312);
//FreeBsd use zh_CN.EUC instead of zh_CN.GB2312
//a broken locale? workaround it
@@ -396,7 +368,7 @@ index 98b083e..f8a960f 100644
setenv("LC_CTYPE", "zh_CN.EUC", 1);
#else
if (mArgs.utf8_flag)
-@@ -691,7 +697,7 @@ void Zhcon::InitGraphDev(ConfigFile& f){
+@@ -691,7 +697,7 @@
bool r;
#if defined(linux)
r = GraphDev::Open(mArgs.drv_arg);
@@ -405,4 +377,3 @@ index 98b083e..f8a960f 100644
int xres = f.GetOption(string("x_resolution"), 640);
int yres = f.GetOption(string("y_resolution"), 480);
int depth = f.GetOption(string("color_depth"), 4);
---
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/zhcon.git
More information about the Chinese-commits
mailing list