kbd: update to 2.0.4

7 files changed, 3 insertions, 73 deletions

diff --git a/package/kbd/Makefile b/package/kbd/Makefile
index 48a725dd5..72f6e0eb1 100644
--- a/package/kbd/Makefile
+++ b/package/kbd/Makefile
@@ -4,15 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kbd
-PKG_VERSION:=		2.0.3
+PKG_VERSION:=		2.0.4
 PKG_RELEASE:=		1
-PKG_HASH:=		7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e
+PKG_HASH:=		5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88
 PKG_DESCR:=		keyboard and font utilities
 PKG_SECTION:=		sys/hw
 PKG_DEPENDS:=		libcheck
 PKG_BUILDDEP:=		flex-host bison-host check
 PKG_URL:=		http://kbd-project.org/
-PKG_SITES:=		ftp://ftp.kernel.org/pub/linux/utils/kbd/
+PKG_SITES:=		http://kbd-project.org/download/
 
 PKG_CFLINE_KBD:=	default y if ADK_TARGET_WITH_INPUT
 
diff --git a/package/kbd/patches/patch-src_dumpkeys_c b/package/kbd/patches/patch-src_dumpkeys_c
deleted file mode 100644
index f77b2d841..000000000
--- a/package/kbd/patches/patch-src_dumpkeys_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbd-2.0.1.orig/src/dumpkeys.c	2013-08-27 22:45:33.000000000 +0200
-+++ kbd-2.0.1/src/dumpkeys.c	2014-03-24 22:38:21.000000000 +0100
-@@ -3,6 +3,8 @@
-  *
-  * derived from version 0.81 - aeb@cwi.nl
-  */
-+
-+#include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <ctype.h>
diff --git a/package/kbd/patches/patch-src_libkeymap_dump_c b/package/kbd/patches/patch-src_libkeymap_dump_c
deleted file mode 100644
index cf3aca4d8..000000000
--- a/package/kbd/patches/patch-src_libkeymap_dump_c
+++ /dev/null
@@ -1,12 +0,0 @@
---- kbd-2.0.1.orig/src/libkeymap/dump.c	2013-08-27 22:45:33.000000000 +0200
-+++ kbd-2.0.1/src/libkeymap/dump.c	2014-03-24 21:46:08.000000000 +0100
-@@ -9,6 +9,9 @@
-  * This file is covered by the GNU General Public License,
-  * which should be included with kbd as the file COPYING.
-  */
-+
-+#include <sys/types.h>
-+#include <stdarg.h>
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/package/kbd/patches/patch-src_libkeymap_kernel_c b/package/kbd/patches/patch-src_libkeymap_kernel_c
deleted file mode 100644
index 70cff9735..000000000
--- a/package/kbd/patches/patch-src_libkeymap_kernel_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- kbd-2.0.1.orig/src/libkeymap/kernel.c	2013-08-27 22:45:33.000000000 +0200
-+++ kbd-2.0.1/src/libkeymap/kernel.c	2014-03-24 21:45:01.000000000 +0100
-@@ -6,7 +6,10 @@
-  * This file is covered by the GNU General Public License,
-  * which should be included with kbd as the file COPYING.
-  */
-+
-+#include <stdarg.h>
- #include <string.h>
-+#include <stdio.h>
- #include <errno.h>
- #include <sys/ioctl.h>
- 
diff --git a/package/kbd/patches/patch-src_libkeymap_kmap_c b/package/kbd/patches/patch-src_libkeymap_kmap_c
deleted file mode 100644
index 3f945e5da..000000000
--- a/package/kbd/patches/patch-src_libkeymap_kmap_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- kbd-2.0.1.orig/src/libkeymap/kmap.c	2013-10-07 16:13:31.000000000 +0200
-+++ kbd-2.0.1/src/libkeymap/kmap.c	2014-03-24 21:46:56.000000000 +0100
-@@ -1,4 +1,7 @@
-+#include <sys/types.h>
-+#include <stdarg.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <string.h>
- 
- #include "nls.h"
diff --git a/package/kbd/patches/patch-src_libkeymap_parser_y b/package/kbd/patches/patch-src_libkeymap_parser_y
deleted file mode 100644
index f06797961..000000000
--- a/package/kbd/patches/patch-src_libkeymap_parser_y
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbd-2.0.1.orig/src/libkeymap/parser.y	2013-10-07 16:13:39.000000000 +0200
-+++ kbd-2.0.1/src/libkeymap/parser.y	2014-03-24 21:49:52.000000000 +0100
-@@ -12,6 +12,8 @@
- %{
- #define YY_HEADER_EXPORT_START_CONDITIONS 1
- 
-+#include <stdarg.h>
-+
- #include "nls.h"
- #include "kbd.h"
- 
diff --git a/package/kbd/patches/patch-src_libkeymap_summary_c b/package/kbd/patches/patch-src_libkeymap_summary_c
deleted file mode 100644
index de2ec90b7..000000000
--- a/package/kbd/patches/patch-src_libkeymap_summary_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- kbd-2.0.1.orig/src/libkeymap/summary.c	2013-08-27 22:45:33.000000000 +0200
-+++ kbd-2.0.1/src/libkeymap/summary.c	2014-03-24 21:47:48.000000000 +0100
-@@ -6,6 +6,10 @@
-  * This file is covered by the GNU General Public License,
-  * which should be included with kbd as the file COPYING.
-  */
-+
-+#include <sys/types.h>
-+#include <stdarg.h>
-+#include <stdio.h>
- #include <string.h>
- #include <errno.h>
- #include <sys/ioctl.h>