From 8783f89808493b0ccd5f31298851cdd6b61dfeeb Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Mon, 19 Mar 2007 05:13:34 +0000 Subject: e-wm: fix -dev and -dbg packages --- packages/e17/e-wm_0.16.999.037.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/e17') diff --git a/packages/e17/e-wm_0.16.999.037.bb b/packages/e17/e-wm_0.16.999.037.bb index 3084fd99bc..0ccd0c67f2 100644 --- a/packages/e17/e-wm_0.16.999.037.bb +++ b/packages/e17/e-wm_0.16.999.037.bb @@ -1,7 +1,7 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" DEPENDS = "evas-x11 ecore-x11 edje eet embryo" LICENSE = "MIT" -PR = "r4" +PR = "r5" inherit e update-alternatives @@ -23,7 +23,9 @@ EXTRA_OECONF = "--with-profile=${PROFILE} \ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR}" -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" +FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset" +FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la" +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}:' -- cgit v1.2.3 From 25c6d0a0f6386086ec089114ca71c766aa54e574 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 18:42:51 +0000 Subject: entice: clean up. Bump PR. Partly fixes 2234. --- packages/e17/entice_20060128.bb | 4 ++-- packages/e17/entice_20060416.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/e17') diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index 776f652b96..5b433de015 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing -DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r3" +DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" +PR = "r4" inherit e diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_20060416.bb index 87434e3d3b..663ee97cd8 100644 --- a/packages/e17/entice_20060416.bb +++ b/packages/e17/entice_20060416.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing -DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r0" +DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" +PR = "r1" inherit e -- cgit v1.2.3 From ffc3fe8a8f1a5de133366a7df62afac2f59dd4a2 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 1 Jun 2007 06:53:48 +0000 Subject: efl, e17: update to latest versions, entrance has been heavily patched and seems to have some issues so I left the old version as the default --- packages/e17/e-wm_0.16.999.037.bb | 43 -------- packages/e17/e-wm_0.16.999.038.bb | 43 ++++++++ packages/e17/entrance-0.9.0.009/.mtn2git_empty | 0 packages/e17/entrance-0.9.0.009/Xserver.patch | 22 ++++ .../allow-missing-xsession.patch | 19 ++++ packages/e17/entrance-0.9.0.009/config-db.patch | 119 +++++++++++++++++++++ .../entrance-0.9.0.009/disable-autodetect.patch | 8 ++ .../e17/entrance-0.9.0.009/fix-auth-mode.patch | 13 +++ packages/e17/entrance-0.9.0.009/run-Xinit.patch | 17 +++ .../e17/entrance-0.9.0.009/set-display-env.patch | 11 ++ packages/e17/entrance-0.9.0.009/use-bash.patch | 57 ++++++++++ packages/e17/entrance_0.9.0.009.bb | 40 +++++++ 12 files changed, 349 insertions(+), 43 deletions(-) delete mode 100644 packages/e17/e-wm_0.16.999.037.bb create mode 100644 packages/e17/e-wm_0.16.999.038.bb create mode 100644 packages/e17/entrance-0.9.0.009/.mtn2git_empty create mode 100644 packages/e17/entrance-0.9.0.009/Xserver.patch create mode 100644 packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch create mode 100644 packages/e17/entrance-0.9.0.009/config-db.patch create mode 100644 packages/e17/entrance-0.9.0.009/disable-autodetect.patch create mode 100644 packages/e17/entrance-0.9.0.009/fix-auth-mode.patch create mode 100644 packages/e17/entrance-0.9.0.009/run-Xinit.patch create mode 100644 packages/e17/entrance-0.9.0.009/set-display-env.patch create mode 100644 packages/e17/entrance-0.9.0.009/use-bash.patch create mode 100644 packages/e17/entrance_0.9.0.009.bb (limited to 'packages/e17') diff --git a/packages/e17/e-wm_0.16.999.037.bb b/packages/e17/e-wm_0.16.999.037.bb deleted file mode 100644 index 0ccd0c67f2..0000000000 --- a/packages/e17/e-wm_0.16.999.037.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "evas-x11 ecore-x11 edje eet embryo" -LICENSE = "MIT" -PR = "r5" - -inherit e update-alternatives - -SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ - file://set-autoscroll-defaults.patch;patch=1 \ - file://Xsession.d/98enlightenment" - -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_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_NATIVE}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset" -FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la" -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}:' -} - -do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d -} - -ALTERNATIVE_PATH = "${bindir}/enlightenment" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/e-wm_0.16.999.038.bb b/packages/e17/e-wm_0.16.999.038.bb new file mode 100644 index 0000000000..cf25ad08e8 --- /dev/null +++ b/packages/e17/e-wm_0.16.999.038.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DEPENDS = "evas-x11 ecore-x11 edje eet embryo efreet" +LICENSE = "MIT" +PR = "r5" + +inherit e update-alternatives + +SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ + file://fix-configure.patch;patch=1 \ + file://set-autoscroll-defaults.patch;patch=1 \ + file://Xsession.d/98enlightenment" + +S = "${WORKDIR}/enlightenment-${PV}" + +PROFILE = "LOWRES_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_NATIVE}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset" +FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la" +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}:' +} + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d +} + +ALTERNATIVE_PATH = "${bindir}/enlightenment" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/entrance-0.9.0.009/.mtn2git_empty b/packages/e17/entrance-0.9.0.009/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/e17/entrance-0.9.0.009/Xserver.patch b/packages/e17/entrance-0.9.0.009/Xserver.patch new file mode 100644 index 0000000000..296a7bccf4 --- /dev/null +++ b/packages/e17/entrance-0.9.0.009/Xserver.patch @@ -0,0 +1,22 @@ +--- 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: diff --git a/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch b/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch new file mode 100644 index 0000000000..74289ad3c8 --- /dev/null +++ b/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch @@ -0,0 +1,19 @@ +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) diff --git a/packages/e17/entrance-0.9.0.009/config-db.patch b/packages/e17/entrance-0.9.0.009/config-db.patch new file mode 100644 index 0000000000..aecbfb6867 --- /dev/null +++ b/packages/e17/entrance-0.9.0.009/config-db.patch @@ -0,0 +1,119 @@ +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 diff --git a/packages/e17/entrance-0.9.0.009/disable-autodetect.patch b/packages/e17/entrance-0.9.0.009/disable-autodetect.patch new file mode 100644 index 0000000000..a0412b3706 --- /dev/null +++ b/packages/e17/entrance-0.9.0.009/disable-autodetect.patch @@ -0,0 +1,8 @@ +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 || : diff --git a/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch b/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch new file mode 100644 index 0000000000..46e530b256 --- /dev/null +++ b/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch @@ -0,0 +1,13 @@ +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 diff --git a/packages/e17/entrance-0.9.0.009/run-Xinit.patch b/packages/e17/entrance-0.9.0.009/run-Xinit.patch new file mode 100644 index 0000000000..1d6c2307f7 --- /dev/null +++ b/packages/e17/entrance-0.9.0.009/run-Xinit.patch @@ -0,0 +1,17 @@ +--- 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 "$@" +- diff --git a/packages/e17/entrance-0.9.0.009/set-display-env.patch b/packages/e17/entrance-0.9.0.009/set-display-env.patch new file mode 100644 index 0000000000..37bfc1c2c8 --- /dev/null +++ b/packages/e17/entrance-0.9.0.009/set-display-env.patch @@ -0,0 +1,11 @@ +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", diff --git a/packages/e17/entrance-0.9.0.009/use-bash.patch b/packages/e17/entrance-0.9.0.009/use-bash.patch new file mode 100644 index 0000000000..7dfab83711 --- /dev/null +++ b/packages/e17/entrance-0.9.0.009/use-bash.patch @@ -0,0 +1,57 @@ +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. diff --git a/packages/e17/entrance_0.9.0.009.bb b/packages/e17/entrance_0.9.0.009.bb new file mode 100644 index 0000000000..6e21926860 --- /dev/null +++ b/packages/e17/entrance_0.9.0.009.bb @@ -0,0 +1,40 @@ +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 +} -- cgit v1.2.3 From f7fa76073c63c2db1d25c60304f720f3d8928354 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 16 Jun 2007 15:07:17 +0000 Subject: e17: add expedite, an evas benchmark --- packages/e17/expedite_cvs.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/e17/expedite_cvs.bb (limited to 'packages/e17') diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb new file mode 100644 index 0000000000..12a1c4ce86 --- /dev/null +++ b/packages/e17/expedite_cvs.bb @@ -0,0 +1,14 @@ +inherit e + +DEPENDS = "evas-x11" + +PV = "0.0+cvs${SRCDATE}" + +SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite" + +S = "${WORKDIR}/${PN}" + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g +} + -- cgit v1.2.3 From 43685cdd4112bd3038436a6f4059d9eda54ee0c9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 17 Jun 2007 04:46:24 +0000 Subject: expedite_cvs.bb: add metadata --- packages/e17/expedite_cvs.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'packages/e17') diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb index 12a1c4ce86..69e0df9dbe 100644 --- a/packages/e17/expedite_cvs.bb +++ b/packages/e17/expedite_cvs.bb @@ -1,8 +1,10 @@ -inherit e - +DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas" DEPENDS = "evas-x11" - +LICENSE = "MIT" PV = "0.0+cvs${SRCDATE}" +PR = "r0" + +inherit e SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite" -- cgit v1.2.3 From a375ded2d26d83858eb03dcb716f76969f8efa4c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 21 Jun 2007 03:51:17 +0000 Subject: e17 applications: catch up with EFL overhaul --- packages/e17/e-iconbar_20060128.bb | 13 -- packages/e17/e-utils_20060501.bb | 11 -- packages/e17/e-utils_cvs.bb | 12 ++ packages/e17/e-wm_0.16.999.038.bb | 8 +- packages/e17/e17-gpe-menu-convert/.mtn2git_empty | 0 .../e17-gpe-menu-convert/e17-gpe-menu-convert.sh | 162 --------------------- packages/e17/e17-gpe-menu-convert_0.2.bb | 20 --- packages/e17/e17genmenu_4.2.0.bb | 17 --- packages/e17/eclair_20060128.bb | 14 -- packages/e17/edje-viewer_cvs.bb | 12 ++ packages/e17/engage/.mtn2git_empty | 0 packages/e17/engage/no-local-includes.patch | 17 --- packages/e17/engage_20060128.bb | 15 -- packages/e17/entice_20060128.bb | 17 --- packages/e17/entice_20060416.bb | 17 --- packages/e17/entice_cvs.bb | 15 ++ packages/e17/entrance-0.9.0.009/.mtn2git_empty | 0 packages/e17/entrance-0.9.0.009/Xserver.patch | 22 --- .../allow-missing-xsession.patch | 19 --- packages/e17/entrance-0.9.0.009/config-db.patch | 119 --------------- .../entrance-0.9.0.009/disable-autodetect.patch | 8 - .../e17/entrance-0.9.0.009/fix-auth-mode.patch | 13 -- packages/e17/entrance-0.9.0.009/run-Xinit.patch | 17 --- .../e17/entrance-0.9.0.009/set-display-env.patch | 11 -- packages/e17/entrance-0.9.0.009/use-bash.patch | 57 -------- packages/e17/entrance/allow-missing-xsession.patch | 22 +-- packages/e17/entrance/config-db.patch | 136 +++++++++++++---- packages/e17/entrance/fix-auth-mode.patch | 10 +- packages/e17/entrance/use-bash.patch | 63 ++++---- packages/e17/entrance_0.9.0.007.bb | 37 ----- packages/e17/entrance_0.9.0.009.bb | 40 ----- packages/e17/entrance_0.9.0.010.bb | 34 +++++ packages/e17/examine_20060128.bb | 13 -- packages/e17/examine_cvs.bb | 14 ++ packages/e17/expedite_cvs.bb | 5 +- 35 files changed, 249 insertions(+), 741 deletions(-) delete mode 100644 packages/e17/e-iconbar_20060128.bb delete mode 100644 packages/e17/e-utils_20060501.bb create mode 100644 packages/e17/e-utils_cvs.bb delete mode 100644 packages/e17/e17-gpe-menu-convert/.mtn2git_empty delete mode 100644 packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh delete mode 100644 packages/e17/e17-gpe-menu-convert_0.2.bb delete mode 100644 packages/e17/e17genmenu_4.2.0.bb delete mode 100644 packages/e17/eclair_20060128.bb create mode 100644 packages/e17/edje-viewer_cvs.bb delete mode 100644 packages/e17/engage/.mtn2git_empty delete mode 100644 packages/e17/engage/no-local-includes.patch delete mode 100644 packages/e17/engage_20060128.bb delete mode 100644 packages/e17/entice_20060128.bb delete mode 100644 packages/e17/entice_20060416.bb create mode 100644 packages/e17/entice_cvs.bb delete mode 100644 packages/e17/entrance-0.9.0.009/.mtn2git_empty delete mode 100644 packages/e17/entrance-0.9.0.009/Xserver.patch delete mode 100644 packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch delete mode 100644 packages/e17/entrance-0.9.0.009/config-db.patch delete mode 100644 packages/e17/entrance-0.9.0.009/disable-autodetect.patch delete mode 100644 packages/e17/entrance-0.9.0.009/fix-auth-mode.patch delete mode 100644 packages/e17/entrance-0.9.0.009/run-Xinit.patch delete mode 100644 packages/e17/entrance-0.9.0.009/set-display-env.patch delete mode 100644 packages/e17/entrance-0.9.0.009/use-bash.patch delete mode 100644 packages/e17/entrance_0.9.0.007.bb delete mode 100644 packages/e17/entrance_0.9.0.009.bb create mode 100644 packages/e17/entrance_0.9.0.010.bb delete mode 100644 packages/e17/examine_20060128.bb create mode 100644 packages/e17/examine_cvs.bb (limited to 'packages/e17') diff --git a/packages/e17/e-iconbar_20060128.bb b/packages/e17/e-iconbar_20060128.bb deleted file mode 100644 index de639bfd3f..0000000000 --- a/packages/e17/e-iconbar_20060128.bb +++ /dev/null @@ -1,13 +0,0 @@ -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}" diff --git a/packages/e17/e-utils_20060501.bb b/packages/e17/e-utils_20060501.bb deleted file mode 100644 index fc94cd106f..0000000000 --- a/packages/e17/e-utils_20060501.bb +++ /dev/null @@ -1,11 +0,0 @@ -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}" diff --git a/packages/e17/e-utils_cvs.bb b/packages/e17/e-utils_cvs.bb new file mode 100644 index 0000000000..ea27040ab2 --- /dev/null +++ b/packages/e17/e-utils_cvs.bb @@ -0,0 +1,12 @@ +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}" diff --git a/packages/e17/e-wm_0.16.999.038.bb b/packages/e17/e-wm_0.16.999.038.bb index cf25ad08e8..1204ed9ecc 100644 --- a/packages/e17/e-wm_0.16.999.038.bb +++ b/packages/e17/e-wm_0.16.999.038.bb @@ -1,7 +1,7 @@ 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 @@ FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenm 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() { diff --git a/packages/e17/e17-gpe-menu-convert/.mtn2git_empty b/packages/e17/e17-gpe-menu-convert/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh deleted file mode 100644 index bbb5e12211..0000000000 --- a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh +++ /dev/null @@ -1,162 +0,0 @@ -#!/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 < /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 diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb deleted file mode 100644 index 5ec40cd761..0000000000 --- a/packages/e17/e17-gpe-menu-convert_0.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -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 -} diff --git a/packages/e17/e17genmenu_4.2.0.bb b/packages/e17/e17genmenu_4.2.0.bb deleted file mode 100644 index baf399864d..0000000000 --- a/packages/e17/e17genmenu_4.2.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -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 diff --git a/packages/e17/eclair_20060128.bb b/packages/e17/eclair_20060128.bb deleted file mode 100644 index d78e1322c2..0000000000 --- a/packages/e17/eclair_20060128.bb +++ /dev/null @@ -1,14 +0,0 @@ -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}" - diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb new file mode 100644 index 0000000000..9b21c042a0 --- /dev/null +++ b/packages/e17/edje-viewer_cvs.bb @@ -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}" diff --git a/packages/e17/engage/.mtn2git_empty b/packages/e17/engage/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/e17/engage/no-local-includes.patch b/packages/e17/engage/no-local-includes.patch deleted file mode 100644 index 09cc8da98d..0000000000 --- a/packages/e17/engage/no-local-includes.patch +++ /dev/null @@ -1,17 +0,0 @@ - -# -# 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 diff --git a/packages/e17/engage_20060128.bb b/packages/e17/engage_20060128.bb deleted file mode 100644 index ee71e1a0bb..0000000000 --- a/packages/e17/engage_20060128.bb +++ /dev/null @@ -1,15 +0,0 @@ -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}" - diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb deleted file mode 100644 index 5b433de015..0000000000 --- a/packages/e17/entice_20060128.bb +++ /dev/null @@ -1,17 +0,0 @@ -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}" - diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_20060416.bb deleted file mode 100644 index 663ee97cd8..0000000000 --- a/packages/e17/entice_20060416.bb +++ /dev/null @@ -1,17 +0,0 @@ -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" - -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}" -S = "${WORKDIR}/entice" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" - diff --git a/packages/e17/entice_cvs.bb b/packages/e17/entice_cvs.bb new file mode 100644 index 0000000000..62a80ead47 --- /dev/null +++ b/packages/e17/entice_cvs.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Entice is the E17 picture viewer" +# can also depend on GIMP for editing +LICENSE = "MIT" +DEPENDS = "edb evas ecore edje epsilon esmart" +PV = "0.0.0+cvs${SRCDATE}" +PR = "r0" + +inherit e + +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}" diff --git a/packages/e17/entrance-0.9.0.009/.mtn2git_empty b/packages/e17/entrance-0.9.0.009/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/e17/entrance-0.9.0.009/Xserver.patch b/packages/e17/entrance-0.9.0.009/Xserver.patch deleted file mode 100644 index 296a7bccf4..0000000000 --- a/packages/e17/entrance-0.9.0.009/Xserver.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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: diff --git a/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch b/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch deleted file mode 100644 index 74289ad3c8..0000000000 --- a/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch +++ /dev/null @@ -1,19 +0,0 @@ -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) diff --git a/packages/e17/entrance-0.9.0.009/config-db.patch b/packages/e17/entrance-0.9.0.009/config-db.patch deleted file mode 100644 index aecbfb6867..0000000000 --- a/packages/e17/entrance-0.9.0.009/config-db.patch +++ /dev/null @@ -1,119 +0,0 @@ -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 diff --git a/packages/e17/entrance-0.9.0.009/disable-autodetect.patch b/packages/e17/entrance-0.9.0.009/disable-autodetect.patch deleted file mode 100644 index a0412b3706..0000000000 --- a/packages/e17/entrance-0.9.0.009/disable-autodetect.patch +++ /dev/null @@ -1,8 +0,0 @@ -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 || : diff --git a/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch b/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch deleted file mode 100644 index 46e530b256..0000000000 --- a/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/packages/e17/entrance-0.9.0.009/run-Xinit.patch b/packages/e17/entrance-0.9.0.009/run-Xinit.patch deleted file mode 100644 index 1d6c2307f7..0000000000 --- a/packages/e17/entrance-0.9.0.009/run-Xinit.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 "$@" -- diff --git a/packages/e17/entrance-0.9.0.009/set-display-env.patch b/packages/e17/entrance-0.9.0.009/set-display-env.patch deleted file mode 100644 index 37bfc1c2c8..0000000000 --- a/packages/e17/entrance-0.9.0.009/set-display-env.patch +++ /dev/null @@ -1,11 +0,0 @@ -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", diff --git a/packages/e17/entrance-0.9.0.009/use-bash.patch b/packages/e17/entrance-0.9.0.009/use-bash.patch deleted file mode 100644 index 7dfab83711..0000000000 --- a/packages/e17/entrance-0.9.0.009/use-bash.patch +++ /dev/null @@ -1,57 +0,0 @@ -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. diff --git a/packages/e17/entrance/allow-missing-xsession.patch b/packages/e17/entrance/allow-missing-xsession.patch index c475e46fe2..74289ad3c8 100644 --- a/packages/e17/entrance/allow-missing-xsession.patch +++ b/packages/e17/entrance/allow-missing-xsession.patch @@ -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]) diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch index 83ed3acf84..aecbfb6867 100644 --- a/packages/e17/entrance/config-db.patch +++ b/packages/e17/entrance/config-db.patch @@ -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@ENTRANCE_VT_ARG@" +ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver" ecore_config -c $DB -k /entranced/attempts -i 5 diff --git a/packages/e17/entrance/fix-auth-mode.patch b/packages/e17/entrance/fix-auth-mode.patch index 1ec520f768..46e530b256 100644 --- a/packages/e17/entrance/fix-auth-mode.patch +++ b/packages/e17/entrance/fix-auth-mode.patch @@ -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@ diff --git a/packages/e17/entrance/use-bash.patch b/packages/e17/entrance/use-bash.patch index 58ef8f556f..7dfab83711 100644 --- a/packages/e17/entrance/use-bash.patch +++ b/packages/e17/entrance/use-bash.patch @@ -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: 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 @@ -22,7 +36,7 @@ diff -Nur entrance~/src/client/main.c entrance/src/client/main.c { 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 @@ -31,24 +45,13 @@ diff -Nur entrance~/src/client/main.c entrance/src/client/main.c { 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: diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb deleted file mode 100644 index 50126cb5a9..0000000000 --- a/packages/e17/entrance_0.9.0.007.bb +++ /dev/null @@ -1,37 +0,0 @@ -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" - -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://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}" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --with-xsession=/etc/X11/Xsession \ - --with-auth-mode=0" - -FILES_${PN} += "${bindir} ${sbindir} /etc ${datadir}" - -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 -} diff --git a/packages/e17/entrance_0.9.0.009.bb b/packages/e17/entrance_0.9.0.009.bb deleted file mode 100644 index 6e21926860..0000000000 --- a/packages/e17/entrance_0.9.0.009.bb +++ /dev/null @@ -1,40 +0,0 @@ -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 -} diff --git a/packages/e17/entrance_0.9.0.010.bb b/packages/e17/entrance_0.9.0.010.bb new file mode 100644 index 0000000000..4c47f1d2ab --- /dev/null +++ b/packages/e17/entrance_0.9.0.010.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Entrance is the Enlightenment login manager" +LICENSE = "MIT" +# can also use pam and crypt +DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager" +RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes" +PR = "r0" + +inherit e + +SRC_URI += "\ + 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" + +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/*" + +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 +} diff --git a/packages/e17/examine_20060128.bb b/packages/e17/examine_20060128.bb deleted file mode 100644 index b406ea3b5f..0000000000 --- a/packages/e17/examine_20060128.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "examine, the program configurator" -DEPENDS = "virtual/ecore ewl" -LICENSE = "MIT" -PR = "r0" - -inherit e - -SRC_URI = "${E_CVS};module=e17/apps/examine;date=${PV}" -S = "${WORKDIR}/examine" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/examine_cvs.bb b/packages/e17/examine_cvs.bb new file mode 100644 index 0000000000..89d0dd5755 --- /dev/null +++ b/packages/e17/examine_cvs.bb @@ -0,0 +1,14 @@ +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" +S = "${WORKDIR}/examine" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb index 69e0df9dbe..ea376c2442 100644 --- a/packages/e17/expedite_cvs.bb +++ b/packages/e17/expedite_cvs.bb @@ -1,13 +1,12 @@ 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() { -- cgit v1.2.3 From 7744cf868f1592fc060809ad77f58acdc8e21e6e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 21 Jun 2007 04:33:50 +0000 Subject: add rage, the Enlightenment Media Center --- packages/e17/rage_0.2.0.003.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/e17/rage_0.2.0.003.bb (limited to 'packages/e17') diff --git a/packages/e17/rage_0.2.0.003.bb b/packages/e17/rage_0.2.0.003.bb new file mode 100644 index 0000000000..ab527e214b --- /dev/null +++ b/packages/e17/rage_0.2.0.003.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "rage is a media center application based on EFL" +AUTHOR = "Carsten 'The Rasterman' Heitzler" +HOMEPAGE = "http://www.rasterman.com" +LICENSE = "GPL" +DEPENDS = "evas ecore edje" +SECTION = "x11/multimedia" + +SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/rage-${PV}.tar.gz" + +inherit e -- cgit v1.2.3 From bfebcd6cd76f2fb46bf72e26b42482f212c3d9fd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 10 Jul 2007 08:38:32 +0000 Subject: e-wm: fix startup script, fix u-a and install xdg stuff (per http://wiki.enlightenment.org/index.php/E17_and_Efreet) --- packages/e17/e-wm/Xsession.d/98enlightenment | 2 +- packages/e17/e-wm/applications.menu | 93 ++++++++++++++++++++++++++++ packages/e17/e-wm_0.16.999.038.bb | 11 +++- 3 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 packages/e17/e-wm/applications.menu (limited to 'packages/e17') diff --git a/packages/e17/e-wm/Xsession.d/98enlightenment b/packages/e17/e-wm/Xsession.d/98enlightenment index 65f46284a9..7913888438 100644 --- a/packages/e17/e-wm/Xsession.d/98enlightenment +++ b/packages/e17/e-wm/Xsession.d/98enlightenment @@ -1,3 +1,3 @@ #!/bin/sh -exec enlightenment \ No newline at end of file +exec enlightenment_start diff --git a/packages/e17/e-wm/applications.menu b/packages/e17/e-wm/applications.menu new file mode 100644 index 0000000000..e163864acf --- /dev/null +++ b/packages/e17/e-wm/applications.menu @@ -0,0 +1,93 @@ + + + + Applications + + + + /usr/share/applications + + + + Office + Office.directory + + + Office + + + + + + Multimedia + Multimedia.directory + + + AudioVideo + + + + + + Graphics + Graphics.directory + + + Graphics + + + + + + Games + Games.directory + + + Games + + + + + + Internet + Internet.directory + + + Network + + + + + + Settings + Settings.directory + + + SystemSettings + + + + + + Accessories + Accessories.directory + + + + Applications + Utility + + + System + Office + Internet + AudioVideo + Graphics + Games + + + + + + + diff --git a/packages/e17/e-wm_0.16.999.038.bb b/packages/e17/e-wm_0.16.999.038.bb index 1204ed9ecc..12784ea18f 100644 --- a/packages/e17/e-wm_0.16.999.038.bb +++ b/packages/e17/e-wm_0.16.999.038.bb @@ -1,14 +1,16 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" DEPENDS = "eet evas ecore edje efreet" LICENSE = "MIT" -PR = "r6" +PR = "r7" inherit e update-alternatives SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ file://set-autoscroll-defaults.patch;patch=1 \ - file://Xsession.d/98enlightenment" + file://Xsession.d/98enlightenment \ + file://applications.menu \ + " S = "${WORKDIR}/enlightenment-${PV}" @@ -35,9 +37,12 @@ do_compile_prepend() { do_install_append() { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d + + install -d ${D}/${sysconfdir}/xdg/menus + install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ } -ALTERNATIVE_PATH = "${bindir}/enlightenment" +ALTERNATIVE_PATH = "${bindir}/enlightenment_start" ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" ALTERNATIVE_PRIORITY = "16" -- cgit v1.2.3 From 4facf8b931045165563f449e2633164029793be1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 21 Jul 2007 23:43:27 +0000 Subject: * add edje_editor, an editor for edje files * add enna, a media center application based on EFL * add exhibit, a picture viewer application based on EFL --- packages/e17/edje-editor_cvs.bb | 12 ++++++++++++ packages/e17/enna_svn.bb | 11 +++++++++++ packages/e17/exhibit_cvs.bb | 10 ++++++++++ 3 files changed, 33 insertions(+) create mode 100644 packages/e17/edje-editor_cvs.bb create mode 100644 packages/e17/enna_svn.bb create mode 100644 packages/e17/exhibit_cvs.bb (limited to 'packages/e17') diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb new file mode 100644 index 0000000000..72c83dc56e --- /dev/null +++ b/packages/e17/edje-editor_cvs.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Edje-Editor is just that." +LICENSE = "MIT" +DEPENDS = "etk" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" + +inherit e + +SRC_URI = "${E_CVS};module=e17/proto/edje_editor" +S = "${WORKDIR}/edje_editor" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb new file mode 100644 index 0000000000..7032e54ce3 --- /dev/null +++ b/packages/e17/enna_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Enna is a media center application based on EFL" +LICENSE = "GPL" +DEPENDS = "curl dbus eet evas edje ecore edbus emotion libmusicbrainz libxml2 taglib" +SECTION = "x11/multimedia" +PV = "0.2.0+svn${SRCDATE}" + +inherit e + +SRC_URI = "svn://enna.svn.sourceforge.net/svnroot/enna/trunk;module=enna;proto=http" +S = "${WORKDIR}/enna" + diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb new file mode 100644 index 0000000000..1c3c836955 --- /dev/null +++ b/packages/e17/exhibit_cvs.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Exhibit is the ETK picture viewer" +DEPENDS = "evas ecore edje etk epsilon engrave" +LICENSE = "MIT" +PV = "0.0.0+cvs${SRCDATE}" +PR = "r0" + +inherit e + +SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/exhibit" +S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From cac6d8766904ce7da991e52b0b894eb8f0963ac4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 22 Jul 2007 00:04:52 +0000 Subject: enna: fix svn build (broken locale problem) --- packages/e17/enna/.mtn2git_empty | 0 packages/e17/enna_svn.bb | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 packages/e17/enna/.mtn2git_empty (limited to 'packages/e17') diff --git a/packages/e17/enna/.mtn2git_empty b/packages/e17/enna/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb index 7032e54ce3..49e1caeab0 100644 --- a/packages/e17/enna_svn.bb +++ b/packages/e17/enna_svn.bb @@ -1,11 +1,16 @@ DESCRIPTION = "Enna is a media center application based on EFL" LICENSE = "GPL" -DEPENDS = "curl dbus eet evas edje ecore edbus emotion libmusicbrainz libxml2 taglib" +DEPENDS = "curl dbus eet evas edje ecore edbus emotion libmusicbrainz libxml2 taglibc" SECTION = "x11/multimedia" PV = "0.2.0+svn${SRCDATE}" inherit e -SRC_URI = "svn://enna.svn.sourceforge.net/svnroot/enna/trunk;module=enna;proto=http" +SRC_URI = "svn://enna.svn.sourceforge.net/svnroot/enna/trunk;module=enna;proto=http \ + file://locale-is-broken.patch;patch=1" S = "${WORKDIR}/enna" +do_configure_prepend() { + touch po/Makefile.in.in +} + -- cgit v1.2.3 From 6f756192d4e7819aaeb90ad1e3e62e0bb2343e95 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 22 Jul 2007 15:19:53 +0000 Subject: enna: add missing patch. thanks koen for spotting --- packages/e17/enna/locale-is-broken.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/e17/enna/locale-is-broken.patch (limited to 'packages/e17') diff --git a/packages/e17/enna/locale-is-broken.patch b/packages/e17/enna/locale-is-broken.patch new file mode 100644 index 0000000000..40904e14dd --- /dev/null +++ b/packages/e17/enna/locale-is-broken.patch @@ -0,0 +1,13 @@ +Index: enna/Makefile.am +=================================================================== +--- enna.orig/Makefile.am ++++ enna/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ## Created by Anjuta + +-SUBDIRS = src po data ++SUBDIRS = src data + + EXTRA_DIST = config.rpath $(ennadoc_DATA) + -- cgit v1.2.3 From dae07f85049f80b2f2ee2bef157b4714d9394516 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 11:17:00 +0000 Subject: edje*: these packages are from cvs, not svn --- packages/e17/edje-editor_cvs.bb | 2 +- packages/e17/edje-viewer_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/e17') diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb index 72c83dc56e..b2483f2bfb 100644 --- a/packages/e17/edje-editor_cvs.bb +++ b/packages/e17/edje-editor_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edje-Editor is just that." LICENSE = "MIT" DEPENDS = "etk" -PV = "0.0.0+svn${SRCDATE}" +PV = "0.0.0+cvs${SRCDATE}" PR = "r0" inherit e diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb index 9b21c042a0..1a15746ca4 100644 --- a/packages/e17/edje-viewer_cvs.bb +++ b/packages/e17/edje-viewer_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edje_Viewer is just that." DEPENDS = "etk" LICENSE = "MIT" -PV = "0.0.0+svn${SRCDATE}" +PV = "0.0.0+cvs${SRCDATE}" PR = "r0" inherit e -- cgit v1.2.3