Restore trainling whitespace in .patch and .diff files wehre required

6 files changed, 28 insertions, 28 deletions

diff --git a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
index 4774194d0..3fe3f8163 100644
--- a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
+++ b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
@@ -3,11 +3,11 @@ diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.c kconfig-fronten
 +++ kconfig-frontends-3.3.0-1/frontends/nconf/nconf.c	2012-04-05 15:16:06.590563200 -0600
 @@ -1503,7 +1503,7 @@
  	}
-
+ 
  	notimeout(stdscr, FALSE);
 -	ESCDELAY = 1;
 +	//ESCDELAY = 1;
-
+ 
  	/* set btns menu */
  	curses_menu = new_menu(curses_menu_items);
 diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.h kconfig-frontends-3.3.0-1/frontends/nconf/nconf.h
@@ -27,22 +27,22 @@ diff -ru kconfig-frontends-3.3.0-1.orig//libs/lxdialog/dialog.h kconfig-frontend
 @@ -26,11 +26,7 @@
  #include <string.h>
  #include <stdbool.h>
-
+ 
 -#ifndef KBUILD_NO_NLS
 -# include <libintl.h>
 -#else
  # define gettext(Msgid) ((const char *) (Msgid))
 -#endif
-
+ 
  #ifdef __sun__
  #define CURS_MACROS
 diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/lkc.h kconfig-frontends-3.3.0-1/libs/parser/lkc.h
 --- kconfig-frontends-3.3.0-1.orig//libs/parser/lkc.h	2012-03-20 16:07:45.000000000 -0600
 +++ kconfig-frontends-3.3.0-1/libs/parser/lkc.h	2012-04-05 14:59:02.969015400 -0600
 @@ -8,14 +8,10 @@
-
+ 
  #include "expr.h"
-
+ 
 -#ifndef KBUILD_NO_NLS
 -# include <libintl.h>
 -#else
@@ -51,7 +51,7 @@ diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/lkc.h kconfig-frontends-3.3
  static inline void bindtextdomain(const char *name, const char *dir) {}
  static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; }
 -#endif
-
+ 
  #ifdef __cplusplus
  extern "C" {
 diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/yconf.c kconfig-frontends-3.3.0-1/libs/parser/yconf.c
@@ -59,7 +59,7 @@ diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/yconf.c kconfig-frontends-3
 +++ kconfig-frontends-3.3.0-1/libs/parser/yconf.c	2012-04-05 14:59:40.732175300 -0600
 @@ -285,12 +285,6 @@
  #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
+ 
  #ifndef YY_
 -# if YYENABLE_NLS
 -#  if ENABLE_NLS
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 ...
diff --git a/misc/tools/kconfig-macos.diff b/misc/tools/kconfig-macos.diff
index e9ec90b68..10e21bb85 100755
--- a/misc/tools/kconfig-macos.diff
+++ b/misc/tools/kconfig-macos.diff
@@ -6,9 +6,9 @@ diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.c kconfig-frontends-3.
  #include <string.h>
  #include <stdbool.h>
 +#include <stddef.h>
-
+ 
  #include "lkc.h"
-
+ 
 diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y kconfig-frontends-3.3.0-1/libs/parser/yconf.y
 --- orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y	2012-03-20 15:07:45.000000000 -0700
 +++ kconfig-frontends-3.3.0-1/libs/parser/yconf.y	2012-04-13 23:38:22.000000000 -0700
@@ -17,6 +17,6 @@ diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y kconfig-frontends-3.
  #include <string.h>
  #include <stdbool.h>
 +#include <stddef.h>
-
+ 
  #include "lkc.h"
-
+