+++ /dev/null
-DESCRIPTION = "An Iconbar for the Enlightenment Window Manager"
-DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/iconbar;date=${PV}"
-S = "${WORKDIR}/iconbar"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
+++ /dev/null
-DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 epsilon"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/e_utils;date=${PV}"
-S = "${WORKDIR}/e_utils"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
--- /dev/null
+DESCRIPTION = "Enlightenment Window Manager Utilities"
+DEPENDS = "eet evas ecore edje esmart ewl engrave"
+LICENSE = "MIT"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/apps/e_utils"
+S = "${WORKDIR}/e_utils"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
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
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() {
+++ /dev/null
-#!/bin/sh
-
-setVar() {
- if [ ! "$value" = "" ]; then
- name=`echo "$name" | sed 'y:-\[\]:_____:'`
- value=`echo "$value" | sed 's:":\\\":g'`
- export $name="$value"
- fi
-}
-
-#convert true/false to 1/0
-bool() {
- if [ ! "$1" = "" ]; then
- if [ "$1" = "True" ]; then
- cmd="$cmd $2 1"
- else
- cmd="$cmd $2 0"
- fi
- fi
-}
-
-str() {
- if [ ! "$1" = "" ]; then
- cmd="$cmd $2 \"$1"\"
- fi
-}
-
-convert_desktop_to_eap() {
- echo "Adding $1 to e menu"
- for l in `cat $1`; do
- #on empty line clear vars
- if [ "$l" = "" ]; then
-
- #grab previous var if it exists
- setVar
-
- name=""
- value=""
- else
- #if an = is in the line it's a name/value pair
- if echo "$l" | grep -q "="; then
-
- #grab previous var if it exists
- setVar
-
- name=`echo "$l" | cut -d "=" -f 1`
- value=`echo "$l" | cut -d "=" -f 2-`
- else
-
- #if previous value assume this is a continuation
- if [ ! "$value" = "" ]; then
- value="$value $l"
- fi
- fi
- fi
- done
- setVar
-
- cmd=""
-
- #set up options
- bool "$StartupNotify" -set-startup-notify
- str "$Name" -set-name
- str "$Comment" -set-comment
- str "$Exec" -set-exe
-
- if [ ! "$cmd" = "" ]; then
- eapFile="$PATH_TO_EAP/$2"
- if [ -e $eapFile ]; then
- echo "EAP file for $2 already created";
- else
- echo "Converting $1 to $2"
- #cp ~/.e/e/applications/all/aterm.eap gpe-othello.eap
- ##empty out eap file
- ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\"
- #enlightenment_eapp gpe-othello.eap -del-all
-
- cat <<EOF > /tmp/gpeEap.edc
-images {
- image: "$Icon" COMP;
-}
-collections {
- group {
- name: "icon";
- max: 48 48;
- parts {
- part {
- name: "image";
- mouse_events: 0;
- description {
- state: "default" 0.0;
- aspect: 1.0 1.0;
- image.normal: "$Icon";
- }
- }
- }
- }
-}
-EOF
-
- edje_cc --image_dir "$PATH_TO_PIXMAPS" /tmp/gpeEap.edc "$eapFile"
- rm /tmp/gpeEap.edc
-
- cmd="enlightenment_eapp \"$eapFile\" $cmd"
-
- #pipe command in sh to allow it to re-interpret quotes
- echo $cmd | /bin/sh -s
- fi
-
- if `echo "$Categories" | grep -q "SystemSettings"`; then
- dir="Settings"
- elif `echo "$Categories" | grep -q "PIM"`; then
- dir="PIM"
- elif `echo "$Categories" | grep -q "Network"`; then
- dir="Network"
- elif `echo "$Categories" | grep -q "Games"`; then
- dir="Games"
- elif `echo "$Categories" | grep -q "Game"`; then
- dir="Games"
- elif `echo "$Categories" | grep -q "AudioVideo"`; then
- dir="Multimedia"
- elif `echo "$Categories" | grep -q "Panel"`; then
- dir="Utility/Panel"
- elif `echo "$Categories" | grep -q "Utility"`; then
- dir="Utlity"
- else
- dir=""
- fi
-
- #dir=`echo "$Categories" | sed 'y:;:/:'`
- mkdir -p "$PATH_TO_E_GPE/$dir"
- orderFile="$PATH_TO_E_GPE/$dir"/.order
- add=1
- if [ -e "$orderFile" ]; then
- if grep -q "$2" "$orderFile"; then
- echo "$2 is already in the $dir menu"
- add=0
- fi
- fi
- if [ "$add" -eq 1 ]; then
- echo "Adding $2 to $dir menu"
- echo "$2" >> "$orderFile"
- fi
- fi
-}
-
-PATH_TO_DESKTOP="/usr/share/applications"
-PATH_TO_PIXMAPS="/usr/share/pixmaps"
-PATH_TO_EAP="/home/root/.e/e/applications/all"
-PATH_TO_E_GPE="/home/root/.e/e/applications/favorite/GPE"
-
-if [ ! -d $PATH_TO_E_GPE ]; then
- mkdir -p $PATH_TO_E_GPE
-fi
-if [ ! -d $PATH_TO_EAP ]; then
- mkdir -p $PATH_TO_EAP
-fi
-cd "$PATH_TO_DESKTOP"
-for f in `ls *.desktop`; do
- eap=`echo "$f" | cut -d . -f 1`
- convert_desktop_to_eap "$PATH_TO_DESKTOP/$f" "$eap.eap"
-done
+++ /dev/null
-DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus"
-DEPENDS = "edje-utils e-wm"
-RDEPENDS += "edje-utils e-wm"
-LICENSE = "MIT"
-SECTION = "e/apps"
-PR = "r4"
-
-#this is a shell script
-PACKAGE_ARCH = "all"
-
-SRC_URI = "file://e17-gpe-menu-convert.sh"
-
-do_install() {
- install -d ${D}/usr/bin/
- install -m 755 ${WORKDIR}/e17-gpe-menu-convert.sh ${D}/usr/bin/e17-gpe-menu-convert.sh
-}
-
-pkg_postinst() {
- /usr/bin/e17-gpe-menu-convert.sh
-}
+++ /dev/null
-DESCRIPTION = "Convert Gnome or KDE menus to e17 menus"
-DEPENDS = "virtual/ecore virtual/evas eet engrave"
-LICENSE = "GPL"
-HOMEPAGE = "http://sourceforge.net/projects/e17genmenu"
-PR = "r0"
-
-inherit e
-
-SECTION = "e/utils"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/e17genmenu/e17genmenu-${PV}.tar.gz"
-S = "${WORKDIR}/${PN}"
-
-PACKAGES += "${PN}-doc"
-
-FILES_${PN} = "${bindir} ${datadir}"
-FILES_${PN}-doc = "/usr/doc"
\ No newline at end of file
+++ /dev/null
-DESCRIPTION = "Eclair is the E17 multi media player"
-DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart-x11 libxml2 sqlite3 taglibc"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/eclair;date=${PV}"
-S = "${WORKDIR}/eclair"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-
--- /dev/null
+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}"
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- engage/src/module/Makefile.am~no-local-includes
-+++ engage/src/module/Makefile.am
-@@ -10,8 +10,7 @@
-
- # the module .so file
- INCLUDES = -I. \
-- -I$(top_srcdir) \
-- -I$(includedir) \
-+ -I$(top_srcdir) \
- @e_cflags@
- pkgdir = @e_modules@/engage/$(MODULE_ARCH)
- pkg_LTLIBRARIES = module.la
+++ /dev/null
-DESCRIPTION = "Engage is the E17 icon dock"
-DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e-wm"
-LICENSE = "MIT"
-PR = "r2"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=misc/engage;date=${PV} \
- file://no-local-includes.patch;patch=1"
-S = "${WORKDIR}/engage"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-
+++ /dev/null
-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 = "r4"
-
-inherit e
-
-RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0 libesmart-file-dialog0"
-
-SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
-S = "${WORKDIR}/entice"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-
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}"
-
+++ /dev/null
---- entrance/src/daemon/Entranced.h.~1.7.~ 2004-05-19 21:02:09.000000000 -0700
-+++ entrance/src/daemon/Entranced.h 2005-08-13 02:00:02.000000000 -0700
-@@ -18,7 +18,7 @@
-
- #define ENTRANCED_DEBUG 1
-
--#define X_SERVER "/usr/X11R6/bin/X -quiet"
-+#define X_SERVER "/etc/X11/Xserver"
- //#define X_SERVER "/usr/X11R6/bin/Xnest -full"
- #define X_DISP ":0" /* only used if DISPLAY variable is NOT set */
- #define ENTRANCE PREFIX "/bin/entrance_wrapper"
---- entrance/src/daemon/spawner.c.~1.25.~ 2005-05-28 02:31:14.000000000 -0700
-+++ entrance/src/daemon/spawner.c 2005-08-13 02:20:13.000000000 -0700
-@@ -155,7 +155,7 @@
- sigaction(SIGUSR1, &_entrance_x_sa, NULL);
- /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */
- /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */
-- execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL);
-+ execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL);
- syslog(LOG_WARNING, "Could not execute X server.");
- exit(1);
- default:
+++ /dev/null
-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([** $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([** $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])
- AC_SUBST(xsession)
+++ /dev/null
-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/greeting/after -s " e17/OE"
-
- 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"
- #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 "@xbin@/X -quiet -nolisten tcp@ENTRANCE_VT_ARG@"
-+ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
- ecore_config -c $DB -k /entranced/attempts -i 5
+++ /dev/null
-diff -Nur entrance-0.9.0.007~/Makefile.am entrance-0.9.0.007/Makefile.am
---- entrance-0.9.0.007~/Makefile.am 2006-05-11 12:18:07.000000000 -0700
-+++ entrance-0.9.0.007/Makefile.am 2006-05-11 13:01:41.000000000 -0700
-@@ -23,4 +23,3 @@
- fi
-
- install-data-am:
-- sh data/config/autodetect.sh || :
+++ /dev/null
-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@
-+ecore_config -c $DB -k /entrance/auth -i 0
-
- # uncomment the below to enable experimental OpenGL hardware acceleration
- #ecore_config -c $DB -k /entrance/engine -i 1
+++ /dev/null
---- entrance/src/daemon/entrance_wrapper.in.~1.1.~ 2003-01-31 13:57:06.000000000 -0800
-+++ entrance/src/daemon/entrance_wrapper.in 2005-08-15 20:13:57.000000000 -0700
-@@ -5,8 +5,13 @@
-
- test -f /etc/profile && . /etc/profile
-
-+if [ -x /etc/X11/Xinit.d/99gpe-login ]; then
-+ chmod -x /etc/X11/Xinit.d/99gpe-login
-+fi
-+
-+/etc/X11/Xinit
-+
- exec @prefix@/bin/entrance "$@"
-
- #fallback
- exec entrance "$@"
--
+++ /dev/null
-diff -Nur entrance~/src/daemon/spawner.c entrance/src/daemon/spawner.c
---- entrance~/src/daemon/spawner.c 2005-09-02 14:00:29.000000000 -0700
-+++ entrance/src/daemon/spawner.c 2005-09-02 15:53:31.000000000 -0700
-@@ -199,6 +199,7 @@
- free(d->client.homedir);
- d->client.homedir = NULL;
-
-+ setenv("DISPLAY", d->name, 1);
- snprintf(entrance_cmd, PATH_MAX, "%s -d %s", ENTRANCE, d->name);
- if (d->config)
- snprintf(entrance_cmd, PATH_MAX, "%s -d %s -c \"%s\" -z %d",
+++ /dev/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);
-
-Index: entrance-0.9.0.009/src/client/main.c
-===================================================================
---- entrance-0.9.0.009.orig/src/client/main.c
-+++ entrance-0.9.0.009/src/client/main.c
-@@ -453,7 +453,7 @@ reboot_cb(void *data, Evas_Object * o, c
- {
- case 0:
- if (execl
-- ("/bin/sh", "/bin/sh", "-c", "/sbin/shutdown -r now", NULL))
-+ ("/bin/bash", "/bin/bash", "-c", "/sbin/shutdown -r now", NULL))
- {
- syslog(LOG_CRIT,
- "Reboot failed: Unable to execute /sbin/shutdown");
-@@ -495,7 +495,7 @@ shutdown_cb(void *data, Evas_Object * o,
- {
- case 0:
- if (execl
-- ("/bin/sh", "/bin/sh", "-c", "/sbin/shutdown -h now", NULL))
-+ ("/bin/bash", "/bin/bash", "-c", "/sbin/shutdown -h now", NULL))
- {
- syslog(LOG_CRIT,
- "Shutdown failed: Unable to execute /sbin/shutdown");
-Index: entrance-0.9.0.009/src/daemon/entrance_wrapper.in
-===================================================================
---- entrance-0.9.0.009.orig/src/daemon/entrance_wrapper.in
-+++ entrance-0.9.0.009/src/daemon/entrance_wrapper.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # Wrapper script to set up login environment:
- # Load up all the junk in /etc/profile first, and then
- # pass control to entrance proper.
---- 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])
---- 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@ENTRANCE_VT_ARG@"
+ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
ecore_config -c $DB -k /entranced/attempts -i 5
---- 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@
-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: entrance-0.9.0.009/src/client/main.c
+===================================================================
+--- entrance-0.9.0.009.orig/src/client/main.c
++++ entrance-0.9.0.009/src/client/main.c
+@@ -453,7 +453,7 @@ reboot_cb(void *data, Evas_Object * o, c
{
case 0:
if (execl
{
syslog(LOG_CRIT,
"Reboot failed: Unable to execute /sbin/shutdown");
-@@ -434,7 +434,7 @@
+@@ -495,7 +495,7 @@ shutdown_cb(void *data, Evas_Object * o,
{
case 0:
if (execl
{
syslog(LOG_CRIT,
"Shutdown failed: Unable to execute /sbin/shutdown");
-diff -Nur entrance~/src/daemon/entrance_wrapper.in entrance/src/daemon/entrance_wrapper.in
---- entrance~/src/daemon/entrance_wrapper.in 2006-02-02 19:51:40.000000000 -0800
-+++ entrance/src/daemon/entrance_wrapper.in 2006-02-02 19:56:43.000000000 -0800
+Index: entrance-0.9.0.009/src/daemon/entrance_wrapper.in
+===================================================================
+--- entrance-0.9.0.009.orig/src/daemon/entrance_wrapper.in
++++ entrance-0.9.0.009/src/daemon/entrance_wrapper.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Wrapper script to set up login environment:
# Load up all the junk in /etc/profile first, and then
# pass control to entrance proper.
-diff -Nur entrance~/src/daemon/spawner.c entrance/src/daemon/spawner.c
---- entrance~/src/daemon/spawner.c 2006-02-02 19:51:40.000000000 -0800
-+++ entrance/src/daemon/spawner.c 2006-02-02 19:57:10.000000000 -0800
-@@ -162,7 +162,7 @@
- sigaction(SIGUSR1, &_entrance_x_sa, NULL);
- /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */
- /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */
-- execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL);
-+ execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL);
- syslog(LOG_WARNING, "Could not execute X server.");
- exit(1);
- default:
+++ /dev/null
-DESCRIPTION = "Entrance is the Enlightenment login manager"
-LICENSE = "MIT"
-# can also use pam and crypt
-DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager"
-RDEPENDS += "bash keylaunch xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes"
-HOMEPAGE = "http://www.enlightenment.org"
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
-
-inherit e
-
-SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \
- file://config-db.patch;patch=1 \
- file://allow-missing-xsession.patch;patch=1 \
- file://run-Xinit.patch;patch=1 \
- file://fix-auth-mode.patch;patch=1 \
- file://use-bash.patch;patch=1 \
- file://Sessions"
-# file://disable-autodetect.patch;patch=1 \
-# file://set-display-env.patch;patch=1 \
-
-S = "${WORKDIR}/entrance-${PV}"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
- --with-xsession=/etc/X11/Xsession \
- --with-auth-mode=0"
-
-FILES_${PN}-dbg += "${libexecdir}/entrance/.debug"
-FILES_${PN} += "${bindir} ${sbindir} /etc ${datadir} ${libexecdir}"
-
-do_install_append() {
- install -d ${D}/etc/X11/Xsession.d
- install -d ${D}/etc/X11/Sessions
-
- install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions
-
- install -d ${D}/etc/X11/login-managers/
- mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance
-}
DESCRIPTION = "Entrance is the Enlightenment login manager"
LICENSE = "MIT"
# can also use pam and crypt
-DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager"
-RDEPENDS += "bash keylaunch xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes"
-HOMEPAGE = "http://www.enlightenment.org"
-PR = "r14"
+DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager"
+RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes"
+PR = "r0"
inherit e
-SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \
+SRC_URI += "\
file://config-db.patch;patch=1 \
file://allow-missing-xsession.patch;patch=1 \
file://run-Xinit.patch;patch=1 \
- file://set-display-env.patch;patch=1 \
file://fix-auth-mode.patch;patch=1 \
file://use-bash.patch;patch=1 \
- file://disable-autodetect.patch;patch=1 \
file://Sessions"
S = "${WORKDIR}/entrance-${PV}"
--with-xsession=/etc/X11/Xsession \
--with-auth-mode=0"
-FILES_${PN} += "${bindir} ${sbindir} /etc ${datadir}"
+FILES_${PN}-dbg += "${libexecdir}/entrance/.debug/*"
do_install_append() {
install -d ${D}/etc/X11/Xsession.d
-DESCRIPTION = "examine, the program configurator"
-DEPENDS = "virtual/ecore ewl"
+DESCRIPTION = "Examine, the program configurator"
+DEPENDS = "ewl"
LICENSE = "MIT"
+PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
inherit e
-SRC_URI = "${E_CVS};module=e17/apps/examine;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/apps/examine"
S = "${WORKDIR}/examine"
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas"
-DEPENDS = "evas-x11"
+DEPENDS = "evas"
LICENSE = "MIT"
-PV = "0.0+cvs${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
inherit e
SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite"
-
S = "${WORKDIR}/${PN}"
do_configure_append() {
git.openpandora.org / openembedded.git / commitdiff