diff options
Diffstat (limited to 'misc/tools/kconfig-frontends')
4 files changed, 16 insertions, 16 deletions
diff --git a/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch b/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch index d43076161..4b55ff7b8 100644 --- a/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch +++ b/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch @@ -2,12 +2,12 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c --- a/frontends/gconf/gconf.c +++ b/frontends/gconf/gconf.c @@ -12,7 +12,7 @@ - + #include <stdlib.h> #include "lkc.h" -#include "images.c" +#include "images.h" - + #include <glade/glade.h> #include <gtk/gtk.h> @@ -1468,8 +1468,10 @@ @@ -19,13 +19,13 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c +#endif - gchar *glade_file; + gchar *glade_file = GUI_PATH; - + bindtextdomain(PACKAGE, LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); @@ -1483,6 +1485,7 @@ //add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); //add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); - + +#if 0 /* Determine GUI path */ env = getenv(SRCTREE); @@ -35,6 +35,6 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c else glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); +#endif - + /* Conf stuffs */ if (ac > 1 && av[1][0] == '-') { diff --git a/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch b/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch index a8a78bb55..6769d750c 100644 --- a/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch +++ b/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch @@ -3,10 +3,10 @@ diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc +++ b/frontends/qconf/qconf.cc @@ -47,7 +47,7 @@ #include "qconf.h" - + #include "qconf.moc" -#include "images.c" +#include "images.h" - + #ifdef _ # undef _ diff --git a/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch b/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch index 09b9bbf55..6856904ce 100644 --- a/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch +++ b/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch @@ -1,27 +1,27 @@ --- a/libs/parser/yconf.y 2012-01-12 22:37:17.582339777 +0100 +++ b/libs/parser/yconf.y 2012-03-03 23:55:29.889737630 +0100 @@ -96,7 +96,7 @@ - + %{ /* Include zconf.hash.c here so it can see the token constants. */ -#include "zconf.hash.c" +#include "hconf.c" %} - + %% @@ -493,7 +493,7 @@ - + sym_init(); _menu_init(); - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + rootmenu.prompt = menu_add_prompt(P_MENU, ROOTMENU, NULL); - + if (getenv("ZCONF_DEBUG")) zconfdebug = 1; @@ -725,7 +725,7 @@ } } - + -#include "zconf.lex.c" +#include "lconf.c" #include "util.c" diff --git a/misc/tools/kconfig-frontends/utils/tweak.in.patch b/misc/tools/kconfig-frontends/utils/tweak.in.patch index 0fc79e1a9..c4b855790 100644 --- a/misc/tools/kconfig-frontends/utils/tweak.in.patch +++ b/misc/tools/kconfig-frontends/utils/tweak.in.patch @@ -2,20 +2,20 @@ diff --git a/utils/tweak.in b/utils/tweak.in --- a/utils/tweak.in +++ b/utils/tweak.in @@ -3,8 +3,8 @@ - + myname=${0##*/} - + -# If no prefix forced, use the default CONFIG_ -CONFIG_="${CONFIG_-CONFIG_}" +# If no prefix forced, use the default @CONFIG_@ +CONFIG_="${CONFIG_-@CONFIG_@}" - + usage() { cat >&2 <<EOL @@ -41,7 +41,7 @@ By default, $myname will upper-case the given symbol. Use --keep-case to keep the case of all following symbols unchanged. - + -$myname uses 'CONFIG_' as the default symbol prefix. Set the environment +$myname uses '@CONFIG_@' as the default symbol prefix. Set the environment variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" $myname ... |