diff options
| author | Saul Wold <Saul.Wold@intel.com> | 2010-11-20 17:09:45 -0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 10:25:36 +0000 |
| commit | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (patch) | |
| tree | c48d599de18ce66f51e99cf66560f7a0f8962054 | |
| parent | f92b248d9640d6de1d5fbccb6acf0c3b60689dea (diff) | |
| download | poky-762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e.tar.gz | |
pimlico-tasks: remove patch
This patch is already applied in the newer upstream
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
| -rw-r--r-- | meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-sato/pimlico/tasks_0.18.bb | 4 |
2 files changed, 1 insertions, 29 deletions
diff --git a/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch b/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch deleted file mode 100644 index 6c458d2601..0000000000 --- a/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | commit ea52d46d691c5fce4473ea4e24a35411381f3a65 | ||
| 2 | Author: Ross Burton <ross@linux.intel.com> | ||
| 3 | Date: Fri Aug 21 14:23:21 2009 +0100 | ||
| 4 | |||
| 5 | Fix compilation on pre-GTK+ 2.16 | ||
| 6 | |||
| 7 | diff --git a/libkoto/koto-field-editor-factory.c b/libkoto/koto-field-editor-factory.c | ||
| 8 | index bb776ab..d0e5328 100644 | ||
| 9 | --- a/libkoto/koto-field-editor-factory.c | ||
| 10 | +++ b/libkoto/koto-field-editor-factory.c | ||
| 11 | @@ -132,6 +132,7 @@ entry_set (GtkWidget *widget, icalproperty *prop) | ||
| 12 | * URL entries. | ||
| 13 | */ | ||
| 14 | |||
| 15 | +#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME | ||
| 16 | static void | ||
| 17 | url_entry_icon_clicked (GtkEntry *entry, | ||
| 18 | GtkEntryIconPosition icon_pos, | ||
| 19 | @@ -146,7 +147,6 @@ url_entry_icon_clicked (GtkEntry *entry, | ||
| 20 | } | ||
| 21 | } | ||
| 22 | |||
| 23 | -#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME | ||
| 24 | static void | ||
| 25 | on_url_entry_changed (GtkEntry *entry) | ||
| 26 | { | ||
diff --git a/meta/recipes-sato/pimlico/tasks_0.18.bb b/meta/recipes-sato/pimlico/tasks_0.18.bb index 999da76529..f3638550c2 100644 --- a/meta/recipes-sato/pimlico/tasks_0.18.bb +++ b/meta/recipes-sato/pimlico/tasks_0.18.bb | |||
| @@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
| 5 | file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \ | 5 | file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \ |
| 6 | file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52" | 6 | file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52" |
| 7 | 7 | ||
| 8 | SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ | 8 | SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz" |
| 9 | file://fix_pre-GTK+2.16.patch;apply=yes \ | ||
| 10 | " | ||
| 11 | 9 | ||
| 12 | OWL_poky = "--with-owl" | 10 | OWL_poky = "--with-owl" |
| 13 | 11 | ||
