From 9b0def637e631717d69d3293d7337eb5e7bd19f6 Mon Sep 17 00:00:00 2001 From: ankry Date: Wed, 27 Oct 2004 21:12:42 +0000 Subject: [PATCH] new Changed files: e16-check_menus.patch -> 1.1 e16-e_check_menu -> 1.1 e16-e_gen_menu -> 1.1 e16-edirconf.patch -> 1.1 enlightenment-check_menus.patch -> 1.1 enlightenment-e_check_menu -> 1.1 enlightenment-e_gen_menu -> 1.1 enlightenment-edirconf.patch -> 1.1 enlightenment-no_eng_config.patch -> 1.1 --- e16-check_menus.patch | 40 +++++++++++ e16-e_check_menu | 17 +++++ e16-e_gen_menu | 64 ++++++++++++++++++ e16-edirconf.patch | 108 ++++++++++++++++++++++++++++++ enlightenment-check_menus.patch | 40 +++++++++++ enlightenment-e_check_menu | 17 +++++ enlightenment-e_gen_menu | 64 ++++++++++++++++++ enlightenment-edirconf.patch | 108 ++++++++++++++++++++++++++++++ enlightenment-no_eng_config.patch | 100 +++++++++++++++++++++++++++ 9 files changed, 558 insertions(+) create mode 100644 e16-check_menus.patch create mode 100644 e16-e_check_menu create mode 100644 e16-e_gen_menu create mode 100644 e16-edirconf.patch create mode 100644 enlightenment-check_menus.patch create mode 100644 enlightenment-e_check_menu create mode 100644 enlightenment-e_gen_menu create mode 100644 enlightenment-edirconf.patch create mode 100644 enlightenment-no_eng_config.patch diff --git a/e16-check_menus.patch b/e16-check_menus.patch new file mode 100644 index 0000000..c1e45da --- /dev/null +++ b/e16-check_menus.patch @@ -0,0 +1,40 @@ +diff -Nur enlightenment-0.16.7.1/src/main.c enlightenment-0.16.7.1.new/src/main.c +--- enlightenment-0.16.7.1/src/main.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1.new/src/main.c 2004-10-08 20:09:24.000000000 +0200 +@@ -361,7 +361,11 @@ + + SetupUserInitialization(); + if (Mode.firsttime) +- runDocBrowser(); ++ { ++ runDocBrowser(); ++ } else { ++ checkMenu(); ++ } + + #if 0 /* Not if AAA */ + Mode.wm.startup = 1; +diff -Nur enlightenment-0.16.7.1/src/setup.c enlightenment-0.16.7.1.new/src/setup.c +--- enlightenment-0.16.7.1/src/setup.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1.new/src/setup.c 2004-10-09 15:02:42.060368144 +0200 +@@ -800,3 +800,20 @@ + EDBUG_RETURN_; + + } ++ ++void ++checkMenu(void) ++{ ++ FILE *f; ++ char file[FILEPATH_LEN_MAX]; ++ ++ EDBUG(3, "checkMenu"); ++ ++ if (fork()) ++ EDBUG_RETURN_; ++ Esnprintf(file, sizeof(file), "exec %s/scripts/e_check_menu", EDirRoot()); ++ execl(usershell(getuid()), usershell(getuid()), "-c", (char *)file, ++ NULL); ++ ++ EDBUG_RETURN_; ++} diff --git a/e16-e_check_menu b/e16-e_check_menu new file mode 100644 index 0000000..a5db172 --- /dev/null +++ b/e16-e_check_menu @@ -0,0 +1,17 @@ +#!/bin/sh + +EDirUser=$HOME/.enlightenment +[ -d $EDirUser ] || exit 1 +EDirRoot=/usr/share/enlightenment + + +[ "$LANG" != "$(cat $EDirUser/menus/lang)" ] && \ + $EDirRoot/scripts/e_gen_menu && exit + + +MD5=$(find /usr/share/applications/ -name "*.desktop" \ + -exec cat "{}" ";" | md5sum) + +[ "$MD5" != "$(cat $EDirUser/menus/md5)" ] && \ + $EDirRoot/scripts/e_gen_menu + diff --git a/e16-e_gen_menu b/e16-e_gen_menu new file mode 100644 index 0000000..84a400b --- /dev/null +++ b/e16-e_gen_menu @@ -0,0 +1,64 @@ +#!/bin/sh + +EDirUser=$HOME/.enlightenment +[ -d $EDirUser ] || exit 1 + + +DIALOG_ID= +e_dialog() { +if [ "$1" == "msg" ]; then + msg="$(echo "$2" | tr '&' '\n' )" + [ "$DIALOG_ID" != "" ] && \ + eesh -e "win_op $DIALOG_ID close" + eesh -e "dialog_ok $msg" + DIALOG_ID=$( eesh -ewait "window_list" | \ + grep $(gettext -d enlightenment Message) \ + | cut -f1 -d\ | head -n1 ) +elif [ "$1" == "title" ]; then + eesh -e "win_op $DIALOG_ID title $2" & + # don't use it to much: sigfault +fi +} + +deskmd5() { +find /usr/share/applications/ -name "*.desktop" \ + -exec cat "{}" ";" | md5sum > $EDirUser/menus/md5 +} + +SPACE=" " +e_dialog msg ".${SPACE}Please Wait.${SPACE}." +e_dialog title "Menus are being generated..." + +rm -rf $EDirUser/menus.old{,menu} +mv $EDirUser/menus{,.oldmenu} +mkdir $EDirUser/menus + + +#core +vfmg -i -f -c -s --xterm='Eterm --name %1 --exec %2' enlightenment + +#vim: ' + +rm -rf $EDirUser/menus.old +mv -f $EDirUser/file.menu{,.oldmenu} +ln -s menus/Applications.menu $EDirUser/file.menu + +if [ ! -r $EDirUser/file.menu -o \ + $(ls $EDirUser/menus | wc -l) -lt 5 ]; then + + rm -rf $EDirUser/menus + mv $EDirUser/menus{.oldmenu,} + mv -f $EDirUser/file.menu{.oldmenu,} + + e_dialog msg ".${SPACE}Something went wrong !${SPACE}.&Old menus reverted." +else + rm -rf $EDirUser/menus.oldmenu + rm -f $EDirUser/file.menu.oldmenu + + e_dialog msg ".${SPACE}Seems to be OK.${SPACE}.&Old menus deleted." + echo "$LANG" > $EDirUser/menus/lang + deskmd5 & +fi + +eesh -e 'reload_menus' +e_dialog title "Menu generation complete." diff --git a/e16-edirconf.patch b/e16-edirconf.patch new file mode 100644 index 0000000..7ca624f --- /dev/null +++ b/e16-edirconf.patch @@ -0,0 +1,108 @@ +diff -Nur enlightenment-0.16.7.1.orig/src/config.c enlightenment-0.16.7.1/src/config.c +--- enlightenment-0.16.7.1.orig/src/config.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/config.c 2004-10-01 01:32:53.715493632 +0200 +@@ -3348,7 +3348,7 @@ + i++; + } + Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef " +- "-include %s/config/definitions " "-I%s " "-I%s/config " ++ "-include %s/definitions " "-I%s " "-I%s " + "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s " + "-D ENLIGHTENMENT_BIN=%s " + "-D ENLIGHTENMENT_THEME=%s " "-D ECONFDIR=%s " +@@ -3357,7 +3357,7 @@ + "-D SCREEN_DEPTH_%i=1 " "-D USER_NAME=%s " "-D HOME_DIR=%s " + "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 " + "%s %s/cached/cfg/%s.preparsed", +- epp_path, EDirRoot(), themepath, EDirRoot(), ++ epp_path, EDirConf(), themepath, EDirConf(), + ENLIGHTENMENT_VERSION, EDirRoot(), EDirBin(), + themepath, EDirUser(), EDirUserCache(), VRoot.w, VRoot.h, + VRoot.w, VRoot.h, VRoot.depth, def_user, def_home, def_shell, +@@ -3586,7 +3586,7 @@ + EDBUG_RETURN(Estrdup(s)); + + /* look in system config dir */ +- Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file); ++ Esnprintf(s, sizeof(s), "%s/%s", EDirConf(), file); + if (findLocalizedFile(s) || isfile(s)) + EDBUG_RETURN(Estrdup(s)); + +@@ -3615,7 +3615,7 @@ + EDBUG_RETURN(Estrdup(s)); + + /* look in system config dir */ +- Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file); ++ Esnprintf(s, sizeof(s), "%s/%s", EDirConf(), file); + if (findLocalizedFile(s) || isfile(s)) + EDBUG_RETURN(Estrdup(s)); + +@@ -3692,7 +3692,7 @@ + EDBUG(5, "LoadEConfig"); + + Esnprintf(s, sizeof(s), "%s/", EDirUser()); +- Esnprintf(s, sizeof(s), "%s/config/", EDirRoot()); ++ Esnprintf(s, sizeof(s), "%s/", EDirConf()); + + /* save the current theme */ + if ((themelocation) && (themelocation[0] != 0)) +diff -Nur enlightenment-0.16.7.1.orig/src/E.h enlightenment-0.16.7.1/src/E.h +--- enlightenment-0.16.7.1.orig/src/E.h 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/E.h 2004-10-01 01:23:11.338028464 +0200 +@@ -2381,6 +2381,7 @@ + + /* misc.c */ + void BlumFlimFrub(void); ++const char *EDirConf(void); + const char *EDirRoot(void); + const char *EDirBin(void); + void EDirUserSet(const char *d); +diff -Nur enlightenment-0.16.7.1.orig/src/file.c enlightenment-0.16.7.1/src/file.c +--- enlightenment-0.16.7.1.orig/src/file.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/file.c 2004-10-01 01:30:04.091280432 +0200 +@@ -300,7 +300,7 @@ + { + struct stat st; + +- EDBUG(9, "filesize"); ++ EDBUG(9, "fileinode"); + if ((!s) || (!*s)) + EDBUG_RETURN(0); + if (stat(s, &st) < 0) +@@ -313,7 +313,7 @@ + { + struct stat st; + +- EDBUG(9, "filesize"); ++ EDBUG(9, "filedev"); + if ((!s) || (!*s)) + EDBUG_RETURN(0); + if (stat(s, &st) < 0) +diff -Nur enlightenment-0.16.7.1.orig/src/misc.c enlightenment-0.16.7.1/src/misc.c +--- enlightenment-0.16.7.1.orig/src/misc.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/misc.c 2004-10-01 01:30:25.558016992 +0200 +@@ -76,6 +76,13 @@ + return ENLIGHTENMENT_ROOT; + } + ++const char * ++EDirConf(void) ++{ ++ return ENLIGHTENMENT_CONF; ++} ++ ++ + void + EDirUserSet(const char *d) + { +diff -Nur enlightenment-0.16.7.1.orig/src/setup.c enlightenment-0.16.7.1/src/setup.c +--- enlightenment-0.16.7.1.orig/src/setup.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/setup.c 2004-10-01 01:26:45.939404096 +0200 +@@ -568,6 +568,7 @@ + { + char s[1024]; + ++ // EDirConf ? + Esetenv("EVERSION", ENLIGHTENMENT_VERSION, 1); + Esetenv("EROOT", EDirRoot(), 1); + Esetenv("EBIN", EDirBin(), 1); diff --git a/enlightenment-check_menus.patch b/enlightenment-check_menus.patch new file mode 100644 index 0000000..c1e45da --- /dev/null +++ b/enlightenment-check_menus.patch @@ -0,0 +1,40 @@ +diff -Nur enlightenment-0.16.7.1/src/main.c enlightenment-0.16.7.1.new/src/main.c +--- enlightenment-0.16.7.1/src/main.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1.new/src/main.c 2004-10-08 20:09:24.000000000 +0200 +@@ -361,7 +361,11 @@ + + SetupUserInitialization(); + if (Mode.firsttime) +- runDocBrowser(); ++ { ++ runDocBrowser(); ++ } else { ++ checkMenu(); ++ } + + #if 0 /* Not if AAA */ + Mode.wm.startup = 1; +diff -Nur enlightenment-0.16.7.1/src/setup.c enlightenment-0.16.7.1.new/src/setup.c +--- enlightenment-0.16.7.1/src/setup.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1.new/src/setup.c 2004-10-09 15:02:42.060368144 +0200 +@@ -800,3 +800,20 @@ + EDBUG_RETURN_; + + } ++ ++void ++checkMenu(void) ++{ ++ FILE *f; ++ char file[FILEPATH_LEN_MAX]; ++ ++ EDBUG(3, "checkMenu"); ++ ++ if (fork()) ++ EDBUG_RETURN_; ++ Esnprintf(file, sizeof(file), "exec %s/scripts/e_check_menu", EDirRoot()); ++ execl(usershell(getuid()), usershell(getuid()), "-c", (char *)file, ++ NULL); ++ ++ EDBUG_RETURN_; ++} diff --git a/enlightenment-e_check_menu b/enlightenment-e_check_menu new file mode 100644 index 0000000..a5db172 --- /dev/null +++ b/enlightenment-e_check_menu @@ -0,0 +1,17 @@ +#!/bin/sh + +EDirUser=$HOME/.enlightenment +[ -d $EDirUser ] || exit 1 +EDirRoot=/usr/share/enlightenment + + +[ "$LANG" != "$(cat $EDirUser/menus/lang)" ] && \ + $EDirRoot/scripts/e_gen_menu && exit + + +MD5=$(find /usr/share/applications/ -name "*.desktop" \ + -exec cat "{}" ";" | md5sum) + +[ "$MD5" != "$(cat $EDirUser/menus/md5)" ] && \ + $EDirRoot/scripts/e_gen_menu + diff --git a/enlightenment-e_gen_menu b/enlightenment-e_gen_menu new file mode 100644 index 0000000..84a400b --- /dev/null +++ b/enlightenment-e_gen_menu @@ -0,0 +1,64 @@ +#!/bin/sh + +EDirUser=$HOME/.enlightenment +[ -d $EDirUser ] || exit 1 + + +DIALOG_ID= +e_dialog() { +if [ "$1" == "msg" ]; then + msg="$(echo "$2" | tr '&' '\n' )" + [ "$DIALOG_ID" != "" ] && \ + eesh -e "win_op $DIALOG_ID close" + eesh -e "dialog_ok $msg" + DIALOG_ID=$( eesh -ewait "window_list" | \ + grep $(gettext -d enlightenment Message) \ + | cut -f1 -d\ | head -n1 ) +elif [ "$1" == "title" ]; then + eesh -e "win_op $DIALOG_ID title $2" & + # don't use it to much: sigfault +fi +} + +deskmd5() { +find /usr/share/applications/ -name "*.desktop" \ + -exec cat "{}" ";" | md5sum > $EDirUser/menus/md5 +} + +SPACE=" " +e_dialog msg ".${SPACE}Please Wait.${SPACE}." +e_dialog title "Menus are being generated..." + +rm -rf $EDirUser/menus.old{,menu} +mv $EDirUser/menus{,.oldmenu} +mkdir $EDirUser/menus + + +#core +vfmg -i -f -c -s --xterm='Eterm --name %1 --exec %2' enlightenment + +#vim: ' + +rm -rf $EDirUser/menus.old +mv -f $EDirUser/file.menu{,.oldmenu} +ln -s menus/Applications.menu $EDirUser/file.menu + +if [ ! -r $EDirUser/file.menu -o \ + $(ls $EDirUser/menus | wc -l) -lt 5 ]; then + + rm -rf $EDirUser/menus + mv $EDirUser/menus{.oldmenu,} + mv -f $EDirUser/file.menu{.oldmenu,} + + e_dialog msg ".${SPACE}Something went wrong !${SPACE}.&Old menus reverted." +else + rm -rf $EDirUser/menus.oldmenu + rm -f $EDirUser/file.menu.oldmenu + + e_dialog msg ".${SPACE}Seems to be OK.${SPACE}.&Old menus deleted." + echo "$LANG" > $EDirUser/menus/lang + deskmd5 & +fi + +eesh -e 'reload_menus' +e_dialog title "Menu generation complete." diff --git a/enlightenment-edirconf.patch b/enlightenment-edirconf.patch new file mode 100644 index 0000000..7ca624f --- /dev/null +++ b/enlightenment-edirconf.patch @@ -0,0 +1,108 @@ +diff -Nur enlightenment-0.16.7.1.orig/src/config.c enlightenment-0.16.7.1/src/config.c +--- enlightenment-0.16.7.1.orig/src/config.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/config.c 2004-10-01 01:32:53.715493632 +0200 +@@ -3348,7 +3348,7 @@ + i++; + } + Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef " +- "-include %s/config/definitions " "-I%s " "-I%s/config " ++ "-include %s/definitions " "-I%s " "-I%s " + "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s " + "-D ENLIGHTENMENT_BIN=%s " + "-D ENLIGHTENMENT_THEME=%s " "-D ECONFDIR=%s " +@@ -3357,7 +3357,7 @@ + "-D SCREEN_DEPTH_%i=1 " "-D USER_NAME=%s " "-D HOME_DIR=%s " + "-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 " + "%s %s/cached/cfg/%s.preparsed", +- epp_path, EDirRoot(), themepath, EDirRoot(), ++ epp_path, EDirConf(), themepath, EDirConf(), + ENLIGHTENMENT_VERSION, EDirRoot(), EDirBin(), + themepath, EDirUser(), EDirUserCache(), VRoot.w, VRoot.h, + VRoot.w, VRoot.h, VRoot.depth, def_user, def_home, def_shell, +@@ -3586,7 +3586,7 @@ + EDBUG_RETURN(Estrdup(s)); + + /* look in system config dir */ +- Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file); ++ Esnprintf(s, sizeof(s), "%s/%s", EDirConf(), file); + if (findLocalizedFile(s) || isfile(s)) + EDBUG_RETURN(Estrdup(s)); + +@@ -3615,7 +3615,7 @@ + EDBUG_RETURN(Estrdup(s)); + + /* look in system config dir */ +- Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file); ++ Esnprintf(s, sizeof(s), "%s/%s", EDirConf(), file); + if (findLocalizedFile(s) || isfile(s)) + EDBUG_RETURN(Estrdup(s)); + +@@ -3692,7 +3692,7 @@ + EDBUG(5, "LoadEConfig"); + + Esnprintf(s, sizeof(s), "%s/", EDirUser()); +- Esnprintf(s, sizeof(s), "%s/config/", EDirRoot()); ++ Esnprintf(s, sizeof(s), "%s/", EDirConf()); + + /* save the current theme */ + if ((themelocation) && (themelocation[0] != 0)) +diff -Nur enlightenment-0.16.7.1.orig/src/E.h enlightenment-0.16.7.1/src/E.h +--- enlightenment-0.16.7.1.orig/src/E.h 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/E.h 2004-10-01 01:23:11.338028464 +0200 +@@ -2381,6 +2381,7 @@ + + /* misc.c */ + void BlumFlimFrub(void); ++const char *EDirConf(void); + const char *EDirRoot(void); + const char *EDirBin(void); + void EDirUserSet(const char *d); +diff -Nur enlightenment-0.16.7.1.orig/src/file.c enlightenment-0.16.7.1/src/file.c +--- enlightenment-0.16.7.1.orig/src/file.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/file.c 2004-10-01 01:30:04.091280432 +0200 +@@ -300,7 +300,7 @@ + { + struct stat st; + +- EDBUG(9, "filesize"); ++ EDBUG(9, "fileinode"); + if ((!s) || (!*s)) + EDBUG_RETURN(0); + if (stat(s, &st) < 0) +@@ -313,7 +313,7 @@ + { + struct stat st; + +- EDBUG(9, "filesize"); ++ EDBUG(9, "filedev"); + if ((!s) || (!*s)) + EDBUG_RETURN(0); + if (stat(s, &st) < 0) +diff -Nur enlightenment-0.16.7.1.orig/src/misc.c enlightenment-0.16.7.1/src/misc.c +--- enlightenment-0.16.7.1.orig/src/misc.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/misc.c 2004-10-01 01:30:25.558016992 +0200 +@@ -76,6 +76,13 @@ + return ENLIGHTENMENT_ROOT; + } + ++const char * ++EDirConf(void) ++{ ++ return ENLIGHTENMENT_CONF; ++} ++ ++ + void + EDirUserSet(const char *d) + { +diff -Nur enlightenment-0.16.7.1.orig/src/setup.c enlightenment-0.16.7.1/src/setup.c +--- enlightenment-0.16.7.1.orig/src/setup.c 2004-08-20 23:35:46.000000000 +0200 ++++ enlightenment-0.16.7.1/src/setup.c 2004-10-01 01:26:45.939404096 +0200 +@@ -568,6 +568,7 @@ + { + char s[1024]; + ++ // EDirConf ? + Esetenv("EVERSION", ENLIGHTENMENT_VERSION, 1); + Esetenv("EROOT", EDirRoot(), 1); + Esetenv("EBIN", EDirBin(), 1); diff --git a/enlightenment-no_eng_config.patch b/enlightenment-no_eng_config.patch new file mode 100644 index 0000000..5c77aef --- /dev/null +++ b/enlightenment-no_eng_config.patch @@ -0,0 +1,100 @@ +diff -Nur enlightenment-0.16.7.1.orig/config/ja/menus.cfg.ja enlightenment-0.16.7.1/config/ja/menus.cfg.ja +--- enlightenment-0.16.7.1.orig/config/ja/menus.cfg.ja 2000-01-31 23:34:32.000000000 +0100 ++++ enlightenment-0.16.7.1/config/ja/menus.cfg.ja 2004-10-07 00:38:08.737748424 +0200 +@@ -70,15 +70,15 @@ + + BEGIN_NEW_MENU("MAINT_SUBMENU", "ROOT") + ADD_MENU_TITLE("Enlightenment¤Î¥á¥¤¥ó¥Æ¥Ê¥ó¥¹") +-ADD_MENU_TEXT_ITEM("ÀßÄê¥Õ¥¡¥¤¥ë¥­¥ã¥Ã¥·¥å¤Î¥¯¥ê¥¢", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean config") +-ADD_MENU_TEXT_ITEM("¥Ú¡¼¥¸¥ã¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥­¥ã¥Ã¥·¥å¤Î¥¯¥ê¥¢", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean pager") +-ADD_MENU_TEXT_ITEM("ÇØ·Ê¥»¥ì¥¯¥¿¥­¥ã¥Ã¥·¥å¤Î¥¯¥ê¥¢", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean bgsel") +-ADD_MENU_TEXT_ITEM("¤¹¤Ù¤Æ¤Î¥­¥ã¥Ã¥·¥å¤ò¥¯¥ê¥¢", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean all") +-ADD_MENU_TEXT_ITEM("ÀßÄê¥Õ¥¡¥¤¥ë¥­¥ã¥Ã¥·¥åÍøÍѾõ¶·", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query config") +-ADD_MENU_TEXT_ITEM("¥Ú¡¼¥¸¥ã¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥­¥ã¥Ã¥·¥åÍøÍѾõ¶·", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query pager") +-ADD_MENU_TEXT_ITEM("ÇØ·Ê¥»¥ì¥¯¥¿¥­¥ã¥Ã¥·¥åÍøÍѾõ¶·", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query bgsel") +-ADD_MENU_TEXT_ITEM("¤¹¤Ù¤Æ¤Î¥­¥ã¥Ã¥·¥å¤ÎÍøÍѾõ¶·", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query all") +-ADD_MENU_TEXT_ITEM("¥á¥Ë¥å¡¼¤òºÆ¹½À®", __A_EXEC, ENLIGHTENMENT_BIN"/e_gen_menu") ++ADD_MENU_TEXT_ITEM("ÀßÄê¥Õ¥¡¥¤¥ë¥­¥ã¥Ã¥·¥å¤Î¥¯¥ê¥¢", __A_EXEC, E_SCRIPTS_DIR"/e_cache_clean config") ++ADD_MENU_TEXT_ITEM("¥Ú¡¼¥¸¥ã¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥­¥ã¥Ã¥·¥å¤Î¥¯¥ê¥¢", __A_EXEC, E_SCRIPTS_DIR"/e_cache_clean pager") ++ADD_MENU_TEXT_ITEM("ÇØ·Ê¥»¥ì¥¯¥¿¥­¥ã¥Ã¥·¥å¤Î¥¯¥ê¥¢", __A_EXEC, E_SCRIPTS_DIR"/e_cache_clean bgsel") ++ADD_MENU_TEXT_ITEM("¤¹¤Ù¤Æ¤Î¥­¥ã¥Ã¥·¥å¤ò¥¯¥ê¥¢", __A_EXEC, E_SCRIPTS_DIR"/e_cache_clean all") ++ADD_MENU_TEXT_ITEM("ÀßÄê¥Õ¥¡¥¤¥ë¥­¥ã¥Ã¥·¥åÍøÍѾõ¶·", __A_EXEC, E_SCRIPTS_DIR"/e_cache_query config") ++ADD_MENU_TEXT_ITEM("¥Ú¡¼¥¸¥ã¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥­¥ã¥Ã¥·¥åÍøÍѾõ¶·", __A_EXEC, E_SCRIPTS_DIR"/e_cache_query pager") ++ADD_MENU_TEXT_ITEM("ÇØ·Ê¥»¥ì¥¯¥¿¥­¥ã¥Ã¥·¥åÍøÍѾõ¶·", __A_EXEC, E_SCRIPTS_DIR"/e_cache_query bgsel") ++ADD_MENU_TEXT_ITEM("¤¹¤Ù¤Æ¤Î¥­¥ã¥Ã¥·¥å¤ÎÍøÍѾõ¶·", __A_EXEC, E_SCRIPTS_DIR"/e_cache_query all") ++ADD_MENU_TEXT_ITEM("¥á¥Ë¥å¡¼¤òºÆ¹½À®", __A_EXEC, E_SCRIPTS_DIR"/e_gen_menu") + END_MENU + + /* dont need this anymore - will have a scritp soon to do it all +@@ -121,9 +121,9 @@ + ADD_MENU_SUBMENU_TEXT_ITEM("ÀßÄê", "CONFIG_SUBMENU") + ADD_MENU_SUBMENU_TEXT_ITEM("¥Æ¡¼¥Þ", "THEMES_SUBMENU") + ADD_MENU_SUBMENU_TEXT_ITEM("¥á¥¤¥ó¥Æ¥Ê¥ó¥¹", "MAINT_SUBMENU") +-ADD_MENU_TEXT_ITEM("¥Ø¥ë¥×", __A_EXEC, ENLIGHTENMENT_BIN"/dox" $EROOT"/E-docs") ++ADD_MENU_TEXT_ITEM("¥Ø¥ë¥×", __A_EXEC, ENLIGHTENMENT_BIN"/edox" $EROOT"/E-docs") + ADD_MENU_TEXT_ITEM("Enlightenment¤Ë¤Ä¤¤¤Æ", __A_ABOUT, "") +-ADD_MENU_TEXT_ITEM("¤³¤Î¥Æ¡¼¥Þ¤Ë¤Ä¤¤¤Æ", __A_EXEC, ENLIGHTENMENT_BIN"/dox" $ETHEME"/ABOUT") ++ADD_MENU_TEXT_ITEM("¤³¤Î¥Æ¡¼¥Þ¤Ë¤Ä¤¤¤Æ", __A_EXEC, ENLIGHTENMENT_BIN"/edox" $ETHEME"/ABOUT") + ADD_MENU_TEXT_ITEM("Enlightenment¤ÎºÆµ¯Æ°",__A_EXIT, "restart") + ADD_MENU_TEXT_ITEM("¥í¥°¥¢¥¦¥È", __A_EXIT, "logout") + END_MENU +diff -Nur enlightenment-0.16.7.1.orig/config/Makefile.am enlightenment-0.16.7.1/config/Makefile.am +--- enlightenment-0.16.7.1.orig/config/Makefile.am 2004-10-07 00:09:53.009538296 +0200 ++++ enlightenment-0.16.7.1/config/Makefile.am 2004-10-07 00:41:11.288996416 +0200 +@@ -16,14 +16,13 @@ + + configdatadir = $(sysconfdir) + +-TRANSLATIONS = config.ja config.pl config.ko ++TRANSLATIONS = ja ko pl + EXTRA_DIST = $(sysconf_DATA) $(TRANSLATIONS) strings.c + + install-data-local: + $(mkinstalldirs) $(DESTDIR)$(configdatadir) + for f in $(TRANSLATIONS); do \ +- gzip -d -c < $(srcdir)/$$f | \ +- (cd $(DESTDIR)$(configdatadir); tar -xmf -) \ ++ cp $(srcdir)/$$f/* $(DESTDIR)$(configdatadir); \ + done + + uninstall-local: +diff -Nur enlightenment-0.16.7.1.orig/config/pl/menus.cfg.pl enlightenment-0.16.7.1/config/pl/menus.cfg.pl +--- enlightenment-0.16.7.1.orig/config/pl/menus.cfg.pl 2001-08-16 15:28:34.000000000 +0200 ++++ enlightenment-0.16.7.1/config/pl/menus.cfg.pl 2004-10-07 00:37:44.051501304 +0200 +@@ -60,15 +60,15 @@ + + BEGIN_NEW_MENU("MAINT_SUBMENU", "ROOT") + ADD_MENU_TITLE("Konserwacja Enlightenment") +-ADD_MENU_TEXT_ITEM("Wyczy¶æ cache plików konfiguracyjnych", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean.pl config") +-ADD_MENU_TEXT_ITEM("Wyczy¶æ cache z t³ami Podgl±du Pulpitu", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean.pl pager") +-ADD_MENU_TEXT_ITEM("Wyczy¶æ cache z wyborem t³a", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean.pl bgsel") +-ADD_MENU_TEXT_ITEM("Wyczy¶æ wszystkie cache", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean.pl all") +-ADD_MENU_TEXT_ITEM("Podaj zu¿ycie pamiêci przez cache plików konfiguracyjnych", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query.pl config") +-ADD_MENU_TEXT_ITEM("Podaj zu¿ycie pamiêci przez cache z t³ami Podgl±du Pulpitu", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query.pl pager") +-ADD_MENU_TEXT_ITEM("Podaj zu¿ycie pamiêci przez cache z wyborem t³a", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query.pl bgsel") +-ADD_MENU_TEXT_ITEM("Podaj zu¿ycie pamiêci przez wszystkie cache", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query.pl all") +-ADD_MENU_TEXT_ITEM("Regeneracja Menu", __A_EXEC, ENLIGHTENMENT_BIN"/e_gen_menu.pl") ++ADD_MENU_TEXT_ITEM("Wyczy¶æ cache plików konfiguracyjnych", __A_EXEC, E_SCRIPTS_DIR"/e_cache_clean config") ++ADD_MENU_TEXT_ITEM("Wyczy¶æ cache z t³ami Podgl±du Pulpitu", __A_EXEC, E_SCRIPTS_DIR"/e_cache_clean pager") ++ADD_MENU_TEXT_ITEM("Wyczy¶æ cache z wyborem t³a", __A_EXEC, E_SCRIPTS_DIR"/e_cache_clean bgsel") ++ADD_MENU_TEXT_ITEM("Wyczy¶æ wszystkie cache", __A_EXEC, E_SCRIPTS_DIR"/e_cache_clean all") ++ADD_MENU_TEXT_ITEM("Podaj zu¿ycie pamiêci przez cache plików konfiguracyjnych", __A_EXEC, E_SCRIPTS_DIR"/e_cache_query config") ++ADD_MENU_TEXT_ITEM("Podaj zu¿ycie pamiêci przez cache z t³ami Podgl±du Pulpitu", __A_EXEC, E_SCRIPTS_DIR"/e_cache_query pager") ++ADD_MENU_TEXT_ITEM("Podaj zu¿ycie pamiêci przez cache z wyborem t³a", __A_EXEC, E_SCRIPTS_DIR"/e_cache_query bgsel") ++ADD_MENU_TEXT_ITEM("Podaj zu¿ycie pamiêci przez wszystkie cache", __A_EXEC, E_SCRIPTS_DIR"/e_cache_query all") ++ADD_MENU_TEXT_ITEM("Regeneracja Menu", __A_EXEC, E_SCRIPTS_DIR"/e_gen_menu") + END_MENU + + /* dont need this anymore - will have a scritp soon to do it all +@@ -112,9 +112,9 @@ + ADD_MENU_SUBMENU_TEXT_ITEM("Ustawienia", "CONFIG_SUBMENU") + ADD_MENU_SUBMENU_TEXT_ITEM("Wystroje", "THEMES_SUBMENU") + ADD_MENU_SUBMENU_TEXT_ITEM("Konserwacja", "MAINT_SUBMENU") +-ADD_MENU_TEXT_ITEM("Pomoc", __A_EXEC, ENLIGHTENMENT_BIN"/dox" $EROOT"/E-docs") ++ADD_MENU_TEXT_ITEM("Pomoc", __A_EXEC, ENLIGHTENMENT_BIN"/edox" $EROOT"/E-docs") + ADD_MENU_TEXT_ITEM("O Enlightenment", __A_ABOUT, "") +-ADD_MENU_TEXT_ITEM("O tym wystroju", __A_EXEC, ENLIGHTENMENT_BIN"/dox" $ETHEME"/ABOUT") ++ADD_MENU_TEXT_ITEM("O tym wystroju", __A_EXEC, ENLIGHTENMENT_BIN"/edox" $ETHEME"/ABOUT") + ADD_MENU_TEXT_ITEM("Restartuj Enlightenment", __A_EXIT, "restart") + ADD_MENU_TEXT_ITEM("Wyloguj siê", __A_EXIT, "logout") + END_MENU -- 2.43.0