summaryrefslogtreecommitdiff
path: root/packages/e17
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-09-30 17:59:20 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-30 17:59:20 +0000
commit7e5e0be1af62584244662daa1989ffd8206c7298 (patch)
tree6eade7dca695f1668a509a7debde9aae887b9ff0 /packages/e17
parent206647fb6ccf68137a2793c913053579f4553244 (diff)
e17, efl: major upgrade to newer versions
- Upgraded shapshot-based packages to newest released snapshots - Upgraded CVS-based packages to use a newer date - Moved e and e-wm to use snapshots as a default instead of CVS - Updated patches to work with newer versions - Added patches to fix problems introduced in newer versions - Added a patch to disable the splash for e-wm (causes a segfault) - entrance now uses ecore_config instead of edb - Added pulling of m4 directories for a few packages and running of aclocal due to autotools problems - elitaire currently does not compile, removed from e-image
Diffstat (limited to 'packages/e17')
-rw-r--r--packages/e17/e-iconbar_20050926.bb (renamed from packages/e17/e-iconbar_20050810.bb)0
-rw-r--r--packages/e17/e-modules_20050926.bb (renamed from packages/e17/e-modules_20050810.bb)0
-rw-r--r--packages/e17/e-utils_20050926.bb (renamed from packages/e17/e-utils_20050810.bb)0
-rw-r--r--packages/e17/e-wm/disable-splash.patch11
-rw-r--r--packages/e17/e-wm/fix-configure.patch35
-rw-r--r--packages/e17/e-wm_0.16.999.015.bb46
-rw-r--r--packages/e17/e-wm_20050926.bb (renamed from packages/e17/e-wm_20050810.bb)2
-rw-r--r--packages/e17/eclair_20050926.bb (renamed from packages/e17/eclair_20050810.bb)0
-rw-r--r--packages/e17/engage_20050926.bb (renamed from packages/e17/engage_20050810.bb)0
-rw-r--r--packages/e17/entice_20050926.bb (renamed from packages/e17/entice_20050810.bb)0
-rw-r--r--packages/e17/entrance/config-db.patch101
-rw-r--r--packages/e17/entrance/use-bash.patch9
-rw-r--r--packages/e17/entrance_20050926.bb (renamed from packages/e17/entrance_20050810.bb)0
-rw-r--r--packages/e17/evidence_20050926.bb (renamed from packages/e17/evidence_20050810.bb)0
-rw-r--r--packages/e17/examine_20050926.bb (renamed from packages/e17/examine_20050810.bb)0
15 files changed, 124 insertions, 80 deletions
diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050926.bb
index f0ca322f96..f0ca322f96 100644
--- a/packages/e17/e-iconbar_20050810.bb
+++ b/packages/e17/e-iconbar_20050926.bb
diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050926.bb
index 9ab3330c97..9ab3330c97 100644
--- a/packages/e17/e-modules_20050810.bb
+++ b/packages/e17/e-modules_20050926.bb
diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050926.bb
index 4d0ba6fa73..4d0ba6fa73 100644
--- a/packages/e17/e-utils_20050810.bb
+++ b/packages/e17/e-utils_20050926.bb
diff --git a/packages/e17/e-wm/disable-splash.patch b/packages/e17/e-wm/disable-splash.patch
new file mode 100644
index 0000000000..152a0a2895
--- /dev/null
+++ b/packages/e17/e-wm/disable-splash.patch
@@ -0,0 +1,11 @@
+--- enlightenment-0.16.999.015/src/bin/e_config.c~ 2005-09-22 20:50:16.000000000 -0700
++++ enlightenment-0.16.999.015/src/bin/e_config.c 2005-09-30 10:51:02.000000000 -0700
+@@ -377,7 +377,7 @@
+ /* DEFAULT CONFIG */
+ e_config = E_NEW(E_Config, 1);
+ e_config->config_version = E_CONFIG_FILE_VERSION;
+- e_config->show_splash = 1;
++ e_config->show_splash = 0;
+ e_config->desktop_default_background = strdup("");
+ e_config->desktop_default_name = strdup("Desktop %i, %i");
+ e_config->menus_scroll_speed = 1000.0;
diff --git a/packages/e17/e-wm/fix-configure.patch b/packages/e17/e-wm/fix-configure.patch
index d2ee47e014..02560fd7ab 100644
--- a/packages/e17/e-wm/fix-configure.patch
+++ b/packages/e17/e-wm/fix-configure.patch
@@ -1,10 +1,6 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- e/configure.in~fix-configure.patch
-+++ e/configure.in
+diff -Nur e~/configure.in e/configure.in
+--- e~/configure.in 2005-09-29 13:17:29.000000000 -0700
++++ e/configure.in 2005-09-29 13:19:35.000000000 -0700
@@ -114,9 +114,7 @@
AC_PATH_XTRA
AC_CHECK_HEADER(X11/X.h,
@@ -16,8 +12,9 @@
],[
AC_MSG_ERROR([Cannot find X headers and libraries.])
]
---- e/src/bin/Makefile.am~fix-configure.patch
-+++ e/src/bin/Makefile.am
+diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am
+--- e~/src/bin/Makefile.am 2005-09-29 13:17:29.000000000 -0700
++++ e/src/bin/Makefile.am 2005-09-29 13:19:35.000000000 -0700
@@ -1,6 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(includedir) \
@@ -26,18 +23,20 @@
-I$(top_srcdir)/src/bin \
-I$(top_srcdir)/src/lib \
@e_cflags@ \
---- e/src/lib/Makefile.am~fix-configure.patch
-+++ e/src/lib/Makefile.am
+diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am
+--- e~/src/lib/Makefile.am 2005-09-29 13:17:29.000000000 -0700
++++ e/src/lib/Makefile.am 2005-09-29 13:19:56.000000000 -0700
@@ -1,6 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(includedir) \
- -I$(top_srcdir)/src/bin \
+INCLUDES = -I$(top_srcdir)/src/bin \
- @ecore_cflags@ \
- @evas_cflags@
+ @e_cflags@
---- e/src/preload/Makefile.am~fix-configure.patch
-+++ e/src/preload/Makefile.am
+ lib_LTLIBRARIES = libe.la
+diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am
+--- e~/src/preload/Makefile.am 2005-09-29 13:17:29.000000000 -0700
++++ e/src/preload/Makefile.am 2005-09-29 13:19:35.000000000 -0700
@@ -2,7 +2,6 @@
INCLUDES = -I. \
@@ -46,9 +45,3 @@
-I$(top_srcdir)src/preload \
@x_cflags@
pkgdir = $(libdir)/enlightenment/preload
---- e/src/Makefile.am~fix-configure.patch
-+++ e/src/Makefile.am
-@@ -1,2 +1,2 @@
- MAINTAINERCLEANFILES = Makefile.in
--SUBDIRS = bin modules lib preload
-+SUBDIRS = bin modules preload
diff --git a/packages/e17/e-wm_0.16.999.015.bb b/packages/e17/e-wm_0.16.999.015.bb
new file mode 100644
index 0000000000..51d20ca387
--- /dev/null
+++ b/packages/e17/e-wm_0.16.999.015.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r3"
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \
+ file://fix-configure.patch;patch=1 \
+ file://remove-large-fonts.patch;patch=1 \
+ file://disable-splash.patch;patch=1 \
+ file://Xsession.d/98enlightenment \
+ http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \
+ http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \
+ http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \
+ http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1"
+
+S = "${WORKDIR}/enlightenment-${PV}"
+
+inherit autotools
+
+PROFILE = "LORES_PDA"
+PROFILE_c7x0 = "HIRES_PDA"
+PROFILE_tosa = "HIRES_PDA"
+PROFILE_spitz = "HIRES_PDA"
+PROFILE_akita = "HIRES_PDA"
+
+EXTRA_OECONF = "--with-profile=${PROFILE} \
+ --with-edje-cc=${STAGING_BINDIR}/edje_cc \
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR}"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}"
+
+do_compile_prepend() {
+ mv "${WORKDIR}/default_entry.edc?rev=1.1" "${S}/data/themes/default_entry.edc"
+ mv "${WORKDIR}/focus.png?rev=1.1" "${S}/data/themes/images/focus.png"
+ mv "${WORKDIR}/entry.png?rev=1.1" "${S}/data/themes/images/entry.png"
+ mv "${WORKDIR}/entry_focus.png?rev=1.1" "${S}/data/themes/images/entry_focus.png"
+}
+
+do_install_append() {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
+}
diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050926.bb
index c6cbee4cd9..4f53a6e990 100644
--- a/packages/e17/e-wm_20050810.bb
+++ b/packages/e17/e-wm_20050926.bb
@@ -6,6 +6,8 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
CVSDATE = "${PV}"
PR = "r3"
+DEFAULT_PREFERENCE = "-1"
+
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
file://Xsession.d/98enlightenment \
file://fix-configure.patch;patch=1 \
diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050926.bb
index 7138f06f88..7138f06f88 100644
--- a/packages/e17/eclair_20050810.bb
+++ b/packages/e17/eclair_20050926.bb
diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050926.bb
index 077858d8eb..077858d8eb 100644
--- a/packages/e17/engage_20050810.bb
+++ b/packages/e17/engage_20050926.bb
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050926.bb
index 364e65cbbf..364e65cbbf 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050926.bb
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index 874231b95b..e1ea209001 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,61 +1,52 @@
---- entrance/data/config/build_config.sh.in~ 2005-08-15 23:24:39.000000000 -0700
-+++ entrance/data/config/build_config.sh.in 2005-08-15 23:25:15.000000000 -0700
+diff -Nur entrance~/data/config/build_config.sh.in entrance/data/config/build_config.sh.in
+--- entrance~/data/config/build_config.sh.in 2005-09-29 14:58:41.000000000 -0700
++++ entrance/data/config/build_config.sh.in 2005-09-29 15:01:04.000000000 -0700
@@ -3,7 +3,7 @@
rm -f $DB
# set auth to 1 for pam, 2 for shadow
--edb_ed $DB add /entrance/auth int @auth_mode@
-+edb_ed $DB add /entrance/auth int 0
+-ecore_config $DB set /entrance/auth int @auth_mode@
++ecore_config $DB set /entrance/auth int 0
# uncomment the below to enable experimental OpenGL hardware acceleration
- #edb_ed $DB add /entrance/engine int 1
-@@ -18,30 +18,30 @@
- #edb_ed $DB add /entrance/fonts/0/str str "/usr/share/fonts/truetype/"
- #edb_ed $DB add /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
- edb_ed $DB add /entrance/greeting/before str "Welcome to "
--edb_ed $DB add /entrance/greeting/after str ""
-+edb_ed $DB add /entrance/greeting/after str " e17/OE"
- edb_ed $DB add /entrance/session/count int 8
--edb_ed $DB add /entrance/session/0/session str "default"
-+edb_ed $DB add /entrance/session/0/session str "/etc/X11/Sessions/Default"
- edb_ed $DB add /entrance/session/0/title str "Default"
- edb_ed $DB add /entrance/session/0/icon str "default.png"
- edb_ed $DB add /entrance/session/1/icon str "enlightenment.png"
- edb_ed $DB add /entrance/session/1/title str "Enlightenment"
--edb_ed $DB add /entrance/session/1/session str "Enlightenment"
--edb_ed $DB add /entrance/session/2/session str "kde"
--edb_ed $DB add /entrance/session/2/title str "KDE"
--edb_ed $DB add /entrance/session/2/icon str "kde.png"
--edb_ed $DB add /entrance/session/3/session str "gnome"
--edb_ed $DB add /entrance/session/3/title str "Gnome"
--edb_ed $DB add /entrance/session/3/icon str "gnome.png"
--edb_ed $DB add /entrance/session/4/session str "blackbox"
--edb_ed $DB add /entrance/session/4/title str "Blackbox"
--edb_ed $DB add /entrance/session/4/icon str "blackbox.png"
--edb_ed $DB add /entrance/session/5/session str "sawfish"
--edb_ed $DB add /entrance/session/5/title str "Sawfish"
--edb_ed $DB add /entrance/session/5/icon str "default.png"
--edb_ed $DB add /entrance/session/6/session str "xfce"
--edb_ed $DB add /entrance/session/6/title str "XFce"
--edb_ed $DB add /entrance/session/6/icon str "xfce.png"
--edb_ed $DB add /entrance/session/7/session str "failsafe"
-+edb_ed $DB add /entrance/session/2/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/2/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/2/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/3/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/3/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/3/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/4/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/4/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/4/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/5/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/5/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/5/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/6/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/6/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/6/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/7/session str "/etc/X11/Sessions/Failsafe"
- edb_ed $DB add /entrance/session/7/title str "Failsafe"
- edb_ed $DB add /entrance/session/7/icon str "failsafe.png"
- edb_ed $DB add /entrance/system/reboot int 1
+ #ecore_config $DB set /entrance/engine int 1
+@@ -18,32 +18,17 @@
+ #ecore_config $DB set /entrance/fonts/0/str str "/usr/share/fonts/truetype/"
+ #ecore_config $DB set /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
+ ecore_config $DB set /entrance/greeting/before str "Welcome to"
+-ecore_config $DB set /entrance/greeting/after str ""
+-ecore_config $DB set /entrance/session/count int 8
+-ecore_config $DB set /entrance/session/0/session str "default"
++ecore_config $DB set /entrance/greeting/after str " e17/OE"
++ecore_config $DB set /entrance/session/count int 3
++ecore_config $DB set /entrance/session/0/session str "/etc/X11/Sessions/Default"
+ ecore_config $DB set /entrance/session/0/title str "Default"
+ ecore_config $DB set /entrance/session/0/icon str "default.png"
+ ecore_config $DB set /entrance/session/1/icon str "enlightenment.png"
+ ecore_config $DB set /entrance/session/1/title str "Enlightenment"
+-ecore_config $DB set /entrance/session/1/session str "Enlightenment"
+-ecore_config $DB set /entrance/session/2/session str "kde"
+-ecore_config $DB set /entrance/session/2/title str "KDE"
+-ecore_config $DB set /entrance/session/2/icon str "kde.png"
+-ecore_config $DB set /entrance/session/3/session str "gnome"
+-ecore_config $DB set /entrance/session/3/title str "Gnome"
+-ecore_config $DB set /entrance/session/3/icon str "gnome.png"
+-ecore_config $DB set /entrance/session/4/session str "blackbox"
+-ecore_config $DB set /entrance/session/4/title str "Blackbox"
+-ecore_config $DB set /entrance/session/4/icon str "blackbox.png"
+-ecore_config $DB set /entrance/session/5/session str "sawfish"
+-ecore_config $DB set /entrance/session/5/title str "Sawfish"
+-ecore_config $DB set /entrance/session/5/icon str "default.png"
+-ecore_config $DB set /entrance/session/6/session str "xfce"
+-ecore_config $DB set /entrance/session/6/title str "XFce"
+-ecore_config $DB set /entrance/session/6/icon str "xfce.png"
+-ecore_config $DB set /entrance/session/7/session str "failsafe"
+-ecore_config $DB set /entrance/session/7/title str "Failsafe"
+-ecore_config $DB set /entrance/session/7/icon str "failsafe.png"
++ecore_config $DB set /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment"
++ecore_config $DB set /entrance/session/2/session str "/etc/X11/Sessions/Failsafe"
++ecore_config $DB set /entrance/session/2/title str "Failsafe"
++ecore_config $DB set /entrance/session/2/icon str "failsafe.png"
+ ecore_config $DB set /entrance/system/reboot int 1
+ ecore_config $DB set /entrance/system/halt int 1
+ ecore_config $DB set /entrance/user/remember int 1
diff --git a/packages/e17/entrance/use-bash.patch b/packages/e17/entrance/use-bash.patch
index 4d3b2f4aae..5c6d1992c8 100644
--- a/packages/e17/entrance/use-bash.patch
+++ b/packages/e17/entrance/use-bash.patch
@@ -1,9 +1,10 @@
---- entrance/src/client/entrance_session.c.~1.71.~ 2005-05-28 02:31:14.000000000 -0700
-+++ entrance/src/client/entrance_session.c 2005-08-15 21:45:53.000000000 -0700
-@@ -451,7 +451,7 @@
+diff -Nur entrance~/src/client/entrance_session.c entrance/src/client/entrance_session.c
+--- entrance~/src/client/entrance_session.c 2005-09-29 15:03:26.000000000 -0700
++++ entrance/src/client/entrance_session.c 2005-09-29 15:04:11.000000000 -0700
+@@ -470,7 +470,7 @@
+ snprintf(buf, sizeof(buf), "%s/entrance_login %i", PACKAGE_BIN_DIR,
(int) pid);
}
- _entrance_session_user_list_fix(e);
- shell = strdup("/bin/sh");
+ shell = strdup("/bin/bash");
/* this bypasses a race condition where entrance loses its x
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050926.bb
index 1c27111f49..1c27111f49 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050926.bb
diff --git a/packages/e17/evidence_20050810.bb b/packages/e17/evidence_20050926.bb
index 0950b590c6..0950b590c6 100644
--- a/packages/e17/evidence_20050810.bb
+++ b/packages/e17/evidence_20050926.bb
diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050926.bb
index 244bf2bcaf..244bf2bcaf 100644
--- a/packages/e17/examine_20050810.bb
+++ b/packages/e17/examine_20050926.bb