From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- fbvncserver/fbvncserver-kmodule_0.9.4.bb | 0 fbvncserver/fbvncserver_0.9.4.bb | 0 fbvncserver/files/init | 8 ----- fbvncserver/files/kernelinclude.patch | 12 ------- fbvncserver/files/libvncs0.6.patch | 61 -------------------------------- fbvncserver/files/paths.patch | 52 --------------------------- fbvncserver/files/zaurus_panel.jpg | 0 7 files changed, 133 deletions(-) delete mode 100644 fbvncserver/fbvncserver-kmodule_0.9.4.bb delete mode 100644 fbvncserver/fbvncserver_0.9.4.bb delete mode 100644 fbvncserver/files/init delete mode 100644 fbvncserver/files/kernelinclude.patch delete mode 100644 fbvncserver/files/libvncs0.6.patch delete mode 100644 fbvncserver/files/paths.patch delete mode 100644 fbvncserver/files/zaurus_panel.jpg (limited to 'fbvncserver') diff --git a/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/fbvncserver/fbvncserver-kmodule_0.9.4.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fbvncserver/fbvncserver_0.9.4.bb b/fbvncserver/fbvncserver_0.9.4.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fbvncserver/files/init b/fbvncserver/files/init deleted file mode 100644 index b01a1ebd79..0000000000 --- a/fbvncserver/files/init +++ /dev/null @@ -1,8 +0,0 @@ -#!/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/fbvncserver/files/kernelinclude.patch b/fbvncserver/files/kernelinclude.patch deleted file mode 100644 index b17d4e09c2..0000000000 --- a/fbvncserver/files/kernelinclude.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/fbvncserver/files/libvncs0.6.patch b/fbvncserver/files/libvncs0.6.patch deleted file mode 100644 index 0975c376bd..0000000000 --- a/fbvncserver/files/libvncs0.6.patch +++ /dev/null @@ -1,61 +0,0 @@ -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/fbvncserver/files/paths.patch b/fbvncserver/files/paths.patch deleted file mode 100644 index 7c122efc67..0000000000 --- a/fbvncserver/files/paths.patch +++ /dev/null @@ -1,52 +0,0 @@ -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/fbvncserver/files/zaurus_panel.jpg b/fbvncserver/files/zaurus_panel.jpg deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3