From 52a142a6314905422f14f05fccafdce35bea7f08 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 21 Aug 2010 17:00:49 +0200 Subject: Bump package/config to 2.6.36-rc1 The goal is to be able to use savedefconfig to generate minimal defconfig files. Four of our patches are removed since the modifications have been merged upstream. The new nconf configuration utility has appeared. Signed-off-by: Thomas Petazzoni --- .../config/patches/16-non-identified-changes.patch | 47 ---------------------- 1 file changed, 47 deletions(-) delete mode 100644 package/config/patches/16-non-identified-changes.patch (limited to 'package/config/patches/16-non-identified-changes.patch') diff --git a/package/config/patches/16-non-identified-changes.patch b/package/config/patches/16-non-identified-changes.patch deleted file mode 100644 index 3a4bae5d9..000000000 --- a/package/config/patches/16-non-identified-changes.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- - lxdialog/checklist.c | 3 ++- - mconf.c | 10 +++++++++- - 2 files changed, 11 insertions(+), 2 deletions(-) - -Index: config.clean/lxdialog/checklist.c -=================================================================== ---- config.clean.orig/lxdialog/checklist.c -+++ config.clean/lxdialog/checklist.c -@@ -41,7 +41,8 @@ - wmove(win, choice, check_x); - wattrset(win, selected ? dlg.check_selected.atr - : dlg.check.atr); -- wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' '); -+ if (!item_is_tag(':')) -+ wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' '); - - wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr); - mvwaddch(win, choice, item_x, item_str()[0]); -Index: config.clean/mconf.c -=================================================================== ---- config.clean.orig/mconf.c -+++ config.clean/mconf.c -@@ -731,7 +731,12 @@ - for (child = menu->list; child; child = child->next) { - if (!menu_is_visible(child)) - continue; -- item_make("%s", _(menu_get_prompt(child))); -+ if (child->sym) -+ item_make("%s", _(menu_get_prompt(child))); -+ else { -+ item_make("*** %s ***", _(menu_get_prompt(child))); -+ item_set_tag(':'); -+ } - item_set_data(child); - if (child->sym == active) - item_set_selected(1); -@@ -747,6 +752,9 @@ - case 0: - if (selected) { - child = item_data(); -+ if (!child->sym) -+ break; -+ - sym_set_tristate_value(child->sym, yes); - } - return; -- cgit v1.2.3