From ed585eb56d721b45e4a22283f5a884d20ed568eb Mon Sep 17 00:00:00 2001 From: kyak Date: Mon, 15 Oct 2012 12:19:08 +0400 Subject: [PATCH] keymouse: update dl method, drop patches --- keymouse/Makefile | 15 ++-- .../001_including_missing_headers.patch | 80 ------------------- 2 files changed, 10 insertions(+), 85 deletions(-) delete mode 100644 keymouse/patches/001_including_missing_headers.patch diff --git a/keymouse/Makefile b/keymouse/Makefile index 5020cf1..5e62d63 100644 --- a/keymouse/Makefile +++ b/keymouse/Makefile @@ -6,12 +6,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keymouse -PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.0-git +PKG_RELEASE:=1 +PKG_REV:=c60552422fad13dc9c4064d8ea7e5e5ecc58be4a + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz +PKG_SOURCE_URL:=https://github.com/nopper/keymouse.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://download2.berlios.de/keymouse -PKG_CAT:=bzcat PKG_BUILD_DEPENDS:=libX11 include $(INCLUDE_DIR)/package.mk @@ -21,6 +25,7 @@ define Package/keymouse SECTION:=utils CATEGORY:=Utilities URL:=http://keymouse.berlios.de + DEPENDS:=+libstdcpp endef PKG_BUILD_DIR:=$(BUILD_DIR)/keymouse-$(PKG_VERSION) diff --git a/keymouse/patches/001_including_missing_headers.patch b/keymouse/patches/001_including_missing_headers.patch deleted file mode 100644 index bcc6a1f..0000000 --- a/keymouse/patches/001_including_missing_headers.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -crB keymouse-1.0/src/app.cpp keymouse-1.0.mod/src/app.cpp -*** keymouse-1.0/src/app.cpp 2008-03-30 15:41:44.000000000 +0200 ---- keymouse-1.0.mod/src/app.cpp 2010-06-14 13:34:31.565636052 +0200 -*************** -*** 8,14 **** - #include - #include - #include "app.h" -! - using namespace std; - - App::App(const char *file) : m_config(file), m_dev(NULL), m_ordModes(), m_exiting(false) ---- 8,15 ---- - #include - #include - #include "app.h" -! #include -! #include - using namespace std; - - App::App(const char *file) : m_config(file), m_dev(NULL), m_ordModes(), m_exiting(false) -diff -crB keymouse-1.0/src/configfile.cpp keymouse-1.0.mod/src/configfile.cpp -*** keymouse-1.0/src/configfile.cpp 2008-03-08 21:09:36.000000000 +0100 ---- keymouse-1.0.mod/src/configfile.cpp 2010-06-14 13:36:22.096885603 +0200 -*************** -*** 7,12 **** ---- 7,14 ---- - #include - #include - #include "configfile.h" -+ #include -+ #include - - ConfigFile::ConfigFile(const char *file) : m_values(), m_file(file) - { -Sólo en keymouse-1.0.mod/src: .deps -diff -crB keymouse-1.0/src/keymouse.cpp keymouse-1.0.mod/src/keymouse.cpp -*** keymouse-1.0/src/keymouse.cpp 2008-03-10 20:18:37.000000000 +0100 ---- keymouse-1.0.mod/src/keymouse.cpp 2010-06-14 13:36:55.096884176 +0200 -*************** -*** 10,15 **** ---- 10,17 ---- - - #include - #include "app.h" -+ #include -+ #include - - using namespace std; - -diff -crB keymouse-1.0/src/logger.cpp keymouse-1.0.mod/src/logger.cpp -*** keymouse-1.0/src/logger.cpp 2008-03-08 21:09:36.000000000 +0100 ---- keymouse-1.0.mod/src/logger.cpp 2010-06-14 13:52:26.245635574 +0200 -*************** -*** 6,11 **** ---- 6,15 ---- - - #include "logger.h" - #include -+ #include -+ #include -+ #include -+ #include - - using namespace std; - -diff -crB keymouse-1.0/src/shortcut.cpp keymouse-1.0.mod/src/shortcut.cpp -*** keymouse-1.0/src/shortcut.cpp 2008-03-08 21:09:36.000000000 +0100 ---- keymouse-1.0.mod/src/shortcut.cpp 2010-06-14 13:53:28.896884710 +0200 -*************** -*** 6,11 **** ---- 6,13 ---- - - #include "shortcut.h" - #include -+ #include -+ #include - - bool Shortcut::locked = false; -