summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-10-10 14:27:44 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-10-10 14:27:44 +0000
commit062a789c90b2a8410d0aa896f45f615e70700653 (patch)
tree65161175a15e0c8aeac85c618436354556593765
parent684e77b0e2f27b33eb7f7c64543ca04598101011 (diff)
parent274dd1b578d179e70a1c9db6d6a9fc9db73ed2b7 (diff)
merge of '3a46b29cc934022c7df085ba522531c57df6de56'
and 'c3be7d35a09514cd7f28929bb60b9f7801d12c54'
-rw-r--r--packages/e17/edje-viewer/.mtn2git_empty0
-rw-r--r--packages/e17/edje-viewer/no-minimal-size.patch27
-rw-r--r--packages/e17/edje-viewer_svn.bb7
-rw-r--r--packages/efl1/epdf_svn.bb8
4 files changed, 9 insertions, 33 deletions
diff --git a/packages/e17/edje-viewer/.mtn2git_empty b/packages/e17/edje-viewer/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/e17/edje-viewer/.mtn2git_empty
+++ /dev/null
diff --git a/packages/e17/edje-viewer/no-minimal-size.patch b/packages/e17/edje-viewer/no-minimal-size.patch
deleted file mode 100644
index 944447c03f..0000000000
--- a/packages/e17/edje-viewer/no-minimal-size.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- A/src/bin/etk_gui.c 2008-01-13 20:08:45.000000000 +0100
-+++ B/src/bin/etk_gui.c.patched 2008-01-13 20:50:06.000000000 +0100
-@@ -147,21 +147,21 @@
- etk_tree_col_model_add(col2, etk_tree_model_checkbox_new());
- etk_tree_build(ETK_TREE(gui->tree));
- etk_tree_col_sort_set(col2, gui_visibility_col_sort_cb, NULL);
-- etk_widget_size_request_set(gui->tree, 300, 0);
-+ etk_widget_size_request_set(gui->tree, 0, 0);
- etk_signal_connect_by_code(ETK_WIDGET_KEY_DOWN_SIGNAL,
- ETK_OBJECT(gui->tree),
- ETK_CALLBACK(_gui_tree_key_down_cb), gui);
- etk_paned_child1_set(ETK_PANED(paned), gui->tree, ETK_FALSE);
-
- gui->canvas = etk_canvas_new();
-- etk_widget_size_request_set(gui->canvas, 500, 500);
-+ etk_widget_size_request_set(gui->canvas, 50, 50);
- etk_object_notification_callback_add(ETK_OBJECT(gui->canvas), "geometry",
- canvas_resize_cb, NULL);
- etk_paned_child2_set(ETK_PANED(paned), gui->canvas, ETK_TRUE);
-
- gui->output = etk_tree_new();
- etk_tree_headers_visible_set(ETK_TREE(gui->output), ETK_TRUE);
-- col = etk_tree_col_new(ETK_TREE(gui->output), _("Output"), 200, 0.0);
-+ col = etk_tree_col_new(ETK_TREE(gui->output), _("Output"), 100, 0.0);
- etk_tree_col_model_add(col, etk_tree_model_text_new());
- etk_tree_col_expand_set(col, ETK_TRUE);
- etk_tree_build(ETK_TREE(gui->output));
diff --git a/packages/e17/edje-viewer_svn.bb b/packages/e17/edje-viewer_svn.bb
index c9bbba783f..bf3ab00e10 100644
--- a/packages/e17/edje-viewer_svn.bb
+++ b/packages/e17/edje-viewer_svn.bb
@@ -2,12 +2,11 @@ DESCRIPTION = "Edje_Viewer is just that."
DEPENDS = "etk"
LICENSE = "MIT BSD"
PV = "0.0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
inherit e
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_viewer;proto=http \
- file://no-minimal-size.patch;patch=1"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_viewer;proto=http"
S = "${WORKDIR}/edje_viewer"
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
+FILES_${PN} += "${datadir}"
diff --git a/packages/efl1/epdf_svn.bb b/packages/efl1/epdf_svn.bb
index 02f8553976..7aeb537268 100644
--- a/packages/efl1/epdf_svn.bb
+++ b/packages/efl1/epdf_svn.bb
@@ -6,9 +6,13 @@ PR = "r2"
inherit efl
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=epdf;proto=http"
+# file://fix-plugin-path-check.patch;HACK=1;patch=1"
+# FIXME This package is not really working correctly at the moment. It doesn't
+# recognize epsilon and doesn't build everything. The next one actually using
+# this package is welcome to fix it.
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=epdf;proto=http \
- file://fix-plugin-path-check.patch;HACK=1;patch=1"
+EXTRA_OECONF = "--enable-etk --enable-ewl"
# add ewl additions
FILES_${PN}-dev += "${libdir}/ewl/tests/*.a ${libdir}/ewl/tests/*.la"