[oe-commits] org.oe.dev e17 applications: catch up with EFL overhaul

mickeyl commit openembedded-commits at lists.openembedded.org
Thu Jun 21 04:03:54 UTC 2007 

e17 applications: catch up with EFL overhaul

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7d8469a5739bf08bfd65daa5875e347c6012f79a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7d8469a5739bf08bfd65daa5875e347c6012f79a
Files:
1
packages/e17/e-iconbar_20060128.bb
packages/e17/e17-gpe-menu-convert
packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh
packages/e17/e17-gpe-menu-convert_0.2.bb
packages/e17/e17genmenu_4.2.0.bb
packages/e17/eclair_20060128.bb
packages/e17/engage
packages/e17/engage/no-local-includes.patch
packages/e17/engage_20060128.bb
packages/e17/entice_20060128.bb
packages/e17/entrance-0.9.0.009
packages/e17/entrance-0.9.0.009/Xserver.patch
packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch
packages/e17/entrance-0.9.0.009/config-db.patch
packages/e17/entrance-0.9.0.009/disable-autodetect.patch
packages/e17/entrance-0.9.0.009/fix-auth-mode.patch
packages/e17/entrance-0.9.0.009/run-Xinit.patch
packages/e17/entrance-0.9.0.009/set-display-env.patch
packages/e17/entrance-0.9.0.009/use-bash.patch
packages/e17/entrance_0.9.0.007.bb
packages/e17/e-utils_20060501.bb
packages/e17/e-utils_cvs.bb
packages/e17/entice_20060416.bb
packages/e17/entice_cvs.bb
packages/e17/entrance_0.9.0.009.bb
packages/e17/entrance_0.9.0.010.bb
packages/e17/examine_20060128.bb
packages/e17/examine_cvs.bb
packages/e17/edje-viewer_cvs.bb
packages/e17/e-wm_0.16.999.038.bb
packages/e17/entrance/allow-missing-xsession.patch
packages/e17/entrance/config-db.patch
packages/e17/entrance/fix-auth-mode.patch
packages/e17/entrance/use-bash.patch
packages/e17/expedite_cvs.bb
Diffs:

