From fd32855dda35662c73ada19d4ec328aa5b13b221 Mon Sep 17 00:00:00 2001
From: Zhai Edwin <edwin.zhai@intel.com>
Date: Fri, 25 Jun 2010 16:28:13 +0800
Subject: tasks: update to 0.16

Also fix the meta data, and add a patch from upstream to fix the compilation

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/packages/pimlico/tasks.inc                    |  6 ++++-
 meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch | 26 ++++++++++++++++++++++
 meta/packages/pimlico/tasks_0.15.bb                |  7 ------
 meta/packages/pimlico/tasks_0.16.bb                | 14 ++++++++++++
 4 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch
 delete mode 100644 meta/packages/pimlico/tasks_0.15.bb
 create mode 100644 meta/packages/pimlico/tasks_0.16.bb

(limited to 'meta/packages')

diff --git a/meta/packages/pimlico/tasks.inc b/meta/packages/pimlico/tasks.inc
index c6e4a25f5..747840844 100644
--- a/meta/packages/pimlico/tasks.inc
+++ b/meta/packages/pimlico/tasks.inc
@@ -1,5 +1,9 @@
 DESCRIPTION = "Task list application"
-LICENSE = "GPL"
+HOMEPAGE = "http://pimlico-project.org/tasks.html"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2 & GPLv2+"
+
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ eds-dbus"
 DEPENDS_append_poky = " libowl"
diff --git a/meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch b/meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch
new file mode 100644
index 000000000..6c458d260
--- /dev/null
+++ b/meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch
@@ -0,0 +1,26 @@
+commit ea52d46d691c5fce4473ea4e24a35411381f3a65
+Author: Ross Burton <ross@linux.intel.com>
+Date:   Fri Aug 21 14:23:21 2009 +0100
+
+    Fix compilation on pre-GTK+ 2.16
+
+diff --git a/libkoto/koto-field-editor-factory.c b/libkoto/koto-field-editor-factory.c
+index bb776ab..d0e5328 100644
+--- a/libkoto/koto-field-editor-factory.c
++++ b/libkoto/koto-field-editor-factory.c
+@@ -132,6 +132,7 @@ entry_set (GtkWidget *widget, icalproperty *prop)
+  * URL entries.
+  */
+ 
++#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME
+ static void
+ url_entry_icon_clicked (GtkEntry *entry,
+ 		        GtkEntryIconPosition icon_pos,
+@@ -146,7 +147,6 @@ url_entry_icon_clicked (GtkEntry *entry,
+   }
+ }
+ 
+-#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME
+ static void
+ on_url_entry_changed (GtkEntry *entry)
+ {
diff --git a/meta/packages/pimlico/tasks_0.15.bb b/meta/packages/pimlico/tasks_0.15.bb
deleted file mode 100644
index 3c7e8ec0b..000000000
--- a/meta/packages/pimlico/tasks_0.15.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require tasks.inc
-
-SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
-
-OWL_poky = "--with-owl"
-
-PR = "r0"
diff --git a/meta/packages/pimlico/tasks_0.16.bb b/meta/packages/pimlico/tasks_0.16.bb
new file mode 100644
index 000000000..999da7652
--- /dev/null
+++ b/meta/packages/pimlico/tasks_0.16.bb
@@ -0,0 +1,14 @@
+require tasks.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \
+                    file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \
+                    file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52"
+
+SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
+           file://fix_pre-GTK+2.16.patch;apply=yes \
+           "
+
+OWL_poky = "--with-owl"
+
+PR = "r0"
-- 
cgit v1.2.3