tasks: Bump to version 0.15

The Owl patch has gone in upstream but requires a different configure switch so
soft assign in the .inc and set appropriately in the 0.15 recipe.

0.16 is out but doesn't build with Poky's Gtk+ version.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/packages/pimlico/tasks-0.13/fix_configure.patch b/meta/packages/pimlico/tasks-0.13/fix_configure.patch
deleted file mode 100644 (file)
index a82f2c8..0000000
--- a/meta/packages/pimlico/tasks-0.13/fix_configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: tasks-0.13/configure.ac
-===================================================================
---- tasks-0.13.orig/configure.ac       2008-04-14 19:50:29.000000000 +0100
-+++ tasks-0.13/configure.ac    2008-04-14 19:50:34.000000000 +0100
-@@ -4,7 +4,6 @@
- AC_CONFIG_HEADERS([libkoto/config.h])
- AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
- 
--AM_DISABLE_STATIC
- AC_PROG_CPP
- AC_PROG_CC
- AM_PROG_CC_C_O

diff --git a/meta/packages/pimlico/tasks.inc b/meta/packages/pimlico/tasks.inc
index 086d1797f6de10fac3d07b2b5cf227083285ee65..0ff45240aa8c6c595d6dba1e882d467c6181b07e 100644 (file)
--- a/meta/packages/pimlico/tasks.inc
+++ b/meta/packages/pimlico/tasks.inc
@@ -6,7 +6,7 @@ DEPENDS_append_poky = " libowl"
 
 inherit autotools_stage pkgconfig gtk-icon-cache
 
-OWL = "--disable-owl"
-OWL_poky = "--enable-owl"
+OWL ?= "--disable-owl"
+OWL_poky ?= "--enable-owl"
 
 EXTRA_OECONF += "${OWL}"

diff --git a/meta/packages/pimlico/tasks_0.13.bb b/meta/packages/pimlico/tasks_0.13.bb
deleted file mode 100644 (file)
index f09c0ab..0000000
--- a/meta/packages/pimlico/tasks_0.13.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require tasks.inc
-
-SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
-           file://fix_configure.patch;patch=1;status=merged"
-
-SRC_URI_append_poky = " file://tasks-owl.diff;patch=1 "
-
-PR = "r3"

diff --git a/meta/packages/pimlico/tasks_0.15.bb b/meta/packages/pimlico/tasks_0.15.bb
new file mode 100644 (file)
index 0000000..3c7e8ec
--- /dev/null
+++ b/meta/packages/pimlico/tasks_0.15.bb
@@ -0,0 +1,7 @@
+require tasks.inc
+
+SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
+
+OWL_poky = "--with-owl"
+
+PR = "r0"