efl upgrade

index d9c2275..05997bd 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
 # usually tracks svn trunk HEAD
-EFL_SRCREV ?= "65428"
+EFL_SRCREV ?= "65690"
 # revision when 1.0.0 was released, for recipes which don't need rebuild so often
 EFL_SRCREV_1.0.0 ?= "56356"
 

index 4f2e920..58498b4 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=550b8cea13dacc4bf00508a8cce1074c"
 inherit efl
 
 BBCLASSEXTEND = "native"
-INC_PR = "r0"
+INC_PR = "r1"
 
 SRCNAME = "e_dbus"
 

@@ -17,7 +17,7 @@ FILES_${PN}-enotify = "${libdir}/libenotify.so.* ${bindir}/e-notify-send"
 FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
 FILES_${PN}-enm = "${libdir}/libenm.so.*"
 FILES_${PN}-ehal = "${libdir}/libehal.so.*"
-FILES_${PN}-econnman = "${libdir}/libeconnman.so.*"
+FILES_${PN}-econnman = "${libdir}/libeconnman.so.* ${libdir}/libeconnman0_7x.so.*"
 FILES_${PN}-eofono = "${libdir}/libeofono.so.*"
 FILES_${PN}-eukit = "${libdir}/libeukit.so.*"
 FILES_${PN}-ebluez = "${libdir}/libebluez.so.*"

index 9da788d..e931967 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r22"
+PR = "r23"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext

new file mode 100644
index 0000000..0b9c0f5
@@ -0,0 +1,8 @@
+[Unit]
+Description=Login manager for Enlightenment
+
+[Service]
+ExecStart=/usr/sbin/elsa
+
+[Install]
+WantedBy=multi-user.target

index e2f6fd7..f885daf 100644
@@ -7,14 +7,32 @@ SECTION = "e/apps"
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
   file://0001-pam-use-common-auth-instead-of-system-auth.patch \
+  file://xserver-nodm.service \
 "
 S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
-PR = "r1"
+PR = "r2"
 PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
+do_install_append() {
+        install -d ${D}${base_libdir}/systemd/system/
+        install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${base_libdir}/systemd/system/xserver-nodm.service
+}
+
+inherit systemd
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "xserver-nodm.service"
+
+PACKAGES =+ "${PN}-systemd"
+FILES_${PN}-systemd += "${base_libdir}/systemd"
+RDEPENDS_${PN}-systemd += "${PN}"
+
 RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
 CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
+RCONFLICTS_${PN} += "xserver-nodm-init"
+RREPLACES_${PN} += "xserver-nodm-init"
+RCONFLICTS_${PN}-systemd += "xserver-nodm-init"
+RREPLACES_${PN}-systemd += "xserver-nodm-init"

index 05997bd..79104ec 100644
@@ -2,7 +2,11 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
 # usually tracks svn trunk HEAD
-EFL_SRCREV ?= "65690"
+EFL_SRCREV ?= "65808"
+# revision when 1.1.0 (eet is actually 1.5.0) was released, 
+# so we can lock some release libs to this revision 
+# and use EFL_SRCREV to track e17 and elementary
+EFL_SRCREV_1.1.0 ?= "65800"
 # revision when 1.0.0 was released, for recipes which don't need rebuild so often
 EFL_SRCREV_1.0.0 ?= "56356"
 

index 47b5f48..ee91c98 100644
@@ -2,9 +2,8 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
 DEPENDS = "eet evas"
 RDEPENDS_${PN} = "expedite-themes evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-engine-gl-x11 evas-loader-png"
 LICENSE = "MIT BSD"
-PV = "0.6.0+svnr${SRCPV}"
-PR = "r5"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 
 inherit e
 SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"

index c71c1b9..5cad73d 100644
@@ -1,7 +1,7 @@
 require ecore.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.0.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 646c379..5d79c02 100644
@@ -1,7 +1,7 @@
 require edbus.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.0.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 65d723d..c3e1a95 100644
@@ -1,7 +1,7 @@
 require edje.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.0.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 67be595..aad311b 100644
@@ -1,7 +1,7 @@
 require eet.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.4.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.5.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 4f39c0c..b7986e1 100644
@@ -1,7 +1,7 @@
 require eeze.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.0.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index df7903b..6c7661c 100644
