From 325d77c2bdd2430685a8b8140284ce1d8aa9363a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 12 Jun 2014 17:03:29 +0000 Subject: [PATCH] minicom: moved to github MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jo-Philipp Wich <​jow@openwrt.org> SVN-Revision: 41171 --- utils/minicom/Makefile | 37 ------ .../010-resolve-getline-conflict.patch | 111 ------------------ 2 files changed, 148 deletions(-) delete mode 100644 utils/minicom/Makefile delete mode 100644 utils/minicom/patches/010-resolve-getline-conflict.patch diff --git a/utils/minicom/Makefile b/utils/minicom/Makefile deleted file mode 100644 index 104e477ef8..0000000000 --- a/utils/minicom/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=minicom -PKG_VERSION:=2.3 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://alioth.debian.org/download.php/2332/ -PKG_MD5SUM:=0ebe7a91898384ca906787cc4e2c3f25 - -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk - -define Package/minicom - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=+libncurses - TITLE:=Terminal emulation program - URL:=http://alioth.debian.org/projects/minicom/ - SUBMENU:=Terminal -endef - -define Package/minicom/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ascii-xfr $(1)/usr/sbin/ -endef - -$(eval $(call BuildPackage,minicom)) diff --git a/utils/minicom/patches/010-resolve-getline-conflict.patch b/utils/minicom/patches/010-resolve-getline-conflict.patch deleted file mode 100644 index 041353daae..0000000000 --- a/utils/minicom/patches/010-resolve-getline-conflict.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- a/src/minicom.c -+++ b/src/minicom.c -@@ -167,7 +167,7 @@ static void shjump(int sig) - #endif /*SIGTSTP*/ - - /* Get a line from either window or scroll back buffer. */ --static ELM *getline(WIN *w, int no) -+static ELM *mc_getline(WIN *w, int no) - { - int i; - static ELM outofrange[MAXCOLS] = {{0,0,0}}; -@@ -205,7 +205,7 @@ static void drawhist(WIN *w, int y, int - - w->direct = 0; - for (f = 0; f < w->ys; f++) -- mc_wdrawelm(w, f, getline(w, y++)); -+ mc_wdrawelm(w, f, mc_getline(w, y++)); - if (r) - mc_wredraw(w, 1); - w->direct = 1; -@@ -227,7 +227,7 @@ void drawhist_look(WIN *w, int y, int r, - tmp_line[0]='\0'; - w->direct = 0; - for (f = 0; f < w->ys; f++) { -- tmp_e = getline(w, y++); -+ tmp_e = mc_getline(w, y++); - - /* First we "accumulate" the line into a variable */ - mc_wdrawelm_var(w, tmp_e, tmp_line); -@@ -324,7 +324,7 @@ int find_next(WIN *w, WIN *w_hist, - - for (next_line = hit_line; next_line <= all_lines; next_line++) { - /* we do 'something' here... :-) */ -- tmp_e = getline(w_hist, next_line); -+ tmp_e = mc_getline(w_hist, next_line); - - /* - * First we "accumulate" the line into a variable. -@@ -379,9 +379,9 @@ wchar_t *StrStr(wchar_t *str1, wchar_t * - static void drawcite(WIN *w, int y, int citey, int start, int end) - { - if (y+citey >= start && y+citey <= end) -- mc_wdrawelm_inverse(w, y, getline(w, y+citey)); -+ mc_wdrawelm_inverse(w, y, mc_getline(w, y+citey)); - else -- mc_wdrawelm(w, y, getline(w, y+citey)); -+ mc_wdrawelm(w, y, mc_getline(w, y+citey)); - } - - static void drawcite_whole(WIN *w, int y, int start, int end) -@@ -400,7 +400,7 @@ static void do_cite(WIN *w, int start, i - for (y=start; y<=end; y++) { - vt_send('>'); - vt_send(' '); -- tmp_e = getline(w, y); -+ tmp_e = mc_getline(w, y); - mc_wdrawelm_var(w, tmp_e, tmp_line); - tmp_line[w->xs] = 0; - for (x = w->xs-1; x >= 0; x--) { -@@ -600,7 +600,7 @@ static void scrollback(void) - if (citemode) { - inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend); - } else { -- tmp_e = getline(b_us, y); -+ tmp_e = mc_getline(b_us, y); - if (wcslen(look_for) > 1) { - /* quick scan for pattern match */ - mc_wdrawelm_var(b_us, tmp_e, tmp_line); -@@ -611,9 +611,9 @@ static void scrollback(void) - } - - if (inverse) -- mc_wdrawelm_inverse(b_us, 0, getline(b_us, y)); -+ mc_wdrawelm_inverse(b_us, 0, mc_getline(b_us, y)); - else -- mc_wdrawelm(b_us, 0, getline(b_us, y)); -+ mc_wdrawelm(b_us, 0, mc_getline(b_us, y)); - if (citemode) - mc_wlocate(b_us, 0, cite_y); - mc_wflush(); -@@ -648,7 +648,7 @@ static void scrollback(void) - if (citemode) { - inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend); - } else { -- tmp_e = getline(b_us, y + b_us->ys - 1); -+ tmp_e = mc_getline(b_us, y + b_us->ys - 1); - if (wcslen(look_for) > 1) { - /* quick scan for pattern match */ - mc_wdrawelm_var(b_us, tmp_e, tmp_line); -@@ -660,10 +660,10 @@ static void scrollback(void) - - if (inverse) - mc_wdrawelm_inverse(b_us, b_us->ys - 1, -- getline(b_us, y + b_us->ys - 1)); -+ mc_getline(b_us, y + b_us->ys - 1)); - else - mc_wdrawelm(b_us, b_us->ys - 1, -- getline(b_us, y + b_us->ys - 1)); -+ mc_getline(b_us, y + b_us->ys - 1)); - if (citemode) - mc_wlocate(b_us, 0, cite_y); - mc_wflush(); -@@ -753,7 +753,7 @@ static void scrollback(void) - mc_wlocate(b_st, 0, 0); - mc_wprintf(b_st, hline); - mc_wredraw(b_st, 1); -- mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart)); -+ mc_wdrawelm_inverse(b_us, cite_y, mc_getline(b_us, cite_ystart)); - mc_wlocate(b_us, 0, cite_y); - break; - case K_ESC: -- 2.30.2