diff options
| -rw-r--r-- | misc/xvnkb/patches/gimp-segfault.patch | 29 | ||||
| -rw-r--r-- | misc/xvnkb/patches/kdeinit-error.patch | 12 | ||||
| -rw-r--r-- | misc/xvnkb/patches/power-consumption.patch | 18 | ||||
| -rw-r--r-- | misc/xvnkb/xvnkb.SlackBuild | 10 | ||||
| -rw-r--r-- | misc/xvnkb/xvnkb.info | 6 |
5 files changed, 5 insertions, 70 deletions
diff --git a/misc/xvnkb/patches/gimp-segfault.patch b/misc/xvnkb/patches/gimp-segfault.patch deleted file mode 100644 index 3ff7d42c7c..0000000000 --- a/misc/xvnkb/patches/gimp-segfault.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -urN xvnkb.cvs/Makefile.common xvnkb/Makefile.common ---- xvnkb.cvs/Makefile.common 2005-01-12 04:21:04.000000000 -0600 -+++ xvnkb/Makefile.common 2009-07-09 10:37:22.491007609 -0500 -@@ -6,7 +6,7 @@ - .PHONY: config debug core core_debug tools uninstall - - CORE=xvnkb.so.$(VERSION) --CORE_OBJS=xvnkb.o visckey.o property.o -+CORE_OBJS=xvnkb.o visckey.o - - GUI=xvnkb - GUI_OBJS=data.o flash.o main.o event.o mainwin.o menu.o hotkey.o systray.o \ -diff -urN xvnkb.cvs/xvnkb.c xvnkb/xvnkb.c ---- xvnkb.cvs/xvnkb.c 2009-06-27 06:32:54.000000000 -0500 -+++ xvnkb/xvnkb.c 2009-07-09 10:37:02.505973519 -0500 -@@ -49,7 +49,7 @@ - long sym; - } vk_hotkey_info; - /*----------------------------------------------------------------------------*/ --Window root = -1; -+static Window root = -1; - Window focus = -1; - /*----------------------------------------------------------------------------*/ - static KeyCode rk = 0; -@@ -422,3 +422,4 @@ - return 0; - } - /*----------------------------------------------------------------------------*/ -+#include "property.c" diff --git a/misc/xvnkb/patches/kdeinit-error.patch b/misc/xvnkb/patches/kdeinit-error.patch deleted file mode 100644 index 849bcd1092..0000000000 --- a/misc/xvnkb/patches/kdeinit-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN xvnkb.cvs/Makefile.common xvnkb/Makefile.common ---- xvnkb.cvs/Makefile.common 2005-01-12 04:21:04.000000000 -0600 -+++ xvnkb/Makefile.common 2009-07-09 12:44:28.789974861 -0500 -@@ -19,7 +19,7 @@ - $(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $< - - $(CORE): $(CORE_OBJS) -- $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -+ $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -lX11 - - $(GUI): $(GUI_OBJS) - $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) diff --git a/misc/xvnkb/patches/power-consumption.patch b/misc/xvnkb/patches/power-consumption.patch deleted file mode 100644 index 99130bf71f..0000000000 --- a/misc/xvnkb/patches/power-consumption.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- main.c 2006/02/25 20:31:25 1.7 -+++ main.c 2009/06/27 11:10:55 1.8 -@@ -89,8 +89,14 @@ - /*----------------------------------------------------------------------------*/ - void VKMainProcess() - { -+ int xfd = ConnectionNumber(display); -+ - while( !vk_done ) { -- usleep(1000); -+ struct timeval tv = {1, 0}; -+ fd_set rfds; -+ FD_ZERO(&rfds); -+ FD_SET(xfd, &rfds); -+ select(xfd+1, &rfds, 0, 0, &tv); - - if( vk_timeout && vk_flash_on ) - VKHideFlash(); diff --git a/misc/xvnkb/xvnkb.SlackBuild b/misc/xvnkb/xvnkb.SlackBuild index 5d4c45305a..86cb66d4f1 100644 --- a/misc/xvnkb/xvnkb.SlackBuild +++ b/misc/xvnkb/xvnkb.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xvnkb -# Copyright 2010 Binh Nguyen <binhnguyen@fastmail.fm> +# Copyright 2010, 2012 Binh Nguyen <binhnguyen@fastmail.fm> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xvnkb -VERSION=${VERSION:-0.2.9a} +VERSION=${VERSION:-0.2.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,12 +69,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Apply some patches provided by xvnkb's author -# http://forum.vnoss.org/topic6667.html -patch -p1 < $CWD/patches/gimp-segfault.patch -patch -p1 < $CWD/patches/kdeinit-error.patch -patch -p0 < $CWD/patches/power-consumption.patch - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/misc/xvnkb/xvnkb.info b/misc/xvnkb/xvnkb.info index 7e0777454b..5161de3d33 100644 --- a/misc/xvnkb/xvnkb.info +++ b/misc/xvnkb/xvnkb.info @@ -1,8 +1,8 @@ PRGNAM="xvnkb" -VERSION="0.2.9a" +VERSION="0.2.11" HOMEPAGE="http://xvnkb.sourceforge.net/" -DOWNLOAD="http://xvnkb.sourceforge.net/xvnkb-0.2.9a.tar.bz2" -MD5SUM="cd242c03831c31cc5b294aa9870a0dc4" +DOWNLOAD="http://xvnkb.sourceforge.net/xvnkb-0.2.11.tar.bz2" +MD5SUM="48367859bb66dbab363989c8becf041d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |