summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalii Vorobiov <vi.vorobiov@samsung.com>2014-08-27 19:09:07 +0300
committerVitalii Vorobiov <vi.vorobiov@samsung.com>2014-08-27 19:09:07 +0300
commit92d7f229774fa51a197c8d377ea2477f647be51c (patch)
treeff81be12543209f6ca2ddb6125d4b9a81c0e8071
parent98bd65467277e10920d11ec9a8a5ac2bae68e03f (diff)
parentb8c84371977f782e93b42fa4cfe58df5a927d9af (diff)
Merge branch 'develop'0.2.0
-rw-r--r--NEWS8
-rw-r--r--configure.ac36
-rw-r--r--data/themes/widgets/entry.edc4
3 files changed, 27 insertions, 21 deletions
diff --git a/NEWS b/NEWS
index a180dc2..d5009cc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,13 @@
1========= 1=========
2Ewe 0.1.6 2Ewe 0.2.0
3========= 3=========
4 4
5Changes since 0.1.6
6-------------------
7
8Fixes:
9 * Entry: fix cursor default height
10
5Changes since 0.1.5 11Changes since 0.1.5
6------------------- 12-------------------
7 13
diff --git a/configure.ac b/configure.ac
index fa85589..185b6b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1EWE_VERSION([0], [1], [6]) 1EWE_VERSION([0], [2], [0])
2 2
3AC_INIT([ewe], [ewe_version], [enlightenment-devel@lists.sourceforge.net]) 3AC_INIT([ewe], [ewe_version], [enlightenment-devel@lists.sourceforge.net])
4AC_PREREQ([2.60]) 4AC_PREREQ([2.60])
@@ -34,8 +34,8 @@ fi
34 34
35EWE_INIT 35EWE_INIT
36 36
37m4_define([efl_version], [1.10.1]) 37m4_define([efl_version], [1.11.0])
38m4_define([elm_version], [1.10.1]) 38m4_define([elm_version], [1.11.0])
39 39
40 40
41### Checks for programs 41### Checks for programs
@@ -71,28 +71,28 @@ EFL_ENABLE_BIN([ewe-test])
71### Checks for libraries 71### Checks for libraries
72 72
73requirement_ewe="\ 73requirement_ewe="\
74eina > efl_version \ 74eina >= efl_version \
75eet > efl_version \ 75eet >= efl_version \
76evas > efl_version \ 76evas >= efl_version \
77ecore > efl_version \ 77ecore >= efl_version \
78ecore-input > efl_version \ 78ecore-input >= efl_version \
79edje > efl_version \ 79edje >= efl_version \
80eo > efl_version \ 80eo >= efl_version \
81ecore-imf > efl_version \ 81ecore-imf >= efl_version \
82ecore-con > efl_version \ 82ecore-con >= efl_version \
83eio > efl_version \ 83eio >= efl_version \
84eldbus > efl_version \ 84eldbus >= efl_version \
85efreet > efl_version \ 85efreet >= efl_version \
86efreet-mime > efl_version \ 86efreet-mime >= efl_version \
87" 87"
88 88
89AC_SUBST([requirement_ewe]) 89AC_SUBST([requirement_ewe])
90 90
91PKG_CHECK_MODULES([EFL], [${requirement_ewe}]) 91PKG_CHECK_MODULES([EFL], [${requirement_ewe}])
92 92
93PKG_CHECK_MODULES([ELEMENTARY], [elementary > elm_version]) 93PKG_CHECK_MODULES([ELEMENTARY], [elementary >= elm_version])
94 94
95requirement_ewe="elementary > elm_version ${requirement_ewe}" 95requirement_ewe="elementary >= elm_version ${requirement_ewe}"
96 96
97elmthemedir=`${PKG_CONFIG} --variable=themes elementary` 97elmthemedir=`${PKG_CONFIG} --variable=themes elementary`
98AC_SUBST([elmthemedir]) 98AC_SUBST([elmthemedir])
diff --git a/data/themes/widgets/entry.edc b/data/themes/widgets/entry.edc
index 87f2580..6083845 100644
--- a/data/themes/widgets/entry.edc
+++ b/data/themes/widgets/entry.edc
@@ -702,8 +702,8 @@ group { name: "ewe/entry/cursor/default";
702 description { state: "default" 0.0; 702 description { state: "default" 0.0;
703 min: 9 10; 703 min: 9 10;
704 color: 255 255 255 0; 704 color: 255 255 255 0;
705 rel1.offset: -4 -4; 705 rel1.offset: -4 -2;
706 rel2.offset: 3 3; 706 rel2.offset: 3 1;
707 image { 707 image {
708 normal: "white_bar_vert_glow.png"; 708 normal: "white_bar_vert_glow.png";
709 border: 4 4 4 4; 709 border: 4 4 4 4;