From: Yann E. MORIN Date: Sun, 9 Apr 2017 06:42:36 +0000 (+0200) Subject: ksync: refresh patches X-Git-Tag: v4.11.0.0~8 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4e41179f91adfa4112222414d20ad426c775a355;p=kconfig-frontends ksync: refresh patches Signed-off-by: "Yann E. MORIN" --- diff --git a/frontends/gconf/gconf.c.patch b/frontends/gconf/gconf.c.patch index 4b55ff7..080881f 100644 --- a/frontends/gconf/gconf.c.patch +++ b/frontends/gconf/gconf.c.patch @@ -10,7 +10,7 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c #include #include -@@ -1468,8 +1468,10 @@ +@@ -1444,8 +1444,10 @@ int main(int ac, char *av[]) { const char *name; @@ -22,7 +22,7 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c bindtextdomain(PACKAGE, LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); -@@ -1483,6 +1485,7 @@ +@@ -1459,6 +1461,7 @@ //add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); //add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); @@ -30,7 +30,7 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c /* Determine GUI path */ env = getenv(SRCTREE); if (env) -@@ -1491,6 +1494,7 @@ +@@ -1467,6 +1470,7 @@ glade_file = g_strconcat(av[0], ".glade", NULL); else glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); diff --git a/frontends/qconf/qconf.cc.patch b/frontends/qconf/qconf.cc.patch index 6769d75..7b3e532 100644 --- a/frontends/qconf/qconf.cc.patch +++ b/frontends/qconf/qconf.cc.patch @@ -1,7 +1,7 @@ diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc --- a/frontends/qconf/qconf.cc +++ b/frontends/qconf/qconf.cc -@@ -47,7 +47,7 @@ +@@ -32,7 +32,7 @@ #include "qconf.h" #include "qconf.moc" diff --git a/libs/parser/yconf.y.patch b/libs/parser/yconf.y.patch index 6856904..d1e15ba 100644 --- a/libs/parser/yconf.y.patch +++ b/libs/parser/yconf.y.patch @@ -1,6 +1,6 @@ --- 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 @@ +@@ -102,7 +102,7 @@ %{ /* Include zconf.hash.c here so it can see the token constants. */ @@ -9,7 +9,7 @@ %} %% -@@ -493,7 +493,7 @@ +@@ -509,7 +509,7 @@ sym_init(); _menu_init(); @@ -18,7 +18,7 @@ if (getenv("ZCONF_DEBUG")) zconfdebug = 1; -@@ -725,7 +725,7 @@ +@@ -746,7 +746,7 @@ } }