summaryrefslogtreecommitdiffstats
path: root/meta/packages/pimlico
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/packages/pimlico
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-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/packages/pimlico')
-rw-r--r--meta/packages/pimlico/contacts.inc31
-rw-r--r--meta/packages/pimlico/contacts/contacts-owl-window-menu.patch52
-rw-r--r--meta/packages/pimlico/contacts/stock_contact.pngbin2311 -> 0 bytes
-rw-r--r--meta/packages/pimlico/contacts/stock_person.pngbin2280 -> 0 bytes
-rw-r--r--meta/packages/pimlico/contacts_0.9.bb5
-rw-r--r--meta/packages/pimlico/contacts_git.bb17
-rw-r--r--meta/packages/pimlico/dates.inc20
-rw-r--r--meta/packages/pimlico/dates/dates-owl-window-menu.patch65
-rw-r--r--meta/packages/pimlico/dates_0.4.8.bb5
-rw-r--r--meta/packages/pimlico/dates_git.bb13
-rw-r--r--meta/packages/pimlico/tasks.inc16
-rw-r--r--meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch26
-rw-r--r--meta/packages/pimlico/tasks/tasks-owl.diff62
-rw-r--r--meta/packages/pimlico/tasks_0.16.bb14
-rw-r--r--meta/packages/pimlico/tasks_git.bb8
15 files changed, 0 insertions, 334 deletions
diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc
deleted file mode 100644
index a424295aca..0000000000
--- a/meta/packages/pimlico/contacts.inc
+++ /dev/null
@@ -1,31 +0,0 @@
1DESCRIPTION = "Address-book application."
2HOMEPAGE = "http://pimlico-project.org/contacts.html"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
6SECTION = "x11"
7DEPENDS = "glib-2.0 gtk+ eds-dbus"
8DEPENDS_append_poky = " libowl"
9RDEPENDS = "libedata-book"
10
11inherit autotools pkgconfig
12
13OWL = "--disable-owl"
14OWL_poky = "--enable-owl"
15
16EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
17EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
18
19do_install_append () {
20 install -d ${D}/${datadir}/pixmaps
21 install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
22 install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
23}
24
25FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
26 ${datadir}/pixmaps/stock_person.png"
27
28SRC_URI = "file://stock_contact.png \
29 file://stock_person.png"
30
31SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
diff --git a/meta/packages/pimlico/contacts/contacts-owl-window-menu.patch b/meta/packages/pimlico/contacts/contacts-owl-window-menu.patch
deleted file mode 100644
index 4b9238b43a..0000000000
--- a/meta/packages/pimlico/contacts/contacts-owl-window-menu.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Index: contacts-0.9/src/contacts-gtk.c
2===================================================================
3--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
4+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100
5@@ -220,8 +220,8 @@
6 vbox7 = gtk_vbox_new (FALSE, 0);
7 gtk_container_add (GTK_CONTAINER (main_window), vbox7);
8
9- main_menubar = gtk_menu_bar_new ();
10- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0);
11+ main_menubar = gtk_menu_new ();
12+ gtk_widget_show (main_menubar);
13
14 contacts_menu = gtk_menu_item_new_with_mnemonic (_("C_ontacts"));
15 gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu);
16Index: contacts-0.9/src/Makefile.am
17===================================================================
18--- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100
19+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100
20@@ -40,7 +40,7 @@
21 contacts-@FRONTEND@.c \
22 contacts-@FRONTEND@.h
23
24-contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS)
25+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl
26
27 contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@
28
29Index: contacts-0.9/src/contacts-main.c
30===================================================================
31--- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100
32+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100
33@@ -27,6 +27,8 @@
34 #include <libgnomevfs/gnome-vfs.h>
35 #endif
36
37+#include <libowl/owlwindowmenu.h>
38+
39 #include "bacon-message-connection.h"
40 #include "contacts-defs.h"
41 #include "contacts-utils.h"
42@@ -266,6 +268,10 @@
43 gtk_widget_show_all (widget);
44 }
45
46+ gtk_widget_show_all (data->ui->main_menubar);
47+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window),
48+ GTK_MENU (data->ui->main_menubar));
49+
50 gtk_main ();
51
52 /* if we have modified the current contact, but not saved it, do so now */
diff --git a/meta/packages/pimlico/contacts/stock_contact.png b/meta/packages/pimlico/contacts/stock_contact.png
deleted file mode 100644
index 123b4485ac..0000000000
--- a/meta/packages/pimlico/contacts/stock_contact.png
+++ /dev/null
Binary files differ
diff --git a/meta/packages/pimlico/contacts/stock_person.png b/meta/packages/pimlico/contacts/stock_person.png
deleted file mode 100644
index 2b1328b4e2..0000000000
--- a/meta/packages/pimlico/contacts/stock_person.png
+++ /dev/null
Binary files differ
diff --git a/meta/packages/pimlico/contacts_0.9.bb b/meta/packages/pimlico/contacts_0.9.bb
deleted file mode 100644
index 1e4628737d..0000000000
--- a/meta/packages/pimlico/contacts_0.9.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require contacts.inc
2
3PR = "r2"
4
5SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
diff --git a/meta/packages/pimlico/contacts_git.bb b/meta/packages/pimlico/contacts_git.bb
deleted file mode 100644
index bff4e288db..0000000000
--- a/meta/packages/pimlico/contacts_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require contacts.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
4 file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \
5 file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \
6 file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
7
8PV = "0.12+git${SRCPV}"
9PR = "r0"
10
11S = "${WORKDIR}/git"
12
13SRC_URI =+ "git://git.gnome.org/${PN};protocol=git"
14
15S = "${WORKDIR}/git"
16
17
diff --git a/meta/packages/pimlico/dates.inc b/meta/packages/pimlico/dates.inc
deleted file mode 100644
index 6ef7b60611..0000000000
--- a/meta/packages/pimlico/dates.inc
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "Dates is a calendar application."
2HOMEPAGE = "http://pimlico-project.org/dates.html"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"
6
7SECTION = "x11"
8DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
9RDEPENDS = "libedata-cal"
10
11inherit autotools pkgconfig gtk-icon-cache
12
13# Poky/Sato specific enhancements
14OWL = "--disable-owl"
15OWL_poky = "--enable-owl --disable-dnd"
16
17EXTRA_OECONF += "${OWL}"
18DEPENDS_append_poky = " libowl"
19SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
20
diff --git a/meta/packages/pimlico/dates/dates-owl-window-menu.patch b/meta/packages/pimlico/dates/dates-owl-window-menu.patch
deleted file mode 100644
index d5901658be..0000000000
--- a/meta/packages/pimlico/dates/dates-owl-window-menu.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1---
2 src/dates_gtk.c | 5 -----
3 src/dates_main.c | 5 +++++
4 src/dates_platform.h | 2 +-
5 3 files changed, 7 insertions(+), 7 deletions(-)
6
7Index: git/src/dates_gtk.c
8===================================================================
9--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
10+++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100
11@@ -33,10 +33,6 @@
12 #endif
13
14 #ifndef DATES_PLATFORM_create_main_window
15-/* the default implementation assumes that menu is GtkMenuBar */
16-#ifdef DATES_MENU_WITHOUT_BAR
17-#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!!
18-#endif
19 static GtkWidget *
20 create_main_window (DatesData * d, GtkWidget * toolbar,
21 GtkWidget * menu, GtkAccelGroup * accel_group)
22@@ -59,7 +55,6 @@
23 gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
24
25 gtk_widget_show (menu);
26- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0);
27
28 gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
29 gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
30Index: git/src/dates_main.c
31===================================================================
32--- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100
33+++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100
34@@ -26,6 +26,8 @@
35 #include <libical/icaltime.h>
36 #include <gconf/gconf-client.h>
37
38+#include <gtk/gtkmenuitem.h>
39+#include <libowl/owlwindowmenu.h>
40 #include "dates_types.h"
41 #include "dates_platform.h"
42 #include "dates_callbacks.h"
43@@ -582,6 +584,9 @@
44 g_free (url_uri);
45 }
46
47+ owl_set_window_menu (GTK_WINDOW (data.main_window),
48+ GTK_MENU (data.main_menu));
49+
50 gtk_main ();
51
52 return 0;
53Index: git/src/dates_platform.h
54===================================================================
55--- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100
56+++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100
57@@ -20,7 +20,7 @@
58
59 #include "dates_types.h"
60
61-#ifdef WITH_HILDON
62+#if 1
63 #define DATES_MENU_WITHOUT_BAR 1
64 #endif
65
diff --git a/meta/packages/pimlico/dates_0.4.8.bb b/meta/packages/pimlico/dates_0.4.8.bb
deleted file mode 100644
index 13afc157d0..0000000000
--- a/meta/packages/pimlico/dates_0.4.8.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require dates.inc
2
3PR = "r3"
4
5SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
diff --git a/meta/packages/pimlico/dates_git.bb b/meta/packages/pimlico/dates_git.bb
deleted file mode 100644
index 49ca4eca86..0000000000
--- a/meta/packages/pimlico/dates_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require dates.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
4 file://src/dates_view.h;endline=22;md5=29f934f356eb970309cdeb6693b3123a \
5 file://src/dates_hildon.c;endline=19;md5=63938904198b25de429abb65fbdbdb8a \
6 file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
7
8PV = "0.4.11+git${SRCPV}"
9PR = "r0"
10
11S = "${WORKDIR}/git"
12
13SRC_URI = "git://git.gnome.org/${PN};protocol=git"
diff --git a/meta/packages/pimlico/tasks.inc b/meta/packages/pimlico/tasks.inc
deleted file mode 100644
index 7478408447..0000000000
--- a/meta/packages/pimlico/tasks.inc
+++ /dev/null
@@ -1,16 +0,0 @@
1DESCRIPTION = "Task list application"
2HOMEPAGE = "http://pimlico-project.org/tasks.html"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2 & GPLv2+"
6
7SECTION = "x11"
8DEPENDS = "glib-2.0 gtk+ eds-dbus"
9DEPENDS_append_poky = " libowl"
10
11inherit autotools pkgconfig gtk-icon-cache
12
13OWL ?= "--disable-owl"
14OWL_poky ?= "--enable-owl"
15
16EXTRA_OECONF += "${OWL}"
diff --git a/meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch b/meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch
deleted file mode 100644
index 6c458d2601..0000000000
--- a/meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1commit ea52d46d691c5fce4473ea4e24a35411381f3a65
2Author: Ross Burton <ross@linux.intel.com>
3Date: Fri Aug 21 14:23:21 2009 +0100
4
5 Fix compilation on pre-GTK+ 2.16
6
7diff --git a/libkoto/koto-field-editor-factory.c b/libkoto/koto-field-editor-factory.c
8index 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/packages/pimlico/tasks/tasks-owl.diff b/meta/packages/pimlico/tasks/tasks-owl.diff
deleted file mode 100644
index e4078066f5..0000000000
--- a/meta/packages/pimlico/tasks/tasks-owl.diff
+++ /dev/null
@@ -1,62 +0,0 @@
1Index: 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>
27Index: 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);
50Index: 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 \
diff --git a/meta/packages/pimlico/tasks_0.16.bb b/meta/packages/pimlico/tasks_0.16.bb
deleted file mode 100644
index 999da76529..0000000000
--- a/meta/packages/pimlico/tasks_0.16.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require tasks.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
4 file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \
5 file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \
6 file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52"
7
8SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
9 file://fix_pre-GTK+2.16.patch;apply=yes \
10 "
11
12OWL_poky = "--with-owl"
13
14PR = "r0"
diff --git a/meta/packages/pimlico/tasks_git.bb b/meta/packages/pimlico/tasks_git.bb
deleted file mode 100644
index 1ab8cd18cd..0000000000
--- a/meta/packages/pimlico/tasks_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require tasks.inc
2
3SRC_URI = "git://git.gnome.org/${PN};protocol=git"
4
5PV = "0.13+git${SRCPV}"
6PR = "r1"
7
8S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-26 06:19:10 +0000