diff options
17 files changed, 11 insertions, 347 deletions
diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 79104ec520..8b21675d8f 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass | |||
| @@ -1,13 +1,6 @@ | |||
| 1 | HOMEPAGE = "http://www.enlightenment.org" | 1 | HOMEPAGE = "http://www.enlightenment.org" |
| 2 | SRCNAME ?= "${BPN}" | 2 | SRCNAME ?= "${BPN}" |
| 3 | 3 | ||
| 4 | # usually tracks svn trunk HEAD | 4 | EFL_SRCREV ?= "66164" |
| 5 | EFL_SRCREV ?= "65808" | ||
| 6 | # revision when 1.1.0 (eet is actually 1.5.0) was released, | ||
| 7 | # so we can lock some release libs to this revision | ||
| 8 | # and use EFL_SRCREV to track e17 and elementary | ||
| 9 | EFL_SRCREV_1.1.0 ?= "65800" | ||
| 10 | # revision when 1.0.0 was released, for recipes which don't need rebuild so often | ||
| 11 | EFL_SRCREV_1.0.0 ?= "56356" | ||
| 12 | 5 | ||
| 13 | ARM_INSTRUCTION_SET = "arm" | 6 | ARM_INSTRUCTION_SET = "arm" |
diff --git a/meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch b/meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch deleted file mode 100644 index ef61c991cb..0000000000 --- a/meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | From 61b8233c582bcb1786bfcafa984abfd523fedcca Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Thu, 1 Dec 2011 22:07:38 +0100 | ||
| 4 | Subject: [PATCH] python-elementary: temporary fix for build breakage | ||
| 5 | |||
| 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 7 | --- | ||
| 8 | .../include/elementary/c_elementary.pxd | 8 ++++---- | ||
| 9 | 1 files changed, 4 insertions(+), 4 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/include/elementary/c_elementary.pxd b/include/elementary/c_elementary.pxd | ||
| 12 | index 16535c5..09986f8 100644 | ||
| 13 | --- a/include/elementary/c_elementary.pxd | ||
| 14 | +++ b/include/elementary/c_elementary.pxd | ||
| 15 | @@ -169,13 +169,13 @@ cdef extern from "Elementary.h": | ||
| 16 | evas.c_evas.Eina_Bool hover_top | ||
| 17 | evas.c_evas.Eina_Bool hover_bottom | ||
| 18 | |||
| 19 | - ctypedef char *(*GenlistItemLabelGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part) | ||
| 20 | + ctypedef char *(*GenlistItemTextGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part) | ||
| 21 | ctypedef evas.c_evas.Evas_Object *(*GenlistItemIconGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part) | ||
| 22 | ctypedef evas.c_evas.Eina_Bool (*GenlistItemStateGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part) | ||
| 23 | ctypedef void (*GenlistItemDelFunc)(void *data, evas.c_evas.Evas_Object *obj) | ||
| 24 | |||
| 25 | ctypedef struct Elm_Genlist_Item_Class_Func: | ||
| 26 | - GenlistItemLabelGetFunc label_get | ||
| 27 | + GenlistItemTextGetFunc text_get | ||
| 28 | GenlistItemIconGetFunc content_get | ||
| 29 | GenlistItemStateGetFunc state_get | ||
| 30 | GenlistItemDelFunc del_ "del" | ||
| 31 | @@ -184,13 +184,13 @@ cdef extern from "Elementary.h": | ||
| 32 | char *item_style | ||
| 33 | Elm_Genlist_Item_Class_Func func | ||
| 34 | |||
| 35 | - ctypedef char *(*GengridItemLabelGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part) | ||
| 36 | + ctypedef char *(*GengridItemTextGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part) | ||
| 37 | ctypedef evas.c_evas.Evas_Object *(*GengridItemIconGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part) | ||
| 38 | ctypedef evas.c_evas.Eina_Bool (*GengridItemStateGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part) | ||
| 39 | ctypedef void (*GengridItemDelFunc)(void *data, evas.c_evas.Evas_Object *obj) | ||
| 40 | |||
| 41 | ctypedef struct Elm_Gengrid_Item_Class_Func: | ||
| 42 | - GengridItemLabelGetFunc label_get | ||
| 43 | + GengridItemTextGetFunc text_get | ||
| 44 | GengridItemIconGetFunc content_get | ||
| 45 | GengridItemStateGetFunc state_get | ||
| 46 | GengridItemDelFunc del_ "del" | ||
| 47 | -- | ||
| 48 | 1.7.8.rc4 | ||
| 49 | |||
diff --git a/meta-efl/recipes-devtools/python/python-elementary_svn.bb b/meta-efl/recipes-devtools/python/python-elementary_svn.bb index 37a8ffae48..6d8b0b8ea3 100644 --- a/meta-efl/recipes-devtools/python/python-elementary_svn.bb +++ b/meta-efl/recipes-devtools/python/python-elementary_svn.bb | |||
| @@ -5,5 +5,3 @@ PR = "${INC_PR}.2" | |||
| 5 | SRCREV = "${EFL_SRCREV}" | 5 | SRCREV = "${EFL_SRCREV}" |
| 6 | DEPENDS += "elementary python-evas" | 6 | DEPENDS += "elementary python-evas" |
| 7 | RDEPENDS_${PN} += "python-evas python-ecore python-edje" | 7 | RDEPENDS_${PN} += "python-evas python-ecore python-edje" |
| 8 | |||
| 9 | SRC_URI += " file://0001-python-elementary-temporary-fix-for-build-breakage.patch" | ||
diff --git a/meta-efl/recipes-efl/e17/expedite_svn.bb b/meta-efl/recipes-efl/e17/expedite_svn.bb index dfcbcde085..e6dc0515fa 100644 --- a/meta-efl/recipes-efl/e17/expedite_svn.bb +++ b/meta-efl/recipes-efl/e17/expedite_svn.bb | |||
| @@ -2,7 +2,7 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" | |||
| 2 | DEPENDS = "eet evas" | 2 | DEPENDS = "eet evas" |
| 3 | LICENSE = "MIT BSD" | 3 | LICENSE = "MIT BSD" |
| 4 | 4 | ||
| 5 | SRCREV = "${EFL_SRCREV_1.1.0}" | 5 | SRCREV = "${EFL_SRCREV}" |
| 6 | PV = "1.1.0+svnr${SRCPV}" | 6 | PV = "1.1.0+svnr${SRCPV}" |
| 7 | PR = "r1" | 7 | PR = "r1" |
| 8 | 8 | ||
diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb index 5cad73d8f9..1d3706f27f 100644 --- a/meta-efl/recipes-efl/efl/ecore_svn.bb +++ b/meta-efl/recipes-efl/efl/ecore_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require ecore.inc | 1 | require ecore.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.1.0+svnr${SRCPV}" | 4 | PV = "1.1.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index 5d79c022f2..ebe4312a83 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require edbus.inc | 1 | require edbus.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.1.0+svnr${SRCPV}" | 4 | PV = "1.1.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb index c3e1a95b80..1fedfbcd57 100644 --- a/meta-efl/recipes-efl/efl/edje_svn.bb +++ b/meta-efl/recipes-efl/efl/edje_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require edje.inc | 1 | require edje.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.1.0+svnr${SRCPV}" | 4 | PV = "1.1.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb index aad311b8fd..42439cba95 100644 --- a/meta-efl/recipes-efl/efl/eet_svn.bb +++ b/meta-efl/recipes-efl/efl/eet_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require eet.inc | 1 | require eet.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.5.0+svnr${SRCPV}" | 4 | PV = "1.5.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb index b7986e118a..901634859c 100644 --- a/meta-efl/recipes-efl/efl/eeze_svn.bb +++ b/meta-efl/recipes-efl/efl/eeze_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require eeze.inc | 1 | require eeze.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.1.0+svnr${SRCPV}" | 4 | PV = "1.1.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb index 6c7661cea3..a711770ecf 100644 --- a/meta-efl/recipes-efl/efl/efreet_svn.bb +++ b/meta-efl/recipes-efl/efl/efreet_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require efreet.inc | 1 | require efreet.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.1.0+svnr${SRCPV}" | 4 | PV = "1.1.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb index b5104491e5..8256387e88 100644 --- a/meta-efl/recipes-efl/efl/eina_svn.bb +++ b/meta-efl/recipes-efl/efl/eina_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require eina.inc | 1 | require eina.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.1.0+svnr${SRCPV}" | 4 | PV = "1.1.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch b/meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch deleted file mode 100644 index 2ccdb72067..0000000000 --- a/meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch +++ /dev/null | |||
| @@ -1,179 +0,0 @@ | |||
| 1 | From 0f97df8ddf1af3b7c8d670b8600a51e2ebe4e855 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Klaus 'mrmoku' Kurzmann <mok@mnet-online.de> | ||
| 3 | Date: Sat, 19 Nov 2011 15:36:57 +0100 | ||
| 4 | Subject: [PATCH 1/2] elsa: fix to build really without PAM support if PAM is | ||
| 5 | disabled or not available | ||
| 6 | |||
| 7 | * there as still issues in runtime without PAM, but at least it builds | ||
| 8 | now without PAM support and it's good start | ||
| 9 | |||
| 10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 11 | --- | ||
| 12 | PROTO/elsa/configure.ac | 2 +- | ||
| 13 | PROTO/elsa/src/daemon/Makefile.am | 6 ++++-- | ||
| 14 | PROTO/elsa/src/daemon/elsa.c | 8 ++++++++ | ||
| 15 | PROTO/elsa/src/daemon/elsa.h | 2 ++ | ||
| 16 | PROTO/elsa/src/daemon/elsa_session.c | 11 +++++++++-- | ||
| 17 | 5 files changed, 24 insertions(+), 5 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/configure.ac b/configure.ac | ||
| 20 | index ac85872..82d0a3f 100644 | ||
| 21 | --- a/configure.ac | ||
| 22 | +++ b/configure.ac | ||
| 23 | @@ -123,7 +123,6 @@ if test "x${enable_pam}" = "xyes" ; then | ||
| 24 | fi | ||
| 25 | |||
| 26 | |||
| 27 | - | ||
| 28 | ### Checks for header files | ||
| 29 | |||
| 30 | # Pam | ||
| 31 | @@ -133,6 +132,7 @@ if test "x${have_pam}" = "xyes" ; then | ||
| 32 | [have_pam="no"]) | ||
| 33 | fi | ||
| 34 | |||
| 35 | +AM_CONDITIONAL(HAVE_PAM, [test "x${have_pam}" = "xyes"]) | ||
| 36 | |||
| 37 | ### Checks for types | ||
| 38 | |||
| 39 | diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am | ||
| 40 | index cf1cd72..7919d90 100644 | ||
| 41 | --- a/src/daemon/Makefile.am | ||
| 42 | +++ b/src/daemon/Makefile.am | ||
| 43 | @@ -29,8 +29,6 @@ elsa_session.h \ | ||
| 44 | elsa_session.c \ | ||
| 45 | elsa_xserver.h \ | ||
| 46 | elsa_xserver.c \ | ||
| 47 | -elsa_pam.h \ | ||
| 48 | -elsa_pam.c \ | ||
| 49 | ../event/elsa_event.c \ | ||
| 50 | ../event/elsa_event.h \ | ||
| 51 | elsa_server.h \ | ||
| 52 | @@ -42,6 +40,10 @@ elsa_action.c \ | ||
| 53 | elsa.h \ | ||
| 54 | elsa.c | ||
| 55 | |||
| 56 | +if HAVE_PAM | ||
| 57 | +elsa_SOURCES += elsa_pam.h elsa_pam.c | ||
| 58 | +endif | ||
| 59 | + | ||
| 60 | elsa_LDFLAGS = | ||
| 61 | elsa_LDADD = @ELSA_LIBS@ -lpam -lrt | ||
| 62 | |||
| 63 | diff --git a/src/daemon/elsa.c b/src/daemon/elsa.c | ||
| 64 | index 8bc243f..23f971d 100644 | ||
| 65 | --- a/src/daemon/elsa.c | ||
| 66 | +++ b/src/daemon/elsa.c | ||
| 67 | @@ -278,7 +278,9 @@ main (int argc, char ** argv) | ||
| 68 | } | ||
| 69 | |||
| 70 | elsa_user = getenv("ELSA_USER"); | ||
| 71 | +#ifdef HAVE_PAM | ||
| 72 | elsa_pam_init(PACKAGE, dname, elsa_user); | ||
| 73 | +#endif | ||
| 74 | if (elsa_user) | ||
| 75 | { | ||
| 76 | char *quit; | ||
| 77 | @@ -295,7 +297,9 @@ main (int argc, char ** argv) | ||
| 78 | exit(0); | ||
| 79 | } | ||
| 80 | sleep(3); | ||
| 81 | +#ifdef HAVE_PAM | ||
| 82 | elsa_pam_init(PACKAGE, dname, NULL); | ||
| 83 | +#endif | ||
| 84 | } | ||
| 85 | else | ||
| 86 | fprintf(stderr, "\n"); | ||
| 87 | @@ -322,7 +326,9 @@ main (int argc, char ** argv) | ||
| 88 | xcb_connection_t *disp = NULL; | ||
| 89 | disp = xcb_connect(dname, NULL); | ||
| 90 | ecore_main_loop_begin(); | ||
| 91 | +#ifdef HAVE_PAM | ||
| 92 | elsa_pam_item_set(ELSA_PAM_ITEM_USER, elsa_config->userlogin); | ||
| 93 | +#endif | ||
| 94 | elsa_session_login(elsa_config->command.session_login, EINA_FALSE); | ||
| 95 | sleep(30); | ||
| 96 | xcb_disconnect(disp); | ||
| 97 | @@ -347,8 +353,10 @@ main (int argc, char ** argv) | ||
| 98 | } | ||
| 99 | elsa_xserver_shutdown(); | ||
| 100 | fprintf(stderr, PACKAGE": xserver shutdown\n"); | ||
| 101 | +#ifdef HAVE_PAM | ||
| 102 | elsa_pam_shutdown(); | ||
| 103 | fprintf(stderr, PACKAGE": pam shutdown\n"); | ||
| 104 | +#endif | ||
| 105 | ecore_shutdown(); | ||
| 106 | elsa_config_shutdown(); | ||
| 107 | fprintf(stderr, PACKAGE": config shutdown\n"); | ||
| 108 | diff --git a/src/daemon/elsa.h b/src/daemon/elsa.h | ||
| 109 | index 87d9f49..46f2584 100644 | ||
| 110 | --- a/src/daemon/elsa.h | ||
| 111 | +++ b/src/daemon/elsa.h | ||
| 112 | @@ -13,7 +13,9 @@ | ||
| 113 | #include <Ecore_File.h> | ||
| 114 | |||
| 115 | #include "elsa_session.h" | ||
| 116 | +#ifdef HAVE_PAM | ||
| 117 | #include "elsa_pam.h" | ||
| 118 | +#endif | ||
| 119 | #include "elsa_config.h" | ||
| 120 | #include "elsa_xserver.h" | ||
| 121 | #include "elsa_server.h" | ||
| 122 | diff --git a/src/daemon/elsa_session.c b/src/daemon/elsa_session.c | ||
| 123 | index 3da70b3..d926db9 100644 | ||
| 124 | --- a/src/daemon/elsa_session.c | ||
| 125 | +++ b/src/daemon/elsa_session.c | ||
| 126 | @@ -91,7 +91,6 @@ _elsa_session_userid_set(struct passwd *pwd) | ||
| 127 | static Eina_Bool | ||
| 128 | _elsa_session_begin(struct passwd *pwd, const char *cookie) | ||
| 129 | { | ||
| 130 | - char *term; | ||
| 131 | fprintf(stderr, PACKAGE": Session Init\n"); | ||
| 132 | if (pwd->pw_shell[0] == '\0') | ||
| 133 | { | ||
| 134 | @@ -99,7 +98,8 @@ _elsa_session_begin(struct passwd *pwd, const char *cookie) | ||
| 135 | strcpy(pwd->pw_shell, getusershell()); | ||
| 136 | endusershell(); | ||
| 137 | } | ||
| 138 | - term = getenv("TERM"); | ||
| 139 | +#ifdef HAVE_PAM | ||
| 140 | + char *term = getenv("TERM"); | ||
| 141 | if (term) elsa_pam_env_set("TERM", term); | ||
| 142 | elsa_pam_env_set("HOME", pwd->pw_dir); | ||
| 143 | elsa_pam_env_set("SHELL", pwd->pw_shell); | ||
| 144 | @@ -109,6 +109,7 @@ _elsa_session_begin(struct passwd *pwd, const char *cookie) | ||
| 145 | elsa_pam_env_set("DISPLAY", ":0.0"); | ||
| 146 | elsa_pam_env_set("MAIL", ""); | ||
| 147 | elsa_pam_env_set("XAUTHORITY", cookie); | ||
| 148 | +#endif | ||
| 149 | return EINA_TRUE; | ||
| 150 | } | ||
| 151 | |||
| 152 | @@ -164,9 +165,11 @@ elsa_session_end(const char *user) | ||
| 153 | "%s %s ", elsa_config->command.session_stop, user); | ||
| 154 | if (-1 == system(buf)) | ||
| 155 | fprintf(stderr, PACKAGE": Error on session stop command %s", buf); | ||
| 156 | +#ifdef HAVE_PAM | ||
| 157 | elsa_pam_close_session(); | ||
| 158 | elsa_pam_end(); | ||
| 159 | elsa_pam_shutdown(); | ||
| 160 | +#endif | ||
| 161 | } | ||
| 162 | |||
| 163 | void | ||
| 164 | @@ -234,8 +237,12 @@ elsa_session_shutdown() | ||
| 165 | Eina_Bool | ||
| 166 | elsa_session_authenticate(const char *login, const char *passwd) | ||
| 167 | { | ||
| 168 | +#ifdef HAVE_PAM | ||
| 169 | return (!elsa_pam_auth_set(login, passwd) | ||
| 170 | && !elsa_pam_authenticate()); | ||
| 171 | +#else | ||
| 172 | + return (EINA_TRUE); | ||
| 173 | +#endif | ||
| 174 | } | ||
| 175 | |||
| 176 | Eina_Bool | ||
| 177 | -- | ||
| 178 | 1.7.8.rc4 | ||
| 179 | |||
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb index c21c2e560e..949c7e1f80 100644 --- a/meta-efl/recipes-efl/efl/elsa_svn.bb +++ b/meta-efl/recipes-efl/efl/elsa_svn.bb | |||
| @@ -7,7 +7,6 @@ SECTION = "e/apps" | |||
| 7 | inherit e gettext | 7 | inherit e gettext |
| 8 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ | 8 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \ |
| 9 | file://0001-pam-use-common-auth-instead-of-system-auth.patch \ | 9 | file://0001-pam-use-common-auth-instead-of-system-auth.patch \ |
| 10 | file://0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch \ | ||
| 11 | file://xserver-nodm.service \ | 10 | file://xserver-nodm.service \ |
| 12 | " | 11 | " |
| 13 | S = "${WORKDIR}/${SRCNAME}" | 12 | S = "${WORKDIR}/${SRCNAME}" |
diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb index 7c185e7710..ad1bb10173 100644 --- a/meta-efl/recipes-efl/efl/embryo_svn.bb +++ b/meta-efl/recipes-efl/efl/embryo_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require embryo.inc | 1 | require embryo.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.1.0+svnr${SRCPV}" | 4 | PV = "1.1.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb index 284891e5ac..a2641b984c 100644 --- a/meta-efl/recipes-efl/efl/evas_svn.bb +++ b/meta-efl/recipes-efl/efl/evas_svn.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require evas.inc | 1 | require evas.inc |
| 2 | 2 | ||
| 3 | SRCREV = "${EFL_SRCREV_1.1.0}" | 3 | SRCREV = "${EFL_SRCREV}" |
| 4 | PV = "1.1.0+svnr${SRCPV}" | 4 | PV = "1.1.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch b/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch deleted file mode 100644 index 90c0de6e2b..0000000000 --- a/meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch +++ /dev/null | |||
| @@ -1,97 +0,0 @@ | |||
| 1 | From 3e51778fdba36c81204b9eca81e67624c6401972 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Thu, 1 Dec 2011 17:28:38 +0100 | ||
| 4 | Subject: [PATCH] BINDINS/vala: update genlist/gengrid callbacks | ||
| 5 | s/label_get/text_get/g | ||
| 6 | |||
| 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 8 | --- | ||
| 9 | BINDINGS/vala/examples/elementary/genlist.vala | 2 +- | ||
| 10 | BINDINGS/vala/vapi/elementary.vapi | 16 ++++++++-------- | ||
| 11 | 2 files changed, 9 insertions(+), 9 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/examples/elementary/genlist.vala b/examples/elementary/genlist.vala | ||
| 14 | index b9fb42b..3a4a3b1 100644 | ||
| 15 | --- a/examples/elementary/genlist.vala | ||
| 16 | +++ b/examples/elementary/genlist.vala | ||
| 17 | @@ -53,7 +53,7 @@ public class T.Genlist : T.Abstract | ||
| 18 | public static string getText( Elm.Object obj, string part ) | ||
| 19 | { | ||
| 20 | int number = (int)obj; | ||
| 21 | - debug( "label_get: %p", obj ); | ||
| 22 | + debug( "text_get: %p", obj ); | ||
| 23 | return "This is list item #%d".printf( number ); | ||
| 24 | } | ||
| 25 | public static Elm.Object? getContent( Elm.Object obj, string part ) | ||
| 26 | diff --git a/vapi/elementary.vapi b/vapi/elementary.vapi | ||
| 27 | index 8a6cc17..90b50f5c7 100644 | ||
| 28 | --- a/vapi/elementary.vapi | ||
| 29 | +++ b/vapi/elementary.vapi | ||
| 30 | @@ -842,7 +842,7 @@ public class MenuItem | ||
| 31 | public Elm.Object object_get(); | ||
| 32 | public void label_set( string label ); | ||
| 33 | //public void del_cb_set( ... ); | ||
| 34 | - public unowned string label_get(); | ||
| 35 | + public unowned string text_get(); | ||
| 36 | public void icon_set( Elm.Object icon ); | ||
| 37 | public void disabled_set( bool disabled ); | ||
| 38 | public void* item_data_get(); | ||
| 39 | @@ -908,7 +908,7 @@ public class Slider : Elm.Object | ||
| 40 | public Slider( Elm.Object? parent ); | ||
| 41 | |||
| 42 | public void label_set( string label ); | ||
| 43 | - public unowned string label_get(); | ||
| 44 | + public unowned string text_get(); | ||
| 45 | public void icon_set( Elm.Object icon ); | ||
| 46 | public Elm.Object icon_get(); | ||
| 47 | public void span_size_set( Evas.Coord size ); | ||
| 48 | @@ -931,8 +931,8 @@ public enum GenlistItemFlags | ||
| 49 | SUBITEMS, | ||
| 50 | } | ||
| 51 | |||
| 52 | -[CCode (cname = "Elm_Gen_Item_Label_Get_Cb", has_target = false)] | ||
| 53 | -public delegate string GenlistItemLabelGetFunc( Elm.Object obj, string part ); | ||
| 54 | +[CCode (cname = "Elm_Gen_Item_Text_Get_Cb", has_target = false)] | ||
| 55 | +public delegate string GenlistItemTextGetFunc( Elm.Object obj, string part ); | ||
| 56 | [CCode (cname = "Elm_Gen_Item_Content_Get_Cb", has_target = false)] | ||
| 57 | public delegate Elm.Object? GenlistItemContentGetFunc( Elm.Object obj, string part ); | ||
| 58 | [CCode (cname = "Elm_Gen_Item_State_Get_Cb", has_target = false)] | ||
| 59 | @@ -944,7 +944,7 @@ public delegate void GenlistItemDelFunc( Elm.Object obj ); | ||
| 60 | [CCode (cname = "Elm_Gen_Item_Class_Func", destroy_function = "")] | ||
| 61 | public struct GenlistItemClassFunc | ||
| 62 | { | ||
| 63 | - public GenlistItemLabelGetFunc text_get; | ||
| 64 | + public GenlistItemTextGetFunc text_get; | ||
| 65 | public GenlistItemContentGetFunc content_get; | ||
| 66 | public GenlistItemStateGetFunc state_get; | ||
| 67 | public GenlistItemDelFunc del; | ||
| 68 | @@ -1027,7 +1027,7 @@ public class Check : Elm.Object | ||
| 69 | public Check( Elm.Object? parent ); | ||
| 70 | |||
| 71 | public void label_set( string label ); | ||
| 72 | - public unowned string label_get(); | ||
| 73 | + public unowned string text_get(); | ||
| 74 | public void icon_set( Elm.Object icon ); | ||
| 75 | public Elm.Object icon_get(); | ||
| 76 | public void state_set( bool state ); | ||
| 77 | @@ -1044,7 +1044,7 @@ public class Radio : Elm.Object | ||
| 78 | public Radio( Elm.Object? parent ); | ||
| 79 | |||
| 80 | public void label_set( string label ); | ||
| 81 | - public unowned string label_get(); | ||
| 82 | + public unowned string text_get(); | ||
| 83 | public void icon_set( Elm.Object icon ); | ||
| 84 | public Elm.Object icon_get(); | ||
| 85 | public void group_add( Elm.Object group ); | ||
| 86 | @@ -1256,7 +1256,7 @@ public class ListItem | ||
| 87 | public void selected_set( bool selected ); | ||
| 88 | public void show(); | ||
| 89 | public void* data_get(); | ||
| 90 | - public unowned string label_get(); | ||
| 91 | + public unowned string text_get(); | ||
| 92 | public void label_set( string label ); | ||
| 93 | public Elm.Object icon_get(); | ||
| 94 | public void icon_set( Elm.Object icon ); | ||
| 95 | -- | ||
| 96 | 1.7.8.rc4 | ||
| 97 | |||
diff --git a/meta-efl/recipes-efl/efl/libeflvala_svn.bb b/meta-efl/recipes-efl/efl/libeflvala_svn.bb index e2450aa893..c18c8c98df 100644 --- a/meta-efl/recipes-efl/efl/libeflvala_svn.bb +++ b/meta-efl/recipes-efl/efl/libeflvala_svn.bb | |||
| @@ -13,7 +13,6 @@ SRCNAME = "vala" | |||
| 13 | inherit e-base autotools pkgconfig vala | 13 | inherit e-base autotools pkgconfig vala |
| 14 | 14 | ||
| 15 | SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http \ | 15 | SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http \ |
| 16 | file://0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch \ | ||
| 17 | " | 16 | " |
| 18 | S = "${WORKDIR}/${SRCNAME}" | 17 | S = "${WORKDIR}/${SRCNAME}" |
| 19 | 18 | ||