@@ -1,7 +1,7 @@
 require efreet.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.0.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 23b45c5..b510449 100644
@@ -1,7 +1,7 @@
 require eina.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.0.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 5cfc1d7..7c185e7 100644
@@ -1,7 +1,7 @@
 require embryo.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.0.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 3712760..284891e 100644
@@ -1,7 +1,7 @@
 require evas.inc
 
-SRCREV = "${EFL_SRCREV}"
-PV = "1.0.999+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV_1.1.0}"
+PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 1bda8df..03f203c 100644
@@ -1,4 +1,4 @@
-EFL_PREFERRED_VERSION ?= "1.0.999%"
+EFL_PREFERRED_VERSION ?= "1.1.%"
 PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_edbus ?= "${EFL_PREFERRED_VERSION}"

@@ -15,3 +15,7 @@ PREFERRED_VERSION_embryo ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_embryo-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_evas ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_evas-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_expedite ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_expedite-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_eet ?= "1.5.%"
+PREFERRED_VERSION_eet-native ?= "1.5%"

index c803399..375f914 100644
@@ -7,10 +7,6 @@ do_prepsources () {
 }
 addtask prepsources after do_patch before do_configure
 
-do_configure_prepend() {
-	autopoint || touch config.rpath
-}
-
 do_configure_append() {
 	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
 }

