diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-sato/pimlico/tasks | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato/pimlico/tasks')
-rw-r--r-- | meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch | 26 | ||||
-rw-r--r-- | meta/recipes-sato/pimlico/tasks/tasks-owl.diff | 62 |
2 files changed, 88 insertions, 0 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 new file mode 100644 index 0000000000..6c458d2601 --- /dev/null +++ b/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch | |||
@@ -0,0 +1,26 @@ | |||
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/tasks-owl.diff b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff new file mode 100644 index 0000000000..e4078066f5 --- /dev/null +++ b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff | |||
@@ -0,0 +1,62 @@ | |||
1 | Index: src/gtk/tasks-ui.xml | ||
2 | =================================================================== | ||
3 | --- src/gtk/tasks-ui.xml (revision 338) | ||
4 | +++ src/gtk/tasks-ui.xml (working copy) | ||
5 | @@ -7,17 +7,14 @@ | ||
6 | <menuitem action="EditTask"/> | ||
7 | <menuitem action="CompleteTask"/> | ||
8 | <separator/> | ||
9 | + <menuitem action="Undo"/> | ||
10 | + <menuitem action="Redo"/> | ||
11 | + <separator/> | ||
12 | <menuitem action="DeleteTask"/> | ||
13 | <menuitem action="PurgeTasks"/> | ||
14 | <separator/> | ||
15 | + <menuitem action="About"/> | ||
16 | <menuitem action="Quit"/> | ||
17 | </menu> | ||
18 | - <menu action="EditMenu"> | ||
19 | - <menuitem action="Undo"/> | ||
20 | - <menuitem action="Redo"/> | ||
21 | - </menu> | ||
22 | - <menu action="HelpMenu"> | ||
23 | - <menuitem action="About"/> | ||
24 | - </menu> | ||
25 | </menubar> | ||
26 | </ui> | ||
27 | Index: src/gtk/main.c | ||
28 | =================================================================== | ||
29 | --- src/gtk/main.c (revision 338) | ||
30 | +++ src/gtk/main.c (working copy) | ||
31 | @@ -21,6 +21,7 @@ | ||
32 | #include <libecal/e-cal.h> | ||
33 | #include <glib/gi18n.h> | ||
34 | #include <gtk/gtk.h> | ||
35 | +#include <libowl/owlwindowmenu.h> | ||
36 | |||
37 | #include <libkoto/ical-util.h> | ||
38 | #include <libkoto/koto-actions.h> | ||
39 | @@ -564,8 +565,8 @@ | ||
40 | gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager)); | ||
41 | gtk_ui_manager_ensure_update (ui_manager); | ||
42 | |||
43 | - menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); | ||
44 | - gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0); | ||
45 | + menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu"); | ||
46 | + owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu)); | ||
47 | |||
48 | box = gtk_vbox_new (FALSE, 4); | ||
49 | gtk_container_set_border_width (GTK_CONTAINER (box), 4); | ||
50 | Index: src/gtk/Makefile.am | ||
51 | =================================================================== | ||
52 | --- src/gtk/Makefile.am (revision 338) | ||
53 | +++ src/gtk/Makefile.am (working copy) | ||
54 | @@ -4,7 +4,7 @@ | ||
55 | bin_PROGRAMS = tasks | ||
56 | tasks_CPPFLAGS = -I$(top_srcdir)/ | ||
57 | tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS) | ||
58 | -tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) | ||
59 | +tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl | ||
60 | |||
61 | tasks_SOURCES = \ | ||
62 | main.c \ | ||