From c8e5702127e507e82e6f68a4b8c546803accea9d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Jun 2005 08:19:37 +0000 Subject: import clean BK tree at cset 1.3670 --- packages/fbvncserver/.mtn2git_empty | 0 packages/fbvncserver/files/.mtn2git_empty | 0 packages/fbvncserver/files/init | 8 ++++ packages/fbvncserver/files/kernelinclude.patch | 12 +++++ packages/fbvncserver/files/libvncs0.6.patch | 61 +++++++++++++++++++++++++ packages/fbvncserver/files/paths.patch | 52 +++++++++++++++++++++ packages/fbvncserver/files/zaurus_panel.jpg | Bin 0 -> 35547 bytes 7 files changed, 133 insertions(+) create mode 100644 packages/fbvncserver/.mtn2git_empty create mode 100644 packages/fbvncserver/files/.mtn2git_empty (limited to 'packages/fbvncserver') diff --git a/packages/fbvncserver/.mtn2git_empty b/packages/fbvncserver/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fbvncserver/files/.mtn2git_empty b/packages/fbvncserver/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fbvncserver/files/init b/packages/fbvncserver/files/init index e69de29bb2..b01a1ebd79 100644 --- a/packages/fbvncserver/files/init +++ b/packages/fbvncserver/files/init @@ -0,0 +1,8 @@ +#!/bin/sh + +rm -f /dev/ts +mkfifo /dev/ts +mkfifo /dev/tssim +mknod /dev/kbdsim c 61 0 +insmod -f kbdsim +/usr/bin/tssimd diff --git a/packages/fbvncserver/files/kernelinclude.patch b/packages/fbvncserver/files/kernelinclude.patch index e69de29bb2..b17d4e09c2 100644 --- a/packages/fbvncserver/files/kernelinclude.patch +++ b/packages/fbvncserver/files/kernelinclude.patch @@ -0,0 +1,12 @@ +diff -urN fbvncserver-0.9.4.old/Makefile fbvncserver-0.9.4/Makefile +--- fbvncserver-0.9.4.old/Makefile 2003-05-19 22:52:24.000000000 -0400 ++++ fbvncserver-0.9.4/Makefile 2004-02-27 10:49:27.000000000 -0500 +@@ -86,7 +86,7 @@ + ${STRIP} $@ + + zaurus_kbdsim.o: kbdsim.c +- ${CC} -Wall -D__KERNEL__ -c -o $@ $< ++ ${CC} ${KERNEL_INCLUDES} -Wall -D__KERNEL__ -c -o $@ $< + + ipaq_kbdsim.o: kbdsim.c + ${CC} -DIPAQ -Wall -D__KERNEL__ -c -o $@ $< diff --git a/packages/fbvncserver/files/libvncs0.6.patch b/packages/fbvncserver/files/libvncs0.6.patch index e69de29bb2..0975c376bd 100644 --- a/packages/fbvncserver/files/libvncs0.6.patch +++ b/packages/fbvncserver/files/libvncs0.6.patch @@ -0,0 +1,61 @@ +diff -urN fbvncserver-0.9.4.old/fbvncserver.c fbvncserver-0.9.4/fbvncserver.c +--- fbvncserver-0.9.4.old/fbvncserver.c 2003-03-03 01:00:09.000000000 -0500 ++++ fbvncserver-0.9.4/fbvncserver.c 2004-02-12 20:49:40.000000000 -0500 +@@ -18,8 +18,8 @@ + #include + #include + #include +-#include "rfb.h" +-#include "keysym.h" ++#include "rfb/rfb.h" ++#include "rfb/keysym.h" + #include "keysym2scancode.h" + #include "loadjpeg.h" + #include "panelzones.h" +@@ -42,7 +42,7 @@ + /* Types */ + struct ClientData + { +- Bool oldButton; ++ rfbBool oldButton; + int oldx,oldy; + }; + +@@ -304,7 +304,7 @@ + + + /* Keyboard events handler */ +-void keyevent(Bool down,KeySym key,rfbClientPtr cl) ++void keyevent(rfbBool down,rfbKeySym key,rfbClientPtr cl) + { + unsigned char *scancodes; + +diff -urN fbvncserver-0.9.4.old/keysym2scancode.c fbvncserver-0.9.4/keysym2scancode.c +--- fbvncserver-0.9.4.old/keysym2scancode.c 2002-11-16 15:32:04.000000000 -0500 ++++ fbvncserver-0.9.4/keysym2scancode.c 2004-02-12 20:50:33.000000000 -0500 +@@ -7,8 +7,8 @@ + + (c) Pierre-Philippe Coupard, 27/01/2002 + */ +-#include "keysym.h" +-#include "rfb.h" ++#include "rfb/keysym.h" ++#include "rfb/rfb.h" + #include "keysym2scancode.h" + + +@@ -290,7 +290,7 @@ + + /* Turn a received keysym into a Zaurus keyboard scancode sequence. Each + sequence is terminated by 0xff. Return NULL if no scancode could be found */ +-unsigned char *keysym2scancodes(Bool down, KeySym key) ++unsigned char *keysym2scancodes(rfbBool down, rfbKeySym key) + { + #ifndef IPAQ + static int control_down = 0; +diff -urN fbvncserver-0.9.4.old/keysym2scancode.h fbvncserver-0.9.4/keysym2scancode.h +--- fbvncserver-0.9.4.old/keysym2scancode.h 2002-09-05 22:20:10.000000000 -0400 ++++ fbvncserver-0.9.4/keysym2scancode.h 2004-02-12 20:48:19.000000000 -0500 +@@ -1 +1 @@ +-unsigned char *keysym2scancodes(Bool down, KeySym key); ++unsigned char *keysym2scancodes(rfbBool down, rfbKeySym key); diff --git a/packages/fbvncserver/files/paths.patch b/packages/fbvncserver/files/paths.patch index e69de29bb2..7c122efc67 100644 --- a/packages/fbvncserver/files/paths.patch +++ b/packages/fbvncserver/files/paths.patch @@ -0,0 +1,52 @@ +diff -urN fbvncserver-0.9.4.old/fbvncserver.c fbvncserver-0.9.4/fbvncserver.c +--- fbvncserver-0.9.4.old/fbvncserver.c 2003-03-03 01:00:09.000000000 -0500 ++++ fbvncserver-0.9.4/fbvncserver.c 2004-02-27 11:35:36.000000000 -0500 +@@ -31,7 +31,7 @@ + #define FANCY_PANEL_JPG "/usr/local/vnc/ipaq_panel.jpg" + #define DESKTOP_NAME "iPAQ" + #else /* #ifdef ZAURUS */ +-#define FANCY_PANEL_JPG "/home/root/Applications/fbvncserver/zaurus_panel.jpg" ++#define FANCY_PANEL_JPG "/usr/share/fbvncserver/zaurus_panel.jpg" + #define DESKTOP_NAME "Zaurus" + #endif + +@@ -578,7 +578,7 @@ + rfbScreen->ptrAddEvent = ptrevent; + rfbScreen->kbdAddEvent = keyevent; + rfbScreen->newClientHook = newclient; +- rfbScreen->httpDir = "/home/root/Applications/fbvncserver/classes"; ++ rfbScreen->httpDir = "/usr/share/fbvncserver/classes"; + rfbInitServer(rfbScreen); + + /* Make sure we catch EPIPE so we don't get killed by closed sockets when +diff -urN fbvncserver-0.9.4.old/launch/subclass.cpp fbvncserver-0.9.4/launch/subclass.cpp +--- fbvncserver-0.9.4.old/launch/subclass.cpp 2003-05-10 19:20:02.000000000 -0400 ++++ fbvncserver-0.9.4/launch/subclass.cpp 2004-02-27 11:35:55.000000000 -0500 +@@ -17,13 +17,13 @@ + #include + #include + +-#define SCRIPT_LOCATION "/usr/local/bin" ++#define SCRIPT_LOCATION "/usr/bin" + + + mainDialog::mainDialog(QWidget *parent, const char *name, WFlags fl) + : mainDialogSuper(parent, name, fl) + { +- QPixmap qi("/home/root/Applications/fbvncserver/sdglogo.png", "PNG"); ++ QPixmap qi("/usr/share/fbvncserver/sdglogo.png", "PNG"); + QSizePolicy qsp(QSizePolicy::Fixed, QSizePolicy::Fixed); + SDG_Pixmap->setSizePolicy(qsp); + SDG_Pixmap->setPixmap(qi); +diff -urN fbvncserver-0.9.4.old/splash/subclass.cpp fbvncserver-0.9.4/splash/subclass.cpp +--- fbvncserver-0.9.4.old/splash/subclass.cpp 2003-04-29 23:23:41.000000000 -0400 ++++ fbvncserver-0.9.4/splash/subclass.cpp 2004-02-27 11:35:36.000000000 -0500 +@@ -17,7 +17,7 @@ + fbvncserverSplash::fbvncserverSplash(QWidget *parent, const char *name, bool modal, WFlags fl) + : fbvncserverSplashSuper(parent, name, modal, fl) + { +- QPixmap qi("/home/root/Applications/fbvncserver/sdglogo.png", "PNG"); ++ QPixmap qi("/usr/share/fbvncserver/sdglogo.png", "PNG"); + QSizePolicy qsp(QSizePolicy::Fixed, QSizePolicy::Fixed); + SDG_Pixmap->setSizePolicy(qsp); + SDG_Pixmap->setPixmap(qi); diff --git a/packages/fbvncserver/files/zaurus_panel.jpg b/packages/fbvncserver/files/zaurus_panel.jpg index e69de29bb2..cb8543f1db 100644 Binary files a/packages/fbvncserver/files/zaurus_panel.jpg and b/packages/fbvncserver/files/zaurus_panel.jpg differ -- cgit v1.2.3