#
# mt diff -r2cbc6468681897cbbedcd51a5e2937c018e28289 -r7d8469a5739bf08bfd65daa5875e347c6012f79a
#
# 
# 
# delete "packages/e17/e-iconbar_20060128.bb"
# 
# delete "packages/e17/e17-gpe-menu-convert"
# 
# delete "packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh"
# 
# delete "packages/e17/e17-gpe-menu-convert_0.2.bb"
# 
# delete "packages/e17/e17genmenu_4.2.0.bb"
# 
# delete "packages/e17/eclair_20060128.bb"
# 
# delete "packages/e17/engage"
# 
# delete "packages/e17/engage/no-local-includes.patch"
# 
# delete "packages/e17/engage_20060128.bb"
# 
# delete "packages/e17/entice_20060128.bb"
# 
# delete "packages/e17/entrance-0.9.0.009"
# 
# delete "packages/e17/entrance-0.9.0.009/Xserver.patch"
# 
# delete "packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch"
# 
# delete "packages/e17/entrance-0.9.0.009/config-db.patch"
# 
# delete "packages/e17/entrance-0.9.0.009/disable-autodetect.patch"
# 
# delete "packages/e17/entrance-0.9.0.009/fix-auth-mode.patch"
# 
# delete "packages/e17/entrance-0.9.0.009/run-Xinit.patch"
# 
# delete "packages/e17/entrance-0.9.0.009/set-display-env.patch"
# 
# delete "packages/e17/entrance-0.9.0.009/use-bash.patch"
# 
# delete "packages/e17/entrance_0.9.0.007.bb"
# 
# rename "packages/e17/e-utils_20060501.bb"
#     to "packages/e17/e-utils_cvs.bb"
# 
# rename "packages/e17/entice_20060416.bb"
#     to "packages/e17/entice_cvs.bb"
# 
# rename "packages/e17/entrance_0.9.0.009.bb"
#     to "packages/e17/entrance_0.9.0.010.bb"
# 
# rename "packages/e17/examine_20060128.bb"
#     to "packages/e17/examine_cvs.bb"
# 
# add_file "packages/e17/edje-viewer_cvs.bb"
#  content [2a7237f77298295dcb9a891068279c010aea803f]
# 
# patch "packages/e17/e-utils_cvs.bb"
#  from [1c0e8e1ad8b744f371f8032b01e4b3692f11028f]
#    to [e6eb282e49d65f3e06eb55ea717c134fba7af668]
# 
# patch "packages/e17/e-wm_0.16.999.038.bb"
#  from [86abf6bf45da23c274e976582b6f719bd4e113c8]
#    to [c1bd00d78c9f7e68324318cd985e7eece7665b23]
# 
# patch "packages/e17/entice_cvs.bb"
#  from [ea4dc6d61f4a7cad16ddd3757b7e8d757d2ff53b]
#    to [274be844e586453c60181c552aaf67eaa4ce68f0]
# 
# patch "packages/e17/entrance/allow-missing-xsession.patch"
#  from [02abda679337ce9becd68a0c493df1bef0328def]
#    to [ad77445f716412c7a649feee59f9721f0ad9edec]
# 
# patch "packages/e17/entrance/config-db.patch"
#  from [e6817ccf5f13e773ed84f2510ecb16a9ece0b1af]
#    to [9887c6c044756fb641b23234f76683c95434de2f]
# 
# patch "packages/e17/entrance/fix-auth-mode.patch"
#  from [b65bb71ef698292b2c24120dfc99bce3f44b8ebf]
#    to [33b1aeec44a8df2ae922d0d1aaa0ba038bb59a2a]
# 
# patch "packages/e17/entrance/use-bash.patch"
#  from [2e300aab2aee2ea75d61e05124354e3a4821cc4f]
#    to [92ccffd203d1550c573c4981a8404cdd36cc69cd]
# 
# patch "packages/e17/entrance_0.9.0.010.bb"
#  from [f886ed6787997b6406ae493f9f1e3cd4cb7e6bc5]
#    to [ed458d1dc2cf8825ad4757aebd77cb0b2b29e7db]
# 
# patch "packages/e17/examine_cvs.bb"
#  from [5f653ba17b7c1c25293b94ec5471545adbc0e3c1]
#    to [870495278ea331e527bb9645ba0d19caec0672c8]
# 
# patch "packages/e17/expedite_cvs.bb"
#  from [f2334d97060e91abd5523f4e0d01217ca224b60a]
#    to [bc914a4638fd17187a62865f8ef6eabe671cb56f]
# 
============================================================
--- packages/e17/edje-viewer_cvs.bb	2a7237f77298295dcb9a891068279c010aea803f
+++ packages/e17/edje-viewer_cvs.bb	2a7237f77298295dcb9a891068279c010aea803f
@@ -0,0 +1,12 @@
+DESCRIPTION = "Edje_Viewer is just that."
+DEPENDS = "etk"
+LICENSE = "MIT"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/apps/edje_viewer"
+S = "${WORKDIR}/edje_viewer"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
============================================================
--- packages/e17/e-utils_20060501.bb	1c0e8e1ad8b744f371f8032b01e4b3692f11028f
+++ packages/e17/e-utils_cvs.bb	e6eb282e49d65f3e06eb55ea717c134fba7af668
@@ -1,11 +1,12 @@ DESCRIPTION = "Enlightenment Window Mana
 DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 epsilon"
+DEPENDS = "eet evas ecore edje esmart ewl engrave"
 LICENSE = "MIT"
-PR = "r1"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
 
 inherit e
 
-SRC_URI = "${E_CVS};module=e17/apps/e_utils;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/apps/e_utils"
 S = "${WORKDIR}/e_utils"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
============================================================
--- packages/e17/e-wm_0.16.999.038.bb	86abf6bf45da23c274e976582b6f719bd4e113c8
+++ packages/e17/e-wm_0.16.999.038.bb	c1bd00d78c9f7e68324318cd985e7eece7665b23
@@ -1,7 +1,7 @@ DESCRIPTION = "E17 - the Enlightenment W
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
-DEPENDS = "evas-x11 ecore-x11 edje eet embryo efreet"
+DEPENDS = "eet evas ecore edje efreet"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 
 inherit e update-alternatives
 
