diff options
Diffstat (limited to 'packages/e17/e-wm')
| -rw-r--r-- | packages/e17/e-wm/applications.menu | 5 | ||||
| -rw-r--r-- | packages/e17/e-wm/enlightenment_start.oe | 8 | ||||
| -rw-r--r-- | packages/e17/e-wm/pkgconfig-fix.patch | 18 | ||||
| -rw-r--r-- | packages/e17/e-wm/profile-search.patch | 41 |
4 files changed, 70 insertions, 2 deletions
diff --git a/packages/e17/e-wm/applications.menu b/packages/e17/e-wm/applications.menu index e163864acf..9cd933a240 100644 --- a/packages/e17/e-wm/applications.menu +++ b/packages/e17/e-wm/applications.menu @@ -62,9 +62,10 @@ <Name>Settings</Name> <Directory>Settings.directory</Directory> <Include> - <And> + <Or> <Category>SystemSettings</Category> - </And> + <Category>Settings</Category> + </Or> </Include> </Menu> diff --git a/packages/e17/e-wm/enlightenment_start.oe b/packages/e17/e-wm/enlightenment_start.oe new file mode 100644 index 0000000000..7d472fa76f --- /dev/null +++ b/packages/e17/e-wm/enlightenment_start.oe @@ -0,0 +1,8 @@ +#!/bin/sh + +E_PROFILE="" +if [ -r /etc/enlightenment/default_profile ]; then + . /etc/enlightenment/default_profile +fi + +exec enlightenment_start $E_PROFILE diff --git a/packages/e17/e-wm/pkgconfig-fix.patch b/packages/e17/e-wm/pkgconfig-fix.patch new file mode 100644 index 0000000000..9ea929da27 --- /dev/null +++ b/packages/e17/e-wm/pkgconfig-fix.patch @@ -0,0 +1,18 @@ +Index: enlightenment.pc.in +=================================================================== +--- enlightenment.pc.in.orig 2008-03-28 22:33:51.000000000 +0100 ++++ enlightenment.pc.in 2008-03-29 17:22:30.000000000 +0100 +@@ -1,11 +1,12 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/@PACKAGE@ + + Name: enlightenment + Description: Enlightenmnt Window Manager + Version: @VERSION@ ++Requires: efreet >= 0.0.3.042 + Libs: @libdir@/@PACKAGE@/modules + Libs.private: + Cflags: -I${includedir} diff --git a/packages/e17/e-wm/profile-search.patch b/packages/e17/e-wm/profile-search.patch new file mode 100644 index 0000000000..7f3e9e2e29 --- /dev/null +++ b/packages/e17/e-wm/profile-search.patch @@ -0,0 +1,41 @@ +? .e_border.c.swn +? .e_border.c.swo +? .e_border.c.swp +? .e_border.h.swp +? .e_config.c.swp +? .e_int_menus.c.swp +? .e_main.c.swp +? .e_popup.c.swp +? .e_prefix.c.swp +? .e_shelf.c.swo +? .e_shelf.c.swp +Index: e_config.c +=================================================================== +RCS file: /var/cvs/e/e17/apps/e/src/bin/e_config.c,v +retrieving revision 1.282 +diff -u -r1.282 e_config.c +--- e/src/bin/e_config.c 20 Feb 2008 04:12:58 -0000 1.282 ++++ e/src/bin/e_config.c 31 Mar 2008 01:57:00 -0000 +@@ -1827,7 +1827,22 @@ + { + data = eet_data_read(ef, edd, "config"); + eet_close(ef); ++ return data; + } ++ ++ /* fallback to a system directory ++ * FIXME proper $PATH like handling might be wanted ++ */ ++ snprintf(buf, sizeof(buf), "%s/data/config/%s/%s.cfg", ++ e_prefix_data_get(), _e_config_profile, domain); ++ ef = eet_open(buf, EET_FILE_MODE_READ); ++ if (ef) ++ { ++ data = eet_data_read(ef, edd, "config"); ++ eet_close(ef); ++ return data; ++ } ++ + return data; + } + |