diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-10 00:43:01 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-10 00:43:01 +0000 |
| commit | 596e5fed4ea6663d0fd5a37cb95fb3aa8b6b5d0f (patch) | |
| tree | 0cbb55d45e05343b846b0f145fb10854a359e62b /misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch | |
| parent | 1ac3cb8a10935e866f6edc6eb294a1f1a33c5e74 (diff) | |
| download | px4-nuttx-596e5fed4ea6663d0fd5a37cb95fb3aa8b6b5d0f.tar.gz px4-nuttx-596e5fed4ea6663d0fd5a37cb95fb3aa8b6b5d0f.tar.bz2 px4-nuttx-596e5fed4ea6663d0fd5a37cb95fb3aa8b6b5d0f.zip | |
Update to kconfig-frontends-3.6.0, Expand the tarball so that we can accept patches against it
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5327 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch')
| -rw-r--r-- | misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch b/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch new file mode 100644 index 000000000..fbd898010 --- /dev/null +++ b/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch @@ -0,0 +1,40 @@ +diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c +--- a/frontends/gconf/gconf.c ++++ b/frontends/gconf/gconf.c +@@ -11,7 +11,7 @@ + #endif + + #include "lkc.h" +-#include "images.c" ++#include "images.h" + + #include <glade/glade.h> + #include <gtk/gtk.h> +@@ -1468,8 +1468,10 @@ + int main(int ac, char *av[]) + { + const char *name; ++#if 0 + char *env; ++#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); + if (env) +@@ -1491,6 +1494,7 @@ + glade_file = g_strconcat(av[0], ".glade", NULL); + else + glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); ++#endif + + /* Conf stuffs */ + if (ac > 1 && av[1][0] == '-') { |