@@ -28,8 +28,8 @@ do_compile_prepend() {
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/ ${libdir}/enlightenment/preload/.debug/"
 
 do_compile_prepend() {
-        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
+    find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+    find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
 }
 
 do_install_append() {
============================================================
--- packages/e17/entice_20060416.bb	ea4dc6d61f4a7cad16ddd3757b7e8d757d2ff53b
+++ packages/e17/entice_cvs.bb	274be844e586453c60181c552aaf67eaa4ce68f0
@@ -1,17 +1,15 @@ LICENSE = "MIT"
 DESCRIPTION = "Entice is the E17 picture viewer"
 # can also depend on GIMP for editing
 LICENSE = "MIT"
-DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
-PR = "r1"
+DEPENDS = "edb evas ecore edje epsilon esmart"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
 
 inherit e
 
-RDEPENDS += "libesmart-container-plugins libesmart-thumb libesmart-trans-x11-0 libesmart-file-dialog"
-
-SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/apps/entice"
 S = "${WORKDIR}/entice"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-
============================================================
--- packages/e17/entrance/allow-missing-xsession.patch	02abda679337ce9becd68a0c493df1bef0328def
+++ packages/e17/entrance/allow-missing-xsession.patch	ad77445f716412c7a649feee59f9721f0ad9edec
@@ -1,18 +1,18 @@
---- entrance/configure.in.~1.42.~	2005-07-29 23:15:58.000000000 -0700
-+++ entrance/configure.in	2005-08-13 03:11:41.000000000 -0700
-@@ -190,11 +190,11 @@
+Index: entrance-0.9.0.009/configure.in
+===================================================================
+--- entrance-0.9.0.009.orig/configure.in
++++ entrance-0.9.0.009/configure.in
+@@ -184,10 +184,10 @@ AC_ARG_WITH(xsession,
  	    fi
  	]
  )
--if test ! -x $xsession ; then
--    AC_MSG_WARN([** no $xsession file on this system **])
--    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
--    xsession="You should reconfigure --with-xsession"
+-if test ! -x "$xsession" ; then
+-    AC_MSG_WARN([** $xsession does not exist or is not executable **])
+-    AC_MSG_WARN([** Please consider overriding with --with-xsession **])
 -fi
-+#if test ! -x $xsession ; then
-+#    AC_MSG_WARN([** no $xsession file on this system **])
-+#    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
-+#    xsession="You should reconfigure --with-xsession"
++#if test ! -x "$xsession" ; then
++#    AC_MSG_WARN([** $xsession does not exist or is not executable **])
++#    AC_MSG_WARN([** Please consider overriding with --with-xsession **])
 +#fi
  
  AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, "$xsession", [Xsession script])
