Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b3d7482637685a2685824b6aa50586610d32486

commit 1b3d7482637685a2685824b6aa50586610d32486
Author: crazy <cr...@frugalware.org>
Date:   Tue Aug 8 18:28:30 2017 +0200

eflete-1.19.1-1-x86_64
* Version bump
* yay this one need patches too :-)

diff --git a/source/enlightenment-extra/eflete/FrugalBuild 
b/source/enlightenment-extra/eflete/FrugalBuild
index a4868aa..fe60ba3 100644
--- a/source/enlightenment-extra/eflete/FrugalBuild
+++ b/source/enlightenment-extra/eflete/FrugalBuild
@@ -2,21 +2,25 @@
# Maintainer: crazy <cr...@frugalware.org>

pkgname=eflete
-pkgver=0.7.0
+pkgver=1.19.1
pkgrel=1
pkgdesc="EFL Edje Theme Editor"
url="https://www.enlightenment.org/";
-source=(https://download.enlightenment.org/rel/apps/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(https://download.enlightenment.org/rel/apps/$pkgname/$pkgname-$pkgver.tar.xz
 \
+       fake-max-efl-version.patch  fix-syntax.patch)
_F_archive_grepv="beta"
up2date="Flasttar https://download.enlightenment.org/rel/apps/$pkgname/";
groups=('enlightenment-extra' 'e-apps')
archs=('x86_64')
-depends=('efl>=1.18.1')
+depends=('efl>=1.20.1')
makedepends=('x11-protos')
-sha1sums=('de979bad49159c784f327372e137f2c871ae775d')
+sha1sums=('9c24db572b3a6e4ba399f228d80aef27664171c5' \
+          'e7f3089cf807b3aa05567867e1512ce5f22092ef' \
+          '9337bc7c8a956251a0cd020194a6ccc37a80095e')
## broken ! :( --enable-enventor

CFLAGS+=" -fvisibility=hidden -fomit-frame-pointer"
CXXFLAGS+=" -fvisibility=hidden -fomit-frame-pointer"

+_Fbuild_autoreconf=yes
# optimization OK
diff --git a/source/enlightenment-extra/eflete/fake-max-efl-version.patch 
b/source/enlightenment-extra/eflete/fake-max-efl-version.patch
new file mode 100644
index 0000000..f8a2cae
--- /dev/null
+++ b/source/enlightenment-extra/eflete/fake-max-efl-version.patch
@@ -0,0 +1,12 @@
+diff -Naur eflete-1.19.1/configure.ac eflete-1.19.1-p/configure.ac
+--- eflete-1.19.1/configure.ac 2017-07-21 15:02:41.000000000 +0200
++++ eflete-1.19.1-p/configure.ac       2017-08-08 18:19:07.158859644 +0200
+@@ -14,7 +14,7 @@
+
+ dnl m4_define([package], "EFL\ Edje\ Theme\ Editor")
+ m4_define([efl_version], [1.19.0])
+-m4_define([efl_version_max], [1.19.9999])
++m4_define([efl_version_max], [1.21.999])
+
+ m4_define([enventor_version], [0.5.0])
+
diff --git a/source/enlightenment-extra/eflete/fix-syntax.patch 
b/source/enlightenment-extra/eflete/fix-syntax.patch
new file mode 100644
index 0000000..efb4c06
--- /dev/null
+++ b/source/enlightenment-extra/eflete/fix-syntax.patch
@@ -0,0 +1,111 @@
+From 694ee5a7590265eed33ed986c2f95271d6bb36a7 Mon Sep 17 00:00:00 2001
+From: Vyacheslav Reutskiy <v.reuts...@samsung.com>
+Date: Tue, 25 Jul 2017 14:12:46 +0300
+Subject: ewe: update eo syntax usage for ewe_ruler
+
+---
+ src/lib/ewe_ruler.c  | 66 ----------------------------------------------------
+ src/lib/ewe_ruler.eo |  4 +---
+ 2 files changed, 1 insertion(+), 69 deletions(-)
+
+diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
+index 95888c0..4476a51 100644
+--- a/src/lib/ewe_ruler.c
++++ b/src/lib/ewe_ruler.c
+@@ -782,72 +782,6 @@ _ewe_ruler_marker_style_get(Eo *obj EINA_UNUSED,
+
+ /*------------------------Smart functions ----------------------------*/
+
+-EOLIAN static void
+-_ewe_ruler_efl_canvas_group_group_add(Eo *obj, Ewe_Ruler_Smart_Data *sd)
+-{
+-   const char *data_dir = NULL;
+-   Eina_Strbuf *theme_path = NULL;
+-
+-   efl_canvas_group_add(efl_super(obj, MY_CLASS));
+-   elm_widget_sub_object_parent_add(obj);
+-
+-   data_dir = elm_app_data_dir_get();
+-   if (data_dir && strcmp(data_dir, ""))
+-     {
+-        theme_path = eina_strbuf_new();
+-        eina_strbuf_append_printf(theme_path,
+-                           
"%s"EINA_PATH_SEP_S"themes"EINA_PATH_SEP_S"default"EINA_PATH_SEP_S"ewe.edj",
+-                           data_dir);
+-        sd->theme_file = eina_strbuf_string_steal(theme_path);
+-        eina_strbuf_free(theme_path);
+-     }
+-   else
+-     {
+-        sd->theme_file = strdup(EWE_THEME);
+-     }
+-
+-   sd->obj = obj;
+-   sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
+-   evas_object_smart_member_add(sd->clip, obj);
+-   sd->bg = elm_layout_add(obj);
+-   elm_layout_file_set(sd->bg, sd->theme_file, 
"ewe/ruler/horizontal_background/default");
+-   evas_object_smart_member_add(sd->bg, obj);
+-
+-   sd->horizontal = EINA_TRUE;
+-   sd->geometry.width = 0;
+-   sd->geometry.height = 0;
+-   sd->geometry.x = 0;
+-   sd->geometry.y = 0;
+-   sd->ruler_visible = EINA_FALSE;
+-   sd->size_changed = EINA_TRUE;
+-   sd->text_changed = EINA_TRUE;
+-   sd->position_changed = EINA_TRUE;
+-   ewe_ruler_scale_add(obj, NULL);
+-}
+-
+-EOLIAN static void
+-_ewe_ruler_efl_canvas_group_group_del(Eo *obj,
+-                                 Ewe_Ruler_Smart_Data *sd)
+-{
+-   Ewe_Ruler_Scale *scale;
+-   Ewe_Ruler_Marker *marker;
+-   Eina_List *l, *ls;
+-
+-   EINA_LIST_FOREACH_SAFE(sd->markers, l, ls, marker)
+-     ewe_ruler_marker_del(obj, marker);
+-
+-   EINA_LIST_FOREACH_SAFE(sd->scales, l, ls, scale)
+-     ewe_ruler_scale_del(obj, scale);
+-
+-   evas_object_smart_member_del(sd->clip);
+-   evas_object_del(sd->clip);
+-
+-   evas_object_smart_member_del(sd->bg);
+-   evas_object_del(sd->bg);
+-
+-   free(sd->theme_file);
+-}
+-
+ static void
+ _ewe_ruler_show(Eo* obj, Ewe_Ruler_Smart_Data *sd)
+ {
+diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo
+index 5330afe..a38c2b2 100644
+--- a/src/lib/ewe_ruler.eo
++++ b/src/lib/ewe_ruler.eo
+@@ -1,7 +1,7 @@
+ type Ewe_Ruler_Scale: __undefined_type;
+ type Ewe_Ruler_Marker: __undefined_type;
+
+-class Ewe.Ruler (Elm.Widget)
++class Ewe.Ruler (Elm.Layout)
+ {
+    eo_prefix: ewe_obj_ruler;
+    legacy_prefix: ewe_ruler;
+@@ -317,8 +317,6 @@ class Ewe.Ruler (Elm.Widget)
+       Efl.Gfx.size { set; }
+       Efl.Gfx.position { set; }
+       Efl.Gfx.visible { set; }
+-      Efl.Canvas.Group.group_add;
+-      Efl.Canvas.Group.group_del;
+       Efl.Canvas.Group.group_calculate;
+       Elm.Widget.theme_apply;
+    }
+--
+cgit v0.12
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to