[EGIT] [core/enlightenment] master 01/01: modules/bluez4: fix duplicated symbol
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=33631fa62271b2ece2cb57a57e5718a1627c34c9
commit 33631fa62271b2ece2cb57a57e5718a1627c34c9
Author: Jean Guyomarc'h jean.guyoma...@gmail.com
Date: Mon Apr 13 15:26:54 2015 -0400
modules/bluez4: fix duplicated symbol
Summary:
Global variable should be declared as extern to avoid symbol duplication.
Fix compiling of ebluez4 module on OS X.
Test Plan:
Since Enlightenment cannot (yet) be fully compiled on OS X, I cannot test
the real-life impact of this change.
Reviewers: zmike, raster
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2327
---
src/modules/bluez4/ebluez4.c | 2 ++
src/modules/bluez4/ebluez4.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/bluez4/ebluez4.c b/src/modules/bluez4/ebluez4.c
index f2ce8bf..b7891d3 100644
--- a/src/modules/bluez4/ebluez4.c
+++ b/src/modules/bluez4/ebluez4.c
@@ -4,6 +4,8 @@
#include e_mod_main.h
#include ebluez4.h
+Context *ctxt = NULL;
+
typedef struct _Pair_Cb
{
void (*cb)(void *, Eina_Bool, const char *);
diff --git a/src/modules/bluez4/ebluez4.h b/src/modules/bluez4/ebluez4.h
index 058defe..9d61475 100644
--- a/src/modules/bluez4/ebluez4.h
+++ b/src/modules/bluez4/ebluez4.h
@@ -70,7 +70,7 @@ typedef struct _Context
Eina_List *adapters;
} Context;
-Context *ctxt;
+extern Context *ctxt;
void ebluez4_eldbus_init(void);
void ebluez4_eldbus_shutdown(void);
--
[EGIT] [core/enlightenment] enlightenment-0.19 01/04: modules/bluez4: fix duplicated symbol
discomfitor pushed a commit to branch enlightenment-0.19.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5caad49368049e22db6514a0a045520889cf8fec
commit 5caad49368049e22db6514a0a045520889cf8fec
Author: Jean Guyomarc'h jean.guyoma...@gmail.com
Date: Mon Apr 13 15:26:54 2015 -0400
modules/bluez4: fix duplicated symbol
Summary:
Global variable should be declared as extern to avoid symbol duplication.
Fix compiling of ebluez4 module on OS X.
Test Plan:
Since Enlightenment cannot (yet) be fully compiled on OS X, I cannot test
the real-life impact of this change.
Reviewers: zmike, raster
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2327
---
src/modules/bluez4/ebluez4.c | 2 ++
src/modules/bluez4/ebluez4.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/bluez4/ebluez4.c b/src/modules/bluez4/ebluez4.c
index f2ce8bf..b7891d3 100644
--- a/src/modules/bluez4/ebluez4.c
+++ b/src/modules/bluez4/ebluez4.c
@@ -4,6 +4,8 @@
#include e_mod_main.h
#include ebluez4.h
+Context *ctxt = NULL;
+
typedef struct _Pair_Cb
{
void (*cb)(void *, Eina_Bool, const char *);
diff --git a/src/modules/bluez4/ebluez4.h b/src/modules/bluez4/ebluez4.h
index 058defe..9d61475 100644
--- a/src/modules/bluez4/ebluez4.h
+++ b/src/modules/bluez4/ebluez4.h
@@ -70,7 +70,7 @@ typedef struct _Context
Eina_List *adapters;
} Context;
-Context *ctxt;
+extern Context *ctxt;
void ebluez4_eldbus_init(void);
void ebluez4_eldbus_shutdown(void);
--
[EGIT] [website/www] master 01/01: MAJOR: conf: Fix typo
beber pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=bc433a53abd1909e0e44d1a1d98e7964f1bc1195
commit bc433a53abd1909e0e44d1a1d98e7964f1bc1195
Author: Bertrand Jacquin bertr...@jacquin.bzh
Date: Tue Apr 14 02:09:38 2015 +0100
MAJOR: conf: Fix typo
Leading to:
DokuWiki Setup Error
The mediadir ('media') at /srv/web/enlightenment.org/public_html
/data/www-content/media is not found, isn't accessible or writable. You should
check your config and permission settings.
---
public_html/conf/local.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/conf/local.php b/public_html/conf/local.php
index 9ba1d35..423a1fa 100644
--- a/public_html/conf/local.php
+++ b/public_html/conf/local.php
@@ -54,7 +54,7 @@ $conf['plugin']['gitbacked']['repoPath'] = 'data/www-content';
$conf['plugin']['gitbacked']['repoWorkDir'] = 'data/www-content/tmp';
$conf['tpl']['dokui']['hide-entry-title'] = '1';
$conf['datadir'] = $_SERVER['DOCUMENT_ROOT'] . '/data/www-content/pages';
-$conf['mediadir'] = $_SERVER['DOCUMENT_ROOT'] . ' /data/www-content/media';
+$conf['mediadir'] = $_SERVER['DOCUMENT_ROOT'] . '/data/www-content/media';
/* plugin/gitbacked: Define a nice author (until addParams is fixed) */
$_git_auhor_name = 'www.enlightenment.org';
--
[EGIT] [website/www] master 02/04: MEDIUM: conf: Store local.php on git.
beber pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=5603eedd29ffdca336389fabc8a12bcc543149bb
commit 5603eedd29ffdca336389fabc8a12bcc543149bb
Author: Bertrand Jacquin bertr...@jacquin.bzh
Date: Tue Apr 14 01:55:07 2015 +0100
MEDIUM: conf: Store local.php on git.
Move plugins/gitbacked non default config to conf/local.php
---
.gitignore | 1 -
public_html/conf/local.php | 76 ++
public_html/lib/plugins/gitbacked/conf/default.php | 19 --
3 files changed, 76 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index 31ae363..e20bf13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
# Dokuwiki
-public_html/conf/local.php
public_html/conf/local.php.bak
public_html/conf/users.auth.php
public_html/data/attic
diff --git a/public_html/conf/local.php b/public_html/conf/local.php
new file mode 100644
index 000..9ba1d35
--- /dev/null
+++ b/public_html/conf/local.php
@@ -0,0 +1,76 @@
+?php
+/*
+ * Dokuwiki's Main Configuration File - Local Settings
+ */
+
+$conf['title'] = '';
+$conf['template'] = 'e';
+$conf['license'] = '0';
+$conf['recent'] = 0;
+$conf['recent_days'] = 0;
+$conf['breadcrumbs'] = 0;
+$conf['dformat'] = '';
+$conf['tocminheads'] = '20';
+$conf['maxtoclevel'] = '0';
+$conf['maxseclevel'] = '0';
+$conf['useheading'] = '1';
+$conf['useacl'] = 1;
+$conf['passcrypt'] = 'sha512';
+$conf['superuser'] = '@admin';
+$conf['disableactions'] = 'recent,revisions';
+$conf['jpg_quality'] = 90;
+$conf['subscribers'] = 1;
+$conf['mailfrom'] = 'no-re...@enlightenment.org';
+$conf['mailprefix'] = 'Enlightenment';
+$conf['sitemap'] = 1;
+$conf['updatecheck'] = 0;
+$conf['userewrite'] = '1';
+$conf['useslash'] = 1;
+$conf['compress'] = 0;
+$conf['send404'] = 1;
+$conf['compression'] = '0';
+$conf['plugin']['include']['showfooter'] = 0;
+$conf['plugin']['include']['showdate'] = 0;
+$conf['plugin']['include']['showuser'] = 0;
+$conf['plugin']['include']['showcomments'] = 0;
+$conf['plugin']['include']['showlinkbacks'] = 0;
+$conf['plugin']['include']['showtags'] = 0;
+$conf['plugin']['include']['showeditbtn'] = 0;
+$conf['plugin']['include']['doredirect'] = 0;
+$conf['plugin']['include']['doindent'] = 0;
+$conf['plugin']['include']['parlink'] = 0;
+$conf['plugin']['include']['safeindex'] = 0;
+$conf['plugin']['include']['readmore'] = 0;
+$conf['plugin']['captcha']['mode'] = 'audio';
+$conf['plugin']['captcha']['width'] = 300;
+$conf['plugin']['captcha']['height'] = 100;
+$conf['plugin']['discussion']['allowguests'] = 0;
+$conf['plugin']['discussion']['urlfield'] = 1;
+$conf['plugin']['discussion']['moderatorgroups'] = 'admin,edit';
+$conf['plugin']['gitbacked']['pushAfterCommit'] = 1;
+$conf['plugin']['gitbacked']['periodicPull'] = 1;
+$conf['plugin']['gitbacked']['periodicMinutes'] = 1;
+$conf['plugin']['gitbacked']['repoPath'] = 'data/www-content';
+$conf['plugin']['gitbacked']['repoWorkDir'] = 'data/www-content/tmp';
+$conf['tpl']['dokui']['hide-entry-title'] = '1';
+$conf['datadir'] = $_SERVER['DOCUMENT_ROOT'] . '/data/www-content/pages';
+$conf['mediadir'] = $_SERVER['DOCUMENT_ROOT'] . ' /data/www-content/media';
+
+/* plugin/gitbacked: Define a nice author (until addParams is fixed) */
+$_git_auhor_name = 'www.enlightenment.org';
+$_git_auhor_mail = 'no-re...@enlightenment.org';
+
+if (isset($GLOBALS['USERINFO']['name'])) {
+ $_git_auhor_name = $GLOBALS['USERINFO']['name'];
+}
+
+if (isset($GLOBALS['USERINFO']['mail'])) {
+ $_git_auhor_mail = $GLOBALS['USERINFO']['mail'];
+}
+
+putenv(GIT_AUTHOR_NAME='$_git_auhor_name');
+putenv(GIT_AUTHOR_EMAIL='$_git_auhor_mail');
+
+/* plugin/gitbacked: Let access to ssh-agent */
+putenv(HOME= . dirname($_SERVER['DOCUMENT_ROOT']));
+putenv(SSH_AUTH_SOCK= . dirname($_SERVER['DOCUMENT_ROOT']) . /.ssh/agent);
diff --git a/public_html/lib/plugins/gitbacked/conf/default.php
b/public_html/lib/plugins/gitbacked/conf/default.php
index dbaf11c..c3baffc 100644
--- a/public_html/lib/plugins/gitbacked/conf/default.php
+++ b/public_html/lib/plugins/gitbacked/conf/default.php
@@ -15,22 +15,3 @@ $conf['commitMediaMsgDel'] = 'Wiki media %media% deleted by
%user%';
$conf['repoPath'] = $GLOBALS['conf']['savedir'];
$conf['repoWorkDir'] = $GLOBALS['conf']['savedir'];
$conf['addParams'] = '';
-
-/* Define a nice author (until addParams is fixed) */
-$_git_auhor_name = 'www.enlightenment.org';
-$_git_auhor_mail = 'no-re...@enlightenment.org';
-
-if (isset($GLOBALS['USERINFO']['name'])) {
- $_git_auhor_name = $GLOBALS['USERINFO']['name'];
-}
-
-if (isset($GLOBALS['USERINFO']['mail'])) {
- $_git_auhor_mail = $GLOBALS['USERINFO']['mail'];
-}
-
-putenv(GIT_AUTHOR_NAME='$_git_auhor_name');
-putenv(GIT_AUTHOR_EMAIL='$_git_auhor_mail');
-
-/* Env for git+ssh */
-putenv(HOME= . dirname($_SERVER['DOCUMENT_ROOT']));
-putenv(SSH_AUTH_SOCK= . dirname($_SERVER['DOCUMENT_ROOT']) . /.ssh/agent);
--
[EGIT] [website/www-content] master 04/13: Wiki page dewsd changed with summary [4] by Bertrand Jacquin
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=30378a4da92c950b74da0490fc0856280fbc5519 commit 30378a4da92c950b74da0490fc0856280fbc5519 Author: Bertrand Jacquin bertr...@jacquin.bzh Date: Mon Apr 13 16:00:07 2015 -0700 Wiki page dewsd changed with summary [4] by Bertrand Jacquin --- pages/dewsd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/dewsd.txt b/pages/dewsd.txt index 2751cee..5b413cf 100644 --- a/pages/dewsd.txt +++ b/pages/dewsd.txt @@ -1 +1 @@ -rfdgerffff \ No newline at end of file +rfdgerfff \ No newline at end of file --
[EGIT] [website/www-content] master 02/13: Wiki page gtfg changed with summary [] by Bertrand Jacquin
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=a017acb82e915e27c791b7d3b8dd65a1128e5dfc commit a017acb82e915e27c791b7d3b8dd65a1128e5dfc Author: Bertrand Jacquin bertr...@jacquin.bzh Date: Mon Apr 13 15:36:09 2015 -0700 Wiki page gtfg changed with summary [] by Bertrand Jacquin --- pages/gtfg.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/gtfg.txt b/pages/gtfg.txt index 097cc75..d79ad6f 100644 --- a/pages/gtfg.txt +++ b/pages/gtfg.txt @@ -1 +1 @@ -bfdfgv \ No newline at end of file +bfdfgvgg \ No newline at end of file --
[EGIT] [website/www-content] master 11/13: Wiki page dewsd changed with summary [33] by Bertrand Jacquin
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=386cb98c0437c7bbc9f42764ba44593ace2aeb75 commit 386cb98c0437c7bbc9f42764ba44593ace2aeb75 Author: Bertrand Jacquin bertr...@jacquin.bzh Date: Mon Apr 13 17:40:52 2015 -0700 Wiki page dewsd changed with summary [33] by Bertrand Jacquin --- pages/dewsd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/dewsd.txt b/pages/dewsd.txt index 3afce0f..471ddd7 100644 --- a/pages/dewsd.txt +++ b/pages/dewsd.txt @@ -1 +1 @@ -rfdgerffbbb gfcvffbg \ No newline at end of file +rfdgerffbbb gfcvffbgbgreg \ No newline at end of file --
[EGIT] [website/www-content] master 03/11: Wiki page dewsd changed with summary [4] by Bertrand Jacquin
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f487b681240efdcb36138fa83a24b472c2f8bf38 commit f487b681240efdcb36138fa83a24b472c2f8bf38 Author: Bertrand Jacquin bertr...@jacquin.bzh Date: Mon Apr 13 15:59:19 2015 -0700 Wiki page dewsd changed with summary [4] by Bertrand Jacquin --- pages/dewsd.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/dewsd.txt b/pages/dewsd.txt new file mode 100644 index 000..2751cee --- /dev/null +++ b/pages/dewsd.txt @@ -0,0 +1 @@ +rfdgerffff \ No newline at end of file --
[EGIT] [website/www-content] master 01/01: Wiki page dewsd changed with summary [33] by Bertrand Jacquin
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=403f07877e11f1b8b901416fb20a53b61cb6b6a6 commit 403f07877e11f1b8b901416fb20a53b61cb6b6a6 Author: Bertrand Jacquin bertr...@jacquin.bzh Date: Mon Apr 13 17:42:09 2015 -0700 Wiki page dewsd changed with summary [33] by Bertrand Jacquin --- pages/dewsd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/dewsd.txt b/pages/dewsd.txt index 471ddd7..115a44d 100644 --- a/pages/dewsd.txt +++ b/pages/dewsd.txt @@ -1 +1 @@ -rfdgerffbbb gfcvffbgbgreg \ No newline at end of file +rfdgerffbbb gfcvffbgbgregfff \ No newline at end of file --
[EGIT] [website/www-content] master 07/11: Wiki page dewsd changed with summary [] by Bertrand Jacquin
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=dd7ced09429a6399768c4607e4deff34fb0abed5 commit dd7ced09429a6399768c4607e4deff34fb0abed5 Author: Bertrand Jacquin bertr...@jacquin.bzh Date: Mon Apr 13 16:29:03 2015 -0700 Wiki page dewsd changed with summary [] by Bertrand Jacquin --- pages/dewsd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/dewsd.txt b/pages/dewsd.txt index e92a352..d1b9f60 100644 --- a/pages/dewsd.txt +++ b/pages/dewsd.txt @@ -1 +1 @@ -rfdgerffbbb \ No newline at end of file +rfdgerffbbb gfcv \ No newline at end of file --
[EGIT] [core/enlightenment] master 01/01: toggle comp_hidden and grab input while client color editor is active
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f1438a418759f3652a456979b0fee53e37ec2efd commit f1438a418759f3652a456979b0fee53e37ec2efd Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Mon Apr 13 13:20:02 2015 -0400 toggle comp_hidden and grab input while client color editor is active --- src/bin/e_int_client_menu.c | 4 1 file changed, 4 insertions(+) diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c index d5d28c7..2993589 100644 --- a/src/bin/e_int_client_menu.c +++ b/src/bin/e_int_client_menu.c @@ -625,6 +625,8 @@ _e_client_menu_cb_colors_edit_del(void *data, ...) E_FREE_FUNC(ec-color_editor, evas_object_del); evas_object_event_callback_del_full(ec-frame, EVAS_CALLBACK_MOVE, (Evas_Object_Event_Cb)_e_client_menu_cb_colors_edit_moveresize, ec); evas_object_event_callback_del_full(ec-frame, EVAS_CALLBACK_RESIZE, (Evas_Object_Event_Cb)_e_client_menu_cb_colors_edit_moveresize, ec); + e_client_comp_hidden_set(ec, 0); + e_comp_ungrab_input(1, 1); e_comp_shape_queue(); } @@ -640,6 +642,8 @@ _e_client_menu_cb_colors_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi evas_object_geometry_set(o, ec-client.x, ec-client.y, ec-client.w, ec-client.h); evas_object_layer_set(o, E_LAYER_POPUP); evas_object_show(o); + e_client_comp_hidden_set(ec, 1); + e_comp_grab_input(1, 1); evas_object_smart_callback_add(o, application_closed, (Evas_Smart_Cb)_e_client_menu_cb_colors_edit_del, ec); evas_object_smart_callback_add(o, dismissed, (Evas_Smart_Cb)_e_client_menu_cb_colors_edit_del, ec); evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, (Evas_Object_Event_Cb)_e_client_menu_cb_colors_edit_del, ec); --
[EGIT] [core/efl] master 01/02: Evas GL common: Enable vertex arrays only when requested
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0c7857024b7c7043a7616c2d5a6de7484b63f07e
commit 0c7857024b7c7043a7616c2d5a6de7484b63f07e
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Mon Apr 13 15:28:16 2015 +0900
Evas GL common: Enable vertex arrays only when requested
This should fix Dave's crash with the GL engine.
Indeed the pointer to the color array is passed directly
to the driver, without memcpy. Then, during glDrawArrays, the
driver will try to address it... but it could as well be NULL or
invalid. So, crashes would occur.
Also mark use_vertex as always true. We keep this field only for the
alloc() function.
---
src/modules/evas/engines/gl_common/evas_gl_common.h | 2 +-
src/modules/evas/engines/gl_common/evas_gl_context.c | 15 ---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index e89f567..b81b913 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -511,7 +511,7 @@ struct _Evas_Engine_GL_Context
GLfloat *texsam;
GLfloat *mask;
Eina_Bool line: 1;
- Eina_Bool use_vertex : 1;
+ Eina_Bool use_vertex : 1; // always true
Eina_Bool use_color : 1;
Eina_Bool use_texuv : 1;
Eina_Bool use_texuv2 : 1;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c
b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 12da9f9..93f118f 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -1742,7 +1742,7 @@ evas_gl_common_context_line_push(Evas_Engine_GL_Context
*gc,
shader_array_flush(gc);
gc-pipe[pn].array.line = 0;
gc-pipe[pn].array.anti_alias = 0;
- gc-pipe[pn].array.use_vertex = 0;
+ //gc-pipe[pn].array.use_vertex = 0;
gc-pipe[pn].array.use_color = 0;
gc-pipe[pn].array.use_texuv = 0;
gc-pipe[pn].array.use_texuv2 = 0;
@@ -3077,8 +3077,17 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
texsam_ptr = (unsigned char *)gc-pipe[i].array.texsam;
mask_ptr = (unsigned char *)gc-pipe[i].array.mask;
}
+
+// use_vertex is always true
glVertexAttribPointer(SHAD_VERTEX, VERTEX_CNT, GL_SHORT, GL_FALSE, 0,
vertex_ptr);
-glVertexAttribPointer(SHAD_COLOR, COLOR_CNT, GL_UNSIGNED_BYTE,
GL_TRUE, 0, color_ptr);
+
+if (gc-pipe[i].array.use_color)
+ {
+ glEnableVertexAttribArray(SHAD_COLOR);
+ glVertexAttribPointer(SHAD_COLOR, COLOR_CNT, GL_UNSIGNED_BYTE,
GL_TRUE, 0, color_ptr);
+ }
+else
+ glDisableVertexAttribArray(SHAD_COLOR);
if (gc-pipe[i].array.line)
{
@@ -3338,7 +3347,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
if (gc-pipe[i].array.mask) free(gc-pipe[i].array.mask);
gc-pipe[i].array.line = 0;
-gc-pipe[i].array.use_vertex = 0;
+//gc-pipe[i].array.use_vertex = 0;
gc-pipe[i].array.use_color = 0;
gc-pipe[i].array.use_texuv = 0;
gc-pipe[i].array.use_texuv2 = 0;
--
[EGIT] [core/elementary] master 01/01: elm_image: Do not open file again if already opening (async)
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=5d3a8195ca19c6d1d53f4dcb8421a9762d6941fe commit 5d3a8195ca19c6d1d53f4dcb8421a9762d6941fe Author: Jean-Philippe Andre jp.an...@samsung.com Date: Mon Apr 13 20:29:05 2015 +0900 elm_image: Do not open file again if already opening (async) --- src/lib/elm_image.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c index b0db368..55f0b36 100644 --- a/src/lib/elm_image.c +++ b/src/lib/elm_image.c @@ -418,6 +418,13 @@ _elm_image_async_file_set(Eo *obj, Elm_Image_Data *sd, Async_Open_Data *todo; Eina_Bool was_running; + if (sd-async_opening + ((file == sd-async.file) || +(file sd-async.file !strcmp(file, sd-async.file))) + ((key == sd-async.key) || +(key sd-async.key !strcmp(key, sd-async.key + return EINA_TRUE; + sd-async_opening = EINA_TRUE; eina_stringshare_replace(sd-async.file, file); eina_stringshare_replace(sd-async.key, key); --
[EGIT] [core/evas_generic_loaders] master 01/01: release: Update NEWS and bump version for 1.14.0-beta1 release
stefan pushed a commit to branch master. http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=366e9aae6856deb9d62d2e7cc87a9fcfff0affba commit 366e9aae6856deb9d62d2e7cc87a9fcfff0affba Author: Stefan Schmidt s.schm...@samsung.com Date: Mon Apr 13 16:10:58 2015 +0200 release: Update NEWS and bump version for 1.14.0-beta1 release --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a3c60d1..d56d6a1 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([evas_generic_loaders], [v_ver-alpha1], [enlightenment-de...@lists.sourceforge.net]) +AC_INIT([evas_generic_loaders], [v_ver-beta1], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) --
[EGIT] [core/elementary] annotated tag v1.14.0-beta1 created (now 347e11f)
This is an automated email from the git hooks/post-receive script. stefan pushed a change to annotated tag v1.14.0-beta1 in repository core/elementary. at 347e11f (tag) tagging ecf09f54ac145afe8cc9f892e1e981499648c5f8 (commit) replaces v1.14.0-alpha1 tagged by Stefan Schmidt on Mon Apr 13 16:26:40 2015 +0200 - Log - v1.14.0-beta1 Carsten Haitzler (2): elm image - stop repeating events by default - wrong elm - undeprecate preferred engine config api - still neeed it for cases Daniel Juyung Seo (1): examples: Use new efl apis for size_set and visibility_set. Jaehyun Cho (1): test_naviframe: Fix content image file names. Jaeun Choi (2): elm_genlist: pass eo_it to eo_do_ret func, not VIEW(it) elm_image: return EINA_FALSE if the data source is NULL in elm_image_memfile_set Jean-Philippe ANDRÉ (3): elm_image: Fix potential race conditions in async mode elm_suite: Add test for async file set elm_image: Do not open file again if already opening (async) Olliver Schinagl (1): flipselector: Remove has some nbsp's and random whitespaces SangHyeon Lee (1): list/genlist/gengrid: Fix default return value in eolian APIs. Stefan Schmidt (3): elm_object: Add since tag for new elm_object_access_info_get() build: Allow to define path for eldbus-codegen binary release: Update NEWS and bump version for 1.14.0-beta1 release kumar navneet (1): [elm_panel] Fix mirroring issue. woochan lee (1): Delete whitespaces for header and eo files. --- No new revisions were added by this update. --
[EGIT] [core/evas_generic_loaders] annotated tag v1.14.0-beta1 created (now f80037b)
This is an automated email from the git hooks/post-receive script. stefan pushed a change to annotated tag v1.14.0-beta1 in repository core/evas_generic_loaders. at f80037b (tag) tagging 366e9aae6856deb9d62d2e7cc87a9fcfff0affba (commit) replaces v1.14.0-alpha1 tagged by Stefan Schmidt on Mon Apr 13 16:26:30 2015 +0200 - Log - v1.14.0-beta1 Stefan Schmidt (1): release: Update NEWS and bump version for 1.14.0-beta1 release --- No new revisions were added by this update. --
[EGIT] [core/elementary] master 01/01: release: Update NEWS and bump version for 1.14.0-beta1 release
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ecf09f54ac145afe8cc9f892e1e981499648c5f8 commit ecf09f54ac145afe8cc9f892e1e981499648c5f8 Author: Stefan Schmidt s.schm...@samsung.com Date: Mon Apr 13 16:13:44 2015 +0200 release: Update NEWS and bump version for 1.14.0-beta1 release --- NEWS | 5 + configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d7d1695..b81db99 100644 --- a/NEWS +++ b/NEWS @@ -67,6 +67,11 @@ Fixes: * elm_naviframe: use of elm_app_data_dir_get() instead of PACKAGE_DATA_DIR. * elm_map: use of elm_app_data_dir_get() instead of PACKAGE_DATA_DIR * Elm_Win: Fix _elm_win_focus_prev_target_del callback added repeatly without callback del. + * elm image - stop repeating events by default - wrong + * elm_genlist: pass eo_it to eo_do_ret func, not VIEW(it) + * [elm_panel] Fix mirroring issue. + * test_naviframe: Fix content image file names. + * elm_image: return EINA_FALSE if the data source is NULL in elm_image_memfile_set Changes since 1.12.0: - diff --git a/configure.ac b/configure.ac index f3a3a37..c492469 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ EFL_VERSION([1], [14], [0], [release]) -AC_INIT([elementary], [efl_version-alpha1], [enlightenment-de...@lists.sourceforge.net]) +AC_INIT([elementary], [efl_version-beta1], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ(2.63) AC_CONFIG_SRCDIR([configure.ac]) --
[EGIT] [admin/release-management] master 01/05: distributions: Add script from Leif to fetch versions from distros
stefan pushed a commit to branch master. http://git.enlightenment.org/admin/release-management.git/commit/?id=ea9e68c45502cf197cd4730714912cf82275bade commit ea9e68c45502cf197cd4730714912cf82275bade Author: Stefan Schmidt s.schm...@samsung.com Date: Mon Apr 13 14:12:59 2015 +0200 distributions: Add script from Leif to fetch versions from distros This is the script Leif posted on https://phab.enlightenment.org/P115 to show how we could automatically fetch the versions from distro page. I will try to extend it to cover more distros and automatically generate the table as output. --- distributions_versions_fetch_script.py | 47 ++ 1 file changed, 47 insertions(+) diff --git a/distributions_versions_fetch_script.py b/distributions_versions_fetch_script.py new file mode 100755 index 000..d0217d2 --- /dev/null +++ b/distributions_versions_fetch_script.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python2 + +import re +from lxml import html +import requests + +def grep_version_string(repo_listing, pkg_name_prefix): + regex = pkg_name_prefix + [0-9.]+ + p = re.compile(regex) + match = re.search(p, repo_listing) + if match is None: + return None + first_match = match.group(0) + if first_match is not None: + #remove the first package name prefix + return first_match.strip(pkg_name_prefix) + return None + +def scrap_page(url, xpath, pkg_name_prefix): + html_page = requests.get(url) + tree = html.fromstring(html_page.text) + html_text = tree.xpath(xpath)[0] # use first node + pkgversion = grep_version_string(html_text, pkg_name_prefix) + if pkgversion != None: + return pkgversion + return None + +def main(): + distributions_data = [ + (arch, https://www.archlinux.org/packages/extra/x86_64/efl/;, /html/body/div[@id=\content\]/div[@id=\pkgdetails\]/h2/text(), efl ), + (ubuntu, https://launchpad.net/ubuntu/vivid/amd64/libecore-con1/1.8.6-2.1ubuntu1;, //*[@id=\portlet-details\]/div/dl[1]/dd/text(), ), + (debian, https://tracker.debian.org/pkg/efl;, //*[@id=\dtracker-package-left\]/div[1]/div[2]/ul/li[2]/div[2]/text(), ), + (fedora, https://apps.fedoraproject.org/packages/efl;, //*[@id=\package-info-bar\]/div[1]/div[2]/text(), ), + (elive, http://repository.elivecd.org/pool/efl/libe/libefl/;, /html/body/pre/a/text()[starts-with(.,'libefl1_')], libefl1_), + (openSuSE 13.2, http://download.opensuse.org/ports/update/13.2/aarch64/;, /html/body/pre/a/text()[starts-with(., 'efl-')], efl-), + (gentoo, https://packages.gentoo.org/package/dev-libs/efl;, //td[@class=\ebuild\][2]/text(), ), + (Tizen (Common), https://build.tizen.org/package/binaries?package=eflproject=Tizen%3ACommonrepository=x86_64-x11;, //*[@id=\content\]/div/ul//li/a/text()[starts-with(., 'efl-')], efl-) + ] + for param_set in distributions_data: + distri = param_set[0] + url = param_set[1] + xpath = param_set[2] + pkg_name_prefix = param_set[3] + print %s: %s % (distri, scrap_page(url, xpath, pkg_name_prefix)) + +if __name__ == '__main__': + main() --