============================================================
--- packages/e17/entrance/config-db.patch	e6817ccf5f13e773ed84f2510ecb16a9ece0b1af
+++ packages/e17/entrance/config-db.patch	9887c6c044756fb641b23234f76683c95434de2f
@@ -1,43 +1,119 @@
---- entrance/data/config/build_config.sh.in.~1.18.~	2006-01-11 18:46:48.000000000 -0800
-+++ entrance/data/config/build_config.sh.in	2006-01-11 21:52:54.000000000 -0800
-@@ -18,29 +18,14 @@
+Index: entrance-0.9.0.009/data/config/build_config.sh.in
+===================================================================
+--- entrance-0.9.0.009.orig/data/config/build_config.sh.in
++++ entrance-0.9.0.009/data/config/build_config.sh.in
+@@ -1,45 +1,45 @@
+ #!/bin/sh -e
+ 
+-usage() {
+-	cat <<-EOF
+-	Usage: $0 [options]
+-
+-	Options:
+-	  -d, --dir     Session directory to scan
+-	  -c, --file    Config file (default: $DB)
+-	  -h, --help    This help output :p
+-	EOF
+-
+-	if [ "$1" = "1" ] ; then
+-		echo ""
+-		echo "ERROR: $2"
+-	fi
+-
+-	exit $1
+-}
+-
+-SESSION_DIR=""
+-DB="./entrance_config.cfg"
+-
+-while [ -n "$1" ] ; do
+-	case $1 in
+-		-d) shift; SESSION_DIR=$1;;
+-		-c) shift; DB=$1;;
+-		-h) usage 0;;
+-		*)  usage 1 "Unknown option: $1";;
+-	esac
+-	shift
+-done
+-
+-if [ -z "$DB" ] || [ -d "$DB" ] ; then
+-	usage 1 "Invalid DB argument"
+-fi
+-
+-FROM=$SESSION_DIR
+-if [ -z "$FROM" ] ; then
+-	FROM="defaults"
+-fi
+-echo "Generating config file '$DB' from '$FROM' ..."
++#usage() {
++#	cat <<-EOF
++#	Usage: $0 [options]
++#
++#	Options:
++#	  -d, --dir     Session directory to scan
++#	  -c, --file    Config file (default: $DB)
++#	  -h, --help    This help output :p
++#	EOF
++#
++#	if [ "$1" = "1" ] ; then
++#		echo ""
++#		echo "ERROR: $2"
++#	fi
++#
++#	exit $1
++#}
++#
++#SESSION_DIR=""
++#DB="./entrance_config.cfg"
++#
++#while [ -n "$1" ] ; do
++#	case $1 in
++#		-d) shift; SESSION_DIR=$1;;
++#		-c) shift; DB=$1;;
++#		-h) usage 0;;
++#		*)  usage 1 "Unknown option: $1";;
++#	esac
++#	shift
++#done
++#
++#if [ -z "$DB" ] || [ -d "$DB" ] ; then
++#	usage 1 "Invalid DB argument"
++#fi
++#
++#FROM=$SESSION_DIR
++#if [ -z "$FROM" ] ; then
++#	FROM="defaults"
++#fi
++#echo "Generating config file '$DB' from '$FROM' ..."
+ 
+ rm -f $DB || exit 1
+ 
+@@ -59,10 +59,10 @@ ecore_config -c $DB -k /entrance/time_fo
  #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/"
  #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
  ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
 -ecore_config -c $DB -k /entrance/greeting/after -s ""
--ecore_config -c $DB -k /entrance/session/count -i 7
--ecore_config -c $DB -k /entrance/session/0/session -s "default"
 +ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE"
-+ecore_config -c $DB -k /entrance/session/count -i 2
+ 
+ count=0
+-ecore_config -c $DB -k /entrance/session/0/session -s "default"
 +ecore_config -c $DB -k /entrance/session/0/session -s "/etc/X11/Sessions/Enlightenment"
  ecore_config -c $DB -k /entrance/session/0/title -s "Default"
  ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
- ecore_config -c $DB -k /entrance/session/1/icon -s "enlightenment.png"
- ecore_config -c $DB -k /entrance/session/1/title -s "E17"
--ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment"
--ecore_config -c $DB -k /entrance/session/2/session -s "kde"
--ecore_config -c $DB -k /entrance/session/2/title -s "KDE"
--ecore_config -c $DB -k /entrance/session/2/icon -s "kde.png"
--ecore_config -c $DB -k /entrance/session/3/session -s "gnome"
--ecore_config -c $DB -k /entrance/session/3/title -s "Gnome"
--ecore_config -c $DB -k /entrance/session/3/icon -s "gnome.png"
--ecore_config -c $DB -k /entrance/session/4/session -s "Enlightenment"
--ecore_config -c $DB -k /entrance/session/4/title -s "E16"
--ecore_config -c $DB -k /entrance/session/4/icon -s "enlightenment.png"
--ecore_config -c $DB -k /entrance/session/5/session -s "xfce"
--ecore_config -c $DB -k /entrance/session/5/title -s "XFce"
--ecore_config -c $DB -k /entrance/session/5/icon -s "xfce.png"
--ecore_config -c $DB -k /entrance/session/6/session -s "failsafe"
--ecore_config -c $DB -k /entrance/session/6/title -s "Failsafe"
--ecore_config -c $DB -k /entrance/session/6/icon -s "failsafe.png"
-+ecore_config -c $DB -k /entrance/session/1/session -s "/etc/X11/Sessions/Enlightenment"
- ecore_config -c $DB -k /entrance/system/reboot -i 1
- ecore_config -c $DB -k /entrance/system/halt -i 1
- ecore_config -c $DB -k /entrance/user/remember -i 1
-@@ -50,5 +35,5 @@
+ #if [ -z "$SESSION_DIR" ] ; then
+@@ -92,7 +92,7 @@ ecore_config -c $DB -k /entrance/session
+ #	done
+ #fi
+ count=`(expr $count + 1)`
+-ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe"
++ecore_config -c $DB -k /entrance/session/$count/session -s "/etc/X11/Sessions/Enlightenment"
+ ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
+ ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
+ count=`(expr $count + 1)`
+@@ -107,5 +107,5 @@ ecore_config -c $DB -k /entrance/autolog
  ecore_config -c $DB -k /entrance/presel/mode -i 1
  
  # for Entranced
--ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp"
+-ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp at ENTRANCE_VT_ARG@"
 +ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
  ecore_config -c $DB -k /entranced/attempts -i 5
============================================================
--- packages/e17/entrance/fix-auth-mode.patch	b65bb71ef698292b2c24120dfc99bce3f44b8ebf
+++ packages/e17/entrance/fix-auth-mode.patch	33b1aeec44a8df2ae922d0d1aaa0ba038bb59a2a
@@ -1,7 +1,9 @@
---- entrance/data/config/build_config.sh.in~	2006-01-30 07:01:47.000000000 -0800
-+++ entrance/data/config/build_config.sh.in	2006-02-01 22:22:04.000000000 -0800
-@@ -3,7 +3,7 @@
- rm -f $DB
+Index: entrance-0.9.0.009/data/config/build_config.sh.in
+===================================================================
+--- entrance-0.9.0.009.orig/data/config/build_config.sh.in
++++ entrance-0.9.0.009/data/config/build_config.sh.in
+@@ -44,7 +44,7 @@
+ rm -f $DB || exit 1
  
  # set auth to 1 for pam, 2 for shadow
 -ecore_config -c $DB  -k /entrance/auth -i @auth_mode@
============================================================
--- packages/e17/entrance/use-bash.patch	2e300aab2aee2ea75d61e05124354e3a4821cc4f
+++ packages/e17/entrance/use-bash.patch	92ccffd203d1550c573c4981a8404cdd36cc69cd
@@ -1,19 +1,33 @@
-diff -Nur entrance~/src/client/entrance_session.c entrance/src/client/entrance_session.c
---- entrance~/src/client/entrance_session.c	2006-02-02 19:51:40.000000000 -0800
-+++ entrance/src/client/entrance_session.c	2006-02-02 19:59:24.000000000 -0800
-@@ -495,7 +495,7 @@
-    entrance_session_free(e);
-    /* replace this process with a clean small one that just waits for its */
-    /* child to exit.. passed on the cmd-line */
--   execl("/bin/sh", "/bin/sh", "-l", "-c", buf, NULL);
-+   execl("/bin/bash", "/bin/bash", "-l", "-c", buf, NULL);
- }
+Index: entrance-0.9.0.009/src/client/entrance_session.c
+===================================================================
+--- entrance-0.9.0.009.orig/src/client/entrance_session.c
++++ entrance-0.9.0.009/src/client/entrance_session.c
+@@ -854,7 +854,7 @@ _entrance_session_execute_in_shell(char 
+    if (shell && (strlen(shell) > 0))
+       shell_cmd = shell;
+    else
+-      shell_cmd = strdup("/bin/sh");
++      shell_cmd = strdup("/bin/bash");
  
+    if (session_name)
+       snprintf(buf, sizeof(buf), "%s %s", session_cmd, session_name);
+@@ -869,9 +869,9 @@ _entrance_session_execute_in_shell(char 
+    if (res == -1)
+       /* TODO: should actually hit the user in the face with this message */
+       syslog(LOG_NOTICE,
+-             "Neither '%s' or '/bin/sh' are working login shells for user '%s'. Your session may not function properly. ",
++             "Neither '%s' or '/bin/bash' are working login shells for user '%s'. Your session may not function properly. ",
+              shell, user);
+-      shell_cmd = strdup("/bin/sh");
++      shell_cmd = strdup("/bin/bash");
+    
+    res = execlp(shell_cmd, shell_cmd, "-c", buf, NULL);
  
-diff -Nur entrance~/src/client/main.c entrance/src/client/main.c
---- entrance~/src/client/main.c	2006-02-02 19:51:40.000000000 -0800
-+++ entrance/src/client/main.c	2006-02-02 19:57:24.000000000 -0800
-@@ -392,7 +392,7 @@
+Index: entra%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list