diff options
Diffstat (limited to 'meta/packages/pimlico')
| -rw-r--r-- | meta/packages/pimlico/contacts.inc | 19 | ||||
| -rw-r--r-- | meta/packages/pimlico/contacts_0.9.bb | 9 | ||||
| -rw-r--r-- | meta/packages/pimlico/contacts_svn.bb | 19 | ||||
| -rw-r--r-- | meta/packages/pimlico/dates.inc | 18 | ||||
| -rw-r--r-- | meta/packages/pimlico/dates_0.4.6.bb | 5 | ||||
| -rw-r--r-- | meta/packages/pimlico/dates_svn.bb | 10 | ||||
| -rw-r--r-- | meta/packages/pimlico/files/contacts-owl-window-menu.patch | 52 | ||||
| -rw-r--r-- | meta/packages/pimlico/files/dates-owl-window-menu.patch | 95 | ||||
| -rw-r--r-- | meta/packages/pimlico/files/stock_contact.png | bin | 2311 -> 0 bytes | |||
| -rw-r--r-- | meta/packages/pimlico/files/stock_person.png | bin | 2280 -> 0 bytes | |||
| -rw-r--r-- | meta/packages/pimlico/files/tasks-owl.diff | 62 | ||||
| -rw-r--r-- | meta/packages/pimlico/tasks-0.13/fix_configure.patch | 12 | ||||
| -rw-r--r-- | meta/packages/pimlico/tasks.inc | 6 | ||||
| -rw-r--r-- | meta/packages/pimlico/tasks_0.13.bb | 7 | ||||
| -rw-r--r-- | meta/packages/pimlico/tasks_svn.bb | 9 |
15 files changed, 0 insertions, 323 deletions
diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc deleted file mode 100644 index 250342243..000000000 --- a/meta/packages/pimlico/contacts.inc +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Address-book application." -LICENSE = "LGPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ eds-dbus libowl" -RDEPENDS = "libedata-book" - -inherit autotools pkgconfig - -EXTRA_OECONF += "--disable-gnome-vfs" -EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps -} - -FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ - ${datadir}/pixmaps/stock_person.png" diff --git a/meta/packages/pimlico/contacts_0.9.bb b/meta/packages/pimlico/contacts_0.9.bb deleted file mode 100644 index d3ecf29ce..000000000 --- a/meta/packages/pimlico/contacts_0.9.bb +++ /dev/null @@ -1,9 +0,0 @@ -require contacts.inc - -PR="r0" - -SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ - file://stock_contact.png \ - file://stock_person.png \ - file://contacts-owl-window-menu.patch;patch=1 \ - " diff --git a/meta/packages/pimlico/contacts_svn.bb b/meta/packages/pimlico/contacts_svn.bb deleted file mode 100644 index 58ff64e61..000000000 --- a/meta/packages/pimlico/contacts_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -require contacts.inc - -#DEPENDS += "gnome-vfs" -#RDEPENDS += "gnome-vfs-plugin-file" -#RRECOMMENDS += "gnome-vfs-plugin-http" - -PV = "0.9+svnr${SRCREV}" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;proto=http \ - file://stock_contact.png \ - file://stock_person.png \ - file://contacts-owl-window-menu.patch;patch=1 \ - " - -S = "${WORKDIR}/trunk" - -#EXTRA_OECONF = "--enable-gnome-vfs" diff --git a/meta/packages/pimlico/dates.inc b/meta/packages/pimlico/dates.inc deleted file mode 100644 index 40a88ea5c..000000000 --- a/meta/packages/pimlico/dates.inc +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Dates is a calendar application." -LICENSE = "LGPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl" -RDEPENDS = "libedata-cal" - -inherit autotools pkgconfig gtk-icon-cache - -# EXTRA_OECONF = "--disable-debug" -EXTRA_OECONF = "--enable-owl=true --disable-dnd" - -FILES_${PN} += "${datadir}/pixmaps/dates.png" - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ -} - diff --git a/meta/packages/pimlico/dates_0.4.6.bb b/meta/packages/pimlico/dates_0.4.6.bb deleted file mode 100644 index a8ec63188..000000000 --- a/meta/packages/pimlico/dates_0.4.6.bb +++ /dev/null @@ -1,5 +0,0 @@ -require dates.inc - -SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \ - file://dates-owl-window-menu.patch;patch=1 \ - " diff --git a/meta/packages/pimlico/dates_svn.bb b/meta/packages/pimlico/dates_svn.bb deleted file mode 100644 index eb2374211..000000000 --- a/meta/packages/pimlico/dates_svn.bb +++ /dev/null @@ -1,10 +0,0 @@ -require dates.inc - -DEFAULT_PREFERENCE = "-1" - -PV = "0.4.5+svnr${SRCREV}" -S = "${WORKDIR}/trunk" - -SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;proto=http \ - file://dates-owl-window-menu.patch;patch=1 \ - " diff --git a/meta/packages/pimlico/files/contacts-owl-window-menu.patch b/meta/packages/pimlico/files/contacts-owl-window-menu.patch deleted file mode 100644 index ff201b832..000000000 --- a/meta/packages/pimlico/files/contacts-owl-window-menu.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: contacts-0.9/src/contacts-gtk.c -=================================================================== ---- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100 -+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100 -@@ -220,8 +220,8 @@ - vbox7 = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (main_window), vbox7); - -- main_menubar = gtk_menu_bar_new (); -- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0); -+ main_menubar = gtk_menu_new (); -+ gtk_widget_show (main_menubar); - - contacts_menu = gtk_menu_item_new_with_mnemonic (_("C_ontacts")); - gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu); -Index: contacts-0.9/src/Makefile.am -=================================================================== ---- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100 -+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100 -@@ -40,7 +40,7 @@ - contacts-@FRONTEND@.c \ - contacts-@FRONTEND@.h - --contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl - - contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@ - -Index: contacts-0.9/src/contacts-main.c -=================================================================== ---- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100 -+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100 -@@ -27,6 +27,8 @@ - #include <libgnomevfs/gnome-vfs.h> - #endif - -+#include "owlwindowmenu.h" -+ - #include "bacon-message-connection.h" - #include "contacts-defs.h" - #include "contacts-utils.h" -@@ -266,6 +268,10 @@ - gtk_widget_show_all (widget); - } - -+ gtk_widget_show_all (data->ui->main_menubar); -+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window), -+ GTK_MENU (data->ui->main_menubar)); -+ - gtk_main (); - - /* if we have modified the current contact, but not saved it, do so now */ diff --git a/meta/packages/pimlico/files/dates-owl-window-menu.patch b/meta/packages/pimlico/files/dates-owl-window-menu.patch deleted file mode 100644 index 6bde252ac..000000000 --- a/meta/packages/pimlico/files/dates-owl-window-menu.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- - src/Makefile.am | 2 +- - src/dates_gtk.c | 5 ----- - src/dates_main.c | 5 +++++ - src/dates_platform.h | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) - ---- dates-0.4.5.orig/src/Makefile.am -+++ dates-0.4.5/src/Makefile.am -@@ -33,11 +33,11 @@ dates_SOURCES = $(platform) \ - dates_callbacks.h \ - dates_callbacks.c \ - gconf-bridge.h \ - gconf-bridge.c - --dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl - - if USE_OWL - dates_LDADD += $(top_builddir)/libowl/libowl.la - endif - ---- dates-0.4.5.orig/src/dates_gtk.c -+++ dates-0.4.5/src/dates_gtk.c -@@ -30,14 +30,10 @@ - #ifdef WITH_HILDON - #include <hildon/hildon-color-button.h> - #endif - - #ifndef DATES_PLATFORM_create_main_window --/* the default implementation assumes that menu is GtkMenuBar */ --#ifdef DATES_MENU_WITHOUT_BAR --#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!! --#endif - static GtkWidget * - create_main_window (DatesData * d, GtkWidget * toolbar, - GtkWidget * menu, GtkAccelGroup * accel_group) - { - GtkWidget *main_vbox; -@@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi - main_vbox = gtk_vbox_new (FALSE, 0); - gtk_widget_show (main_vbox); - gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox); - - gtk_widget_show (menu); -- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0); - - gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3); - - ---- dates-0.4.5.orig/src/dates_main.c -+++ dates-0.4.5/src/dates_main.c -@@ -23,10 +23,12 @@ - #include <math.h> - #include <libecal/e-cal-time-util.h> - #include <libical/icaltime.h> - #include <gconf/gconf-client.h> - -+#include <gtk/gtkmenuitem.h> -+#include "owlwindowmenu.h" - #include "dates_types.h" - #include "dates_platform.h" - #include "dates_callbacks.h" - - #include "gconf-bridge.h" -@@ -564,10 +566,13 @@ main (int argc, char **argv) - gtk_widget_show (plug_widget); - } else { - gtk_widget_show (data.main_window); - } - -+ owl_set_window_menu (GTK_WINDOW (data.main_window), -+ GTK_MENU (data.main_menu)); -+ - gtk_main (); - - /* clean up */ - g_option_context_free (context); - ---- dates-0.4.5.orig/src/dates_platform.h -+++ dates-0.4.5/src/dates_platform.h -@@ -18,11 +18,11 @@ - #ifndef DATES_UI_GTK_H - #define DATES_UI_GTK_H - - #include "dates_types.h" - --#ifdef WITH_HILDON -+#if 1 - #define DATES_MENU_WITHOUT_BAR 1 - #endif - - struct DatesData; - diff --git a/meta/packages/pimlico/files/stock_contact.png b/meta/packages/pimlico/files/stock_contact.png Binary files differdeleted file mode 100644 index 123b4485a..000000000 --- a/meta/packages/pimlico/files/stock_contact.png +++ /dev/null diff --git a/meta/packages/pimlico/files/stock_person.png b/meta/packages/pimlico/files/stock_person.png Binary files differdeleted file mode 100644 index 2b1328b4e..000000000 --- a/meta/packages/pimlico/files/stock_person.png +++ /dev/null diff --git a/meta/packages/pimlico/files/tasks-owl.diff b/meta/packages/pimlico/files/tasks-owl.diff deleted file mode 100644 index ce1ed9db7..000000000 --- a/meta/packages/pimlico/files/tasks-owl.diff +++ /dev/null @@ -1,62 +0,0 @@ -Index: src/gtk/tasks-ui.xml -=================================================================== ---- src/gtk/tasks-ui.xml (revision 338) -+++ src/gtk/tasks-ui.xml (working copy) -@@ -7,17 +7,14 @@ - <menuitem action="EditTask"/> - <menuitem action="CompleteTask"/> - <separator/> -+ <menuitem action="Undo"/> -+ <menuitem action="Redo"/> -+ <separator/> - <menuitem action="DeleteTask"/> - <menuitem action="PurgeTasks"/> - <separator/> -+ <menuitem action="About"/> - <menuitem action="Quit"/> - </menu> -- <menu action="EditMenu"> -- <menuitem action="Undo"/> -- <menuitem action="Redo"/> -- </menu> -- <menu action="HelpMenu"> -- <menuitem action="About"/> -- </menu> - </menubar> - </ui> -Index: src/gtk/main.c -=================================================================== ---- src/gtk/main.c (revision 338) -+++ src/gtk/main.c (working copy) -@@ -21,6 +21,7 @@ - #include <libecal/e-cal.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> -+#include <owlwindowmenu.h> - - #include <libkoto/ical-util.h> - #include <libkoto/koto-actions.h> -@@ -564,8 +565,8 @@ - gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager)); - gtk_ui_manager_ensure_update (ui_manager); - -- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); -- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0); -+ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu"); -+ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu)); - - box = gtk_vbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (box), 4); -Index: src/gtk/Makefile.am -=================================================================== ---- src/gtk/Makefile.am (revision 338) -+++ src/gtk/Makefile.am (working copy) -@@ -4,7 +4,7 @@ - bin_PROGRAMS = tasks - tasks_CPPFLAGS = -I$(top_srcdir)/ - tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS) --tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -+tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl - - tasks_SOURCES = \ - main.c \ 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 index a82f2c836..000000000 --- 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 deleted file mode 100644 index 2bb1c9265..000000000 --- a/meta/packages/pimlico/tasks.inc +++ /dev/null @@ -1,6 +0,0 @@ -DESCRIPTION = "Task list application" -LICENSE = "GPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ eds-dbus libowl" - -inherit autotools pkgconfig gtk-icon-cache diff --git a/meta/packages/pimlico/tasks_0.13.bb b/meta/packages/pimlico/tasks_0.13.bb deleted file mode 100644 index 736e07624..000000000 --- a/meta/packages/pimlico/tasks_0.13.bb +++ /dev/null @@ -1,7 +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 \ - file://tasks-owl.diff;patch=1;pnum=0" - -PR = "r1" diff --git a/meta/packages/pimlico/tasks_svn.bb b/meta/packages/pimlico/tasks_svn.bb deleted file mode 100644 index 00dcae0f2..000000000 --- a/meta/packages/pimlico/tasks_svn.bb +++ /dev/null @@ -1,9 +0,0 @@ -require tasks.inc - -DEFAULT_PREFERENCE = "-1" - -PV = "0.13+svnr${SRCREV}" -S = "${WORKDIR}/trunk" - -SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;proto=http \ - file://tasks-owl.diff;patch=1" |