deleted file mode 100644
index 0dc1660..0000000
@@ -1,76 +0,0 @@
-From 5b81eac20242ece02f8bc42549783604a326f75d Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Thu, 17 Nov 2011 11:36:29 +0100
-Subject: [PATCH] elementary: gettextize
-
-* was complaining about wrong version
-  *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.17 but the autoconf macros are from gettext version 0.18
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- Makefile.am  |    2 +-
- configure.ac |    4 ++--
- po/ChangeLog |   11 +++++++++++
- 3 files changed, 14 insertions(+), 3 deletions(-)
- delete mode 100644 ChangeLog
-
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/Makefile.am b/Makefile.am
-index 46d2871..419a429 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -56,7 +56,7 @@ endif
- 
- 
- 
--EXTRA_DIST = \
-+EXTRA_DIST = config.rpath  \
- README \
- AUTHORS \
- COPYING \
-diff --git a/configure.ac b/configure.ac
-index e5ad88c..f204693 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -631,7 +631,7 @@ EFL_ENABLE_BIN([elementary-test])
- EFL_ENABLE_BIN([elementary-config])
- 
- m4_ifdef([AM_GNU_GETTEXT_VERSION], [
--AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.18.1])
- ])
- 
- m4_ifdef([AM_GNU_GETTEXT], [
-@@ -657,7 +657,7 @@ EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="
- EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"])
- 
- 
--AC_OUTPUT([
-+AC_OUTPUT([ po/Makefile.in
- Makefile
- elementary.spec
- elementary.pc
-diff --git a/po/ChangeLog b/po/ChangeLog
-index 31234d3..8ca1011 100644
---- a/po/ChangeLog
-+++ b/po/ChangeLog
-@@ -1,3 +1,14 @@
-+2011-11-17  gettextize  <[email protected]>
-+
-+	* Makefile.in.in: New file, from gettext-0.18.1.
-+	* Rules-quot: New file, from gettext-0.18.1.
-+	* boldquot.sed: New file, from gettext-0.18.1.
-+	* [email protected]: New file, from gettext-0.18.1.
-+	* [email protected]: New file, from gettext-0.18.1.
-+	* insert-header.sin: New file, from gettext-0.18.1.
-+	* quot.sed: New file, from gettext-0.18.1.
-+	* remove-potcdate.sin: New file, from gettext-0.18.1.
-+
- 2010-12-26  gettextize  <[email protected]>
- 
- 	* Makefile.in.in: New file, from gettext-0.17.
--- 
-1.7.8.rc1
-

index 6e9347e..fd5c911 100644
@@ -6,9 +6,7 @@ PV = "0.8.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl gettext
-SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
-  file://0001-elementary-gettextize-0.18.1.patch \
-"
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "\

index 78020c1..5c7d09b 100644
@@ -14,12 +14,12 @@ DEPENDS += "gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '
 #4th needed for flac playback
 #5th needed binary to create db
 RDEPENDS += "\
-	gst-plugin-typefindfunctions gst-plugin-playbin gst-plugin-volume gst-plugin-decodebin2  \
-	${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad gst-plugin-id3demux', d)} \
-	gst-plugin-ogg gst-plugin-ivorbisdec \
-	gst-plugin-flac \
-	lightmediascanner-test \
-	"
+       gst-plugins-base-typefindfunctions gst-plugins-base-playbin gst-plugins-base-volume gst-plugins-base-decodebin2 gst-plugins-good-autodetect \
+       ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly-mad gst-plugins-good-id3demux', d)} \
+       gst-plugins-base-ogg gst-plugins-base-ivorbisdec \
+       gst-plugins-good-flac \
+       lightmediascanner-test \
+       "
 
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"

index 5c7d09b..8f701a3 100644
@@ -30,9 +30,10 @@ FILES_${PN} += "${datadir}/icons/"
 EXTRA_OECONF = "\
   --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
 "
-EXTRA_OECONF_append_shr = "\
-  --enable-fso \
-"
+
+do_configure_prepend() {
+       autopoint || touch config.rpath
+}
 
 pkg_postinst_${PN} () {
 	echo "enjoy:	SCAN and LIBRARY MANAGER are not implemeted yet!"

index 4b13984..aa4baa4 100644
@@ -13,3 +13,5 @@ AUTO_LIBNAME_PKGS = ""
 
 FILES_${PN} += "${libdir}/enlightenment/utils/eeze_scanner"
 FILES_${PN}-dbg += "${libdir}/enlightenment/utils/.debug"
+
+RRECOMMENDS_${PN} += "eject"

index f885daf..949c7e1 100644
@@ -11,9 +11,9 @@ SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
 
-PR = "r2"
+PR = "r3"
 PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 

new file mode 100644
index 0000000..2ccdb72
@@ -0,0 +1,179 @@
+From 0f97df8ddf1af3b7c8d670b8600a51e2ebe4e855 Mon Sep 17 00:00:00 2001
+From: Klaus 'mrmoku' Kurzmann <[email protected]>
+Date: Sat, 19 Nov 2011 15:36:57 +0100
+Subject: [PATCH 1/2] elsa: fix to build really without PAM support if PAM is
+ disabled or not available
+
+* there as still issues in runtime without PAM, but at least it builds
+  now without PAM support and it's good start
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ PROTO/elsa/configure.ac              |    2 +-
+ PROTO/elsa/src/daemon/Makefile.am    |    6 ++++--
+ PROTO/elsa/src/daemon/elsa.c         |    8 ++++++++
+ PROTO/elsa/src/daemon/elsa.h         |    2 ++
+ PROTO/elsa/src/daemon/elsa_session.c |   11 +++++++++--
+ 5 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac85872..82d0a3f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,7 +123,6 @@ if test "x${enable_pam}" = "xyes" ; then
+ fi
+ 
+ 
+-
+ ### Checks for header files
+ 
+ # Pam
+@@ -133,6 +132,7 @@ if test "x${have_pam}" = "xyes" ; then
+       [have_pam="no"])
+ fi
+ 
++AM_CONDITIONAL(HAVE_PAM, [test "x${have_pam}" = "xyes"])
+ 
+ ### Checks for types
+ 
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index cf1cd72..7919d90 100644
+--- a/src/daemon/Makefile.am
++++ b/src/daemon/Makefile.am
+@@ -29,8 +29,6 @@ elsa_session.h     \
+ elsa_session.c     \
+ elsa_xserver.h     \
+ elsa_xserver.c     \
+-elsa_pam.h         \
+-elsa_pam.c         \
+ ../event/elsa_event.c \
+ ../event/elsa_event.h \
+ elsa_server.h     \
+@@ -42,6 +40,10 @@ elsa_action.c     \
+ elsa.h            \
+ elsa.c
+ 
++if HAVE_PAM
++elsa_SOURCES += elsa_pam.h elsa_pam.c
++endif
++
+ elsa_LDFLAGS =
+ elsa_LDADD = @ELSA_LIBS@ -lpam -lrt
+ 
+diff --git a/src/daemon/elsa.c b/src/daemon/elsa.c
+index 8bc243f..23f971d 100644
+--- a/src/daemon/elsa.c
++++ b/src/daemon/elsa.c
+@@ -278,7 +278,9 @@ main (int argc, char ** argv)
+      }
+ 
+    elsa_user = getenv("ELSA_USER");
++#ifdef HAVE_PAM
+    elsa_pam_init(PACKAGE, dname, elsa_user);
++#endif
+    if (elsa_user)
+      {
+         char *quit;
+@@ -295,7 +297,9 @@ main (int argc, char ** argv)
+              exit(0);
+           }
+         sleep(3);
++#ifdef HAVE_PAM
+         elsa_pam_init(PACKAGE, dname, NULL);
++#endif
+      }
+    else
+      fprintf(stderr, "\n");
+@@ -322,7 +326,9 @@ main (int argc, char ** argv)
+         xcb_connection_t *disp = NULL;
+         disp = xcb_connect(dname, NULL);
+         ecore_main_loop_begin();
++#ifdef HAVE_PAM
+         elsa_pam_item_set(ELSA_PAM_ITEM_USER, elsa_config->userlogin);
++#endif
+         elsa_session_login(elsa_config->command.session_login, EINA_FALSE);
+         sleep(30);
+         xcb_disconnect(disp);
+@@ -347,8 +353,10 @@ main (int argc, char ** argv)
+      }
+    elsa_xserver_shutdown();
+    fprintf(stderr, PACKAGE": xserver shutdown\n");
++#ifdef HAVE_PAM
+    elsa_pam_shutdown();
+    fprintf(stderr, PACKAGE": pam shutdown\n");
++#endif
+    ecore_shutdown();
+    elsa_config_shutdown();
+    fprintf(stderr, PACKAGE": config shutdown\n");
+diff --git a/src/daemon/elsa.h b/src/daemon/elsa.h
+index 87d9f49..46f2584 100644
+--- a/src/daemon/elsa.h
++++ b/src/daemon/elsa.h
+@@ -13,7 +13,9 @@
+ #include <Ecore_File.h>
+ 
+ #include "elsa_session.h"
++#ifdef HAVE_PAM
+ #include "elsa_pam.h"
++#endif
+ #include "elsa_config.h"
+ #include "elsa_xserver.h"
+ #include "elsa_server.h"
+diff --git a/src/daemon/elsa_session.c b/src/daemon/elsa_session.c
+index 3da70b3..d926db9 100644
+--- a/src/daemon/elsa_session.c
++++ b/src/daemon/elsa_session.c
+@@ -91,7 +91,6 @@ _elsa_session_userid_set(struct passwd *pwd)
+ static Eina_Bool
+ _elsa_session_begin(struct passwd *pwd, const char *cookie)
+ {
+-   char *term;
+    fprintf(stderr, PACKAGE": Session Init\n");
+    if (pwd->pw_shell[0] == '\0')
+      {
+@@ -99,7 +98,8 @@ _elsa_session_begin(struct passwd *pwd, const char *cookie)
+         strcpy(pwd->pw_shell, getusershell());
+         endusershell();
+      }
+-   term = getenv("TERM");
++#ifdef HAVE_PAM
++   char *term = getenv("TERM");
+    if (term) elsa_pam_env_set("TERM", term);
+    elsa_pam_env_set("HOME", pwd->pw_dir);
+    elsa_pam_env_set("SHELL", pwd->pw_shell);
+@@ -109,6 +109,7 @@ _elsa_session_begin(struct passwd *pwd, const char *cookie)
+    elsa_pam_env_set("DISPLAY", ":0.0");
+    elsa_pam_env_set("MAIL", "");
+    elsa_pam_env_set("XAUTHORITY", cookie);
++#endif
+    return EINA_TRUE;
+ }
+ 
+@@ -164,9 +165,11 @@ elsa_session_end(const char *user)
+             "%s %s ", elsa_config->command.session_stop, user);
+    if (-1 == system(buf))
+      fprintf(stderr, PACKAGE": Error on session stop command %s", buf);
++#ifdef HAVE_PAM
+    elsa_pam_close_session();
+    elsa_pam_end();
+    elsa_pam_shutdown();
++#endif
+ }
+ 
+ void
+@@ -234,8 +237,12 @@ elsa_session_shutdown()
+ Eina_Bool
+ elsa_session_authenticate(const char *login, const char *passwd)
+ {
++#ifdef HAVE_PAM
+    return (!elsa_pam_auth_set(login, passwd)
+            && !elsa_pam_authenticate());
++#else
++   return (EINA_TRUE);
++#endif
+ }
+ 
+ Eina_Bool
+-- 
+1.7.8.rc4
+

index 949c7e1..c21c2e5 100644
@@ -7,6 +7,7 @@ SECTION = "e/apps"
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
   file://0001-pam-use-common-auth-instead-of-system-auth.patch \
+  file://0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch \
   file://xserver-nodm.service \
 "
 S = "${WORKDIR}/${SRCNAME}"

new file mode 100644
index 0000000..90c0de6
@@ -0,0 +1,97 @@
+From 3e51778fdba36c81204b9eca81e67624c6401972 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Thu, 1 Dec 2011 17:28:38 +0100
+Subject: [PATCH] BINDINS/vala: update genlist/gengrid callbacks
+ s/label_get/text_get/g
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ BINDINGS/vala/examples/elementary/genlist.vala |    2 +-
+ BINDINGS/vala/vapi/elementary.vapi             |   16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/examples/elementary/genlist.vala b/examples/elementary/genlist.vala
+index b9fb42b..3a4a3b1 100644
+--- a/examples/elementary/genlist.vala
++++ b/examples/elementary/genlist.vala
+@@ -53,7 +53,7 @@ public class T.Genlist : T.Abstract
+     public static string getText( Elm.Object obj, string part )
+     {
+         int number = (int)obj;
+-        debug( "label_get: %p", obj );
++        debug( "text_get: %p", obj );
+         return "This is list item #%d".printf( number );
+     }
+     public static Elm.Object? getContent( Elm.Object obj, string part )
+diff --git a/vapi/elementary.vapi b/vapi/elementary.vapi
+index 8a6cc17..90b50f5c7 100644
+--- a/vapi/elementary.vapi
++++ b/vapi/elementary.vapi
+@@ -842,7 +842,7 @@ public class MenuItem
+     public Elm.Object object_get();
+     public void label_set( string label );
+     //public void del_cb_set( ... );
+-    public unowned string label_get();
++    public unowned string text_get();
+     public void icon_set( Elm.Object icon );
+     public void disabled_set( bool disabled );
+     public void* item_data_get();
+@@ -908,7 +908,7 @@ public class Slider : Elm.Object
+     public Slider( Elm.Object? parent );
+ 
+     public void label_set( string label );
+-    public unowned string label_get();
++    public unowned string text_get();
+     public void icon_set( Elm.Object icon );
+     public Elm.Object icon_get();
+     public void span_size_set( Evas.Coord size );
+@@ -931,8 +931,8 @@ public enum GenlistItemFlags
+     SUBITEMS,
+ }
+ 
+-[CCode (cname = "Elm_Gen_Item_Label_Get_Cb", has_target = false)]
+-public delegate string GenlistItemLabelGetFunc( Elm.Object obj, string part );
++[CCode (cname = "Elm_Gen_Item_Text_Get_Cb", has_target = false)]
++public delegate string GenlistItemTextGetFunc( Elm.Object obj, string part );
+ [CCode (cname = "Elm_Gen_Item_Content_Get_Cb", has_target = false)]
+ public delegate Elm.Object? GenlistItemContentGetFunc( Elm.Object obj, string part );
+ [CCode (cname = "Elm_Gen_Item_State_Get_Cb", has_target = false)]
+@@ -944,7 +944,7 @@ public delegate void GenlistItemDelFunc( Elm.Object obj );
+ [CCode (cname = "Elm_Gen_Item_Class_Func", destroy_function = "")]
+ public struct GenlistItemClassFunc
+ {
+-    public GenlistItemLabelGetFunc text_get;
++    public GenlistItemTextGetFunc text_get;
+     public GenlistItemContentGetFunc content_get;
+     public GenlistItemStateGetFunc state_get;
+     public GenlistItemDelFunc del;
+@@ -1027,7 +1027,7 @@ public class Check : Elm.Object
+     public Check( Elm.Object? parent );
+ 
+     public void label_set( string label );
+-    public unowned string label_get();
++    public unowned string text_get();
+     public void icon_set( Elm.Object icon );
+     public Elm.Object icon_get();
+     public void state_set( bool state );
+@@ -1044,7 +1044,7 @@ public class Radio : Elm.Object
+     public Radio( Elm.Object? parent );
+ 
+     public void label_set( string label );
+-    public unowned string label_get();
++    public unowned string text_get();
+     public void icon_set( Elm.Object icon );
+     public Elm.Object icon_get();
+     public void group_add( Elm.Object group );
+@@ -1256,7 +1256,7 @@ public class ListItem
+     public void selected_set( bool selected );
+     public void show();
+     public void* data_get();
+-    public unowned string label_get();
++    public unowned string text_get();
+     public void label_set( string label );
+     public Elm.Object icon_get();
+     public void icon_set( Elm.Object icon );
+-- 
+1.7.8.rc4
+

index f70f953..e2450aa 100644
@@ -12,7 +12,9 @@ SRCNAME = "vala"
 
 inherit e-base autotools pkgconfig vala
 
-SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http"
+SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http \
+  file://0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch \
+"
 S = "${WORKDIR}/${SRCNAME}"
 
 PACKAGES =+ "${PN}-examples"

new file mode 100644
index 0000000..ef61c99
@@ -0,0 +1,49 @@
+From 61b8233c582bcb1786bfcafa984abfd523fedcca Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Thu, 1 Dec 2011 22:07:38 +0100
+Subject: [PATCH] python-elementary: temporary fix for build breakage
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ .../include/elementary/c_elementary.pxd            |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/elementary/c_elementary.pxd b/include/elementary/c_elementary.pxd
+index 16535c5..09986f8 100644
+--- a/include/elementary/c_elementary.pxd
++++ b/include/elementary/c_elementary.pxd
+@@ -169,13 +169,13 @@ cdef extern from "Elementary.h":
+         evas.c_evas.Eina_Bool hover_top
+         evas.c_evas.Eina_Bool hover_bottom
+ 
+-    ctypedef char *(*GenlistItemLabelGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
++    ctypedef char *(*GenlistItemTextGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
+     ctypedef evas.c_evas.Evas_Object *(*GenlistItemIconGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
+     ctypedef evas.c_evas.Eina_Bool (*GenlistItemStateGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
+     ctypedef void (*GenlistItemDelFunc)(void *data, evas.c_evas.Evas_Object *obj)
+ 
+     ctypedef struct Elm_Genlist_Item_Class_Func:
+-        GenlistItemLabelGetFunc label_get
++        GenlistItemTextGetFunc text_get
+         GenlistItemIconGetFunc content_get
+         GenlistItemStateGetFunc state_get
+         GenlistItemDelFunc del_ "del"
+@@ -184,13 +184,13 @@ cdef extern from "Elementary.h":
+         char *item_style
+         Elm_Genlist_Item_Class_Func func
+ 
+-    ctypedef char *(*GengridItemLabelGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
++    ctypedef char *(*GengridItemTextGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
+     ctypedef evas.c_evas.Evas_Object *(*GengridItemIconGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
+     ctypedef evas.c_evas.Eina_Bool (*GengridItemStateGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
+     ctypedef void (*GengridItemDelFunc)(void *data, evas.c_evas.Evas_Object *obj)
+ 
+     ctypedef struct Elm_Gengrid_Item_Class_Func:
+-        GengridItemLabelGetFunc label_get
++        GengridItemTextGetFunc text_get
+         GengridItemIconGetFunc content_get
+         GengridItemStateGetFunc state_get
+         GengridItemDelFunc del_ "del"
+-- 
+1.7.8.rc4
+

index fd4ea6d..37a8ffa 100644
@@ -1,7 +1,9 @@
 require python-efl.inc
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "elementary python-evas"
 RDEPENDS_${PN} += "python-evas python-ecore python-edje" 
+
+SRC_URI += " file://0001-python-elementary-temporary-fix-for-build-breakage.patch"

index 2cec0fd..7836c8b 100644
@@ -3,13 +3,17 @@ LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "evas ecore edje elementary webkit-efl"
 PV = "0.3.0.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
 
+do_configure_prepend() {
+       autopoint || touch config.rpath
+}
+
 SRC_URI += "file://eve-theme-for-smaller-screens.patch \
 "