summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-09 08:46:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 15:26:26 +0100
commit5e775b5e5c0db6f76546355be22aa029a7cf69fa (patch)
tree1fb9cbd970702d3495317346b26f844c91934956
parentaf8e6b6c57dadb3bf7672d063a98d3baa508c7f4 (diff)
downloadpoky-5e775b5e5c0db6f76546355be22aa029a7cf69fa.tar.gz
pimlico: Remove
Remove the Pimlico applications (Contacts, Dates, Tasks). oe-core isn't a reference PIM stack, so we don't need this. (From OE-Core rev: 373895e6c691277e15a09aee3504243448c55b50) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/classes/core-image.bbclass4
-rw-r--r--meta/recipes-sato/pimlico/contacts.inc34
-rw-r--r--meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch37
-rw-r--r--meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch54
-rw-r--r--meta/recipes-sato/pimlico/contacts/make-382.patch16
-rw-r--r--meta/recipes-sato/pimlico/contacts/stock_contact.pngbin2311 -> 0 bytes
-rw-r--r--meta/recipes-sato/pimlico/contacts/stock_person.pngbin2280 -> 0 bytes
-rw-r--r--meta/recipes-sato/pimlico/contacts_0.9.bb18
-rw-r--r--meta/recipes-sato/pimlico/contacts_git.bb19
-rw-r--r--meta/recipes-sato/pimlico/dates.inc20
-rw-r--r--meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch67
-rw-r--r--meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch46
-rw-r--r--meta/recipes-sato/pimlico/dates/make-382.patch18
-rw-r--r--meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch37
-rw-r--r--meta/recipes-sato/pimlico/dates_0.4.8.bb5
-rw-r--r--meta/recipes-sato/pimlico/dates_git.bb18
-rw-r--r--meta/recipes-sato/pimlico/tasks.inc16
-rw-r--r--meta/recipes-sato/pimlico/tasks/tasks-owl.diff67
-rw-r--r--meta/recipes-sato/pimlico/tasks_0.19.bb15
-rw-r--r--meta/recipes-sato/pimlico/tasks_git.bb9
-rw-r--r--meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb34
-rw-r--r--meta/recipes-sato/tasks/task-core-x11-sato.bb7
22 files changed, 7 insertions, 534 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index b2815b952b..52836d22e1 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -18,7 +18,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
18# - x11-sato - OpenedHand Sato environment 18# - x11-sato - OpenedHand Sato environment
19# - apps-x11-core - X Terminal, file manager, file editor 19# - apps-x11-core - X Terminal, file manager, file editor
20# - apps-x11-games 20# - apps-x11-games
21# - apps-x11-pimlico - OpenedHand Pimlico apps
22# - tools-sdk - SDK 21# - tools-sdk - SDK
23# - tools-debug - debugging tools 22# - tools-debug - debugging tools
24# - tools-profile - profiling tools 23# - tools-profile - profiling tools
@@ -34,7 +33,6 @@ PACKAGE_GROUP_x11-base = "task-core-x11-base"
34PACKAGE_GROUP_x11-sato = "task-core-x11-sato" 33PACKAGE_GROUP_x11-sato = "task-core-x11-sato"
35PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core" 34PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core"
36PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games" 35PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games"
37PACKAGE_GROUP_apps-x11-pimlico = "task-core-apps-x11-pimlico"
38PACKAGE_GROUP_tools-debug = "task-core-tools-debug" 36PACKAGE_GROUP_tools-debug = "task-core-tools-debug"
39PACKAGE_GROUP_tools-profile = "task-core-tools-profile" 37PACKAGE_GROUP_tools-profile = "task-core-tools-profile"
40PACKAGE_GROUP_tools-testapps = "task-core-tools-testapps" 38PACKAGE_GROUP_tools-testapps = "task-core-tools-testapps"
@@ -65,7 +63,7 @@ CORE_IMAGE_EXTRA_INSTALL ?= ""
65IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" 63IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
66 64
67X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" 65X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
68ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" 66ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
69SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear" 67SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear"
70SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}" 68SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}"
71 69
diff --git a/meta/recipes-sato/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc
deleted file mode 100644
index 9798985a45..0000000000
--- a/meta/recipes-sato/pimlico/contacts.inc
+++ /dev/null
@@ -1,34 +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+ evolution-data-server"
8DEPENDS_append_poky = " libowl"
9RDEPENDS_${PN} = "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 ${datadir}/icons/hicolor"
28
29SRC_URI = "file://stock_contact.png \
30 file://stock_person.png \
31 file://contacts-conditionally-install-schema.patch \
32 "
33
34SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
diff --git a/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch b/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch
deleted file mode 100644
index 2ab7882c81..0000000000
--- a/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
2
3If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not
4be installed.
5
6Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
7
8Upstream-Status: Pending
9---
10 data/Makefile.am | 7 ++++---
11 1 files changed, 4 insertions(+), 3 deletions(-)
12
13diff --git a/data/Makefile.am b/data/Makefile.am
14index f790823..b6fd643 100644
15--- a/data/Makefile.am
16+++ b/data/Makefile.am
17@@ -14,13 +14,14 @@ dist_man1_MANS = contacts.1
18
19 if HAVE_GCONF
20 install-data-local:
21- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
22+ if [ "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" != "1" ]; then \
23+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
24 $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || \
25 (echo ;\
26 echo "*****************************************************"; \
27 echo "Installation of schemas failed, install them manually"; \
28- echo "*****************************************************";)
29- @true
30+ echo "*****************************************************";); \
31+ fi
32 endif
33
34 CLEANFILES = $(desktop_DATA)
35--
361.7.7.6
37
diff --git a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
deleted file mode 100644
index 532387667b..0000000000
--- a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1Upstream-Status: Inappropriate [enable feature]
2
3Index: contacts-0.9/src/contacts-gtk.c
4===================================================================
5--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
6+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100
7@@ -220,8 +220,8 @@
8 vbox7 = gtk_vbox_new (FALSE, 0);
9 gtk_container_add (GTK_CONTAINER (main_window), vbox7);
10
11- main_menubar = gtk_menu_bar_new ();
12- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0);
13+ main_menubar = gtk_menu_new ();
14+ gtk_widget_show (main_menubar);
15
16 contacts_menu = gtk_menu_item_new_with_mnemonic (_("C_ontacts"));
17 gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu);
18Index: contacts-0.9/src/Makefile.am
19===================================================================
20--- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100
21+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100
22@@ -40,7 +40,7 @@
23 contacts-@FRONTEND@.c \
24 contacts-@FRONTEND@.h
25
26-contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS)
27+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl
28
29 contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@
30
31Index: contacts-0.9/src/contacts-main.c
32===================================================================
33--- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100
34+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100
35@@ -27,6 +27,8 @@
36 #include <libgnomevfs/gnome-vfs.h>
37 #endif
38
39+#include <libowl/owlwindowmenu.h>
40+
41 #include "bacon-message-connection.h"
42 #include "contacts-defs.h"
43 #include "contacts-utils.h"
44@@ -266,6 +268,10 @@
45 gtk_widget_show_all (widget);
46 }
47
48+ gtk_widget_show_all (data->ui->main_menubar);
49+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window),
50+ GTK_MENU (data->ui->main_menubar));
51+
52 gtk_main ();
53
54 /* if we have modified the current contact, but not saved it, do so now */
diff --git a/meta/recipes-sato/pimlico/contacts/make-382.patch b/meta/recipes-sato/pimlico/contacts/make-382.patch
deleted file mode 100644
index a7cfee3a00..0000000000
--- a/meta/recipes-sato/pimlico/contacts/make-382.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Fix for stricter parser in make 3.82. This fix has been pushed to upstream git.
2
3JL - 15/12/10
4
5Upstream-Status: Accepted
6
7Index: git/Makefile.am
8===================================================================
9--- git.orig/Makefile.am
10+++ git/Makefile.am
11@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT)
12 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing
13
14 snapshot:
15- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
16+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
diff --git a/meta/recipes-sato/pimlico/contacts/stock_contact.png b/meta/recipes-sato/pimlico/contacts/stock_contact.png
deleted file mode 100644
index 123b4485ac..0000000000
--- a/meta/recipes-sato/pimlico/contacts/stock_contact.png
+++ /dev/null
Binary files differ
diff --git a/meta/recipes-sato/pimlico/contacts/stock_person.png b/meta/recipes-sato/pimlico/contacts/stock_person.png
deleted file mode 100644
index 2b1328b4e2..0000000000
--- a/meta/recipes-sato/pimlico/contacts/stock_person.png
+++ /dev/null
Binary files differ
diff --git a/meta/recipes-sato/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb
deleted file mode 100644
index 251bbe1d7f..0000000000
--- a/meta/recipes-sato/pimlico/contacts_0.9.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1require contacts.inc
2
3PR = "r7"
4
5SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
6
7SRC_URI[md5sum] = "aab5affbf93d6fa7b978b323a8d44de0"
8SRC_URI[sha256sum] = "9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d"
9
10LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
11 file://src/contacts-main.h;endline=18;md5=0371af46fbc72e33575e0072dca5fb19 \
12 file://src/contacts-dbus.c;endline=18;md5=e4da9ac1a0539fafc7df431010904fd5 \
13 file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee"
14
15do_configure_prepend () {
16 # It used 8 spaces to instead of a tab, but it doesn't work for us
17 sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am
18}
diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb
deleted file mode 100644
index 45a6a0df4b..0000000000
--- a/meta/recipes-sato/pimlico/contacts_git.bb
+++ /dev/null
@@ -1,19 +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
8SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933"
9PV = "0.12+git${SRCPV}"
10PR = "r4"
11
12S = "${WORKDIR}/git"
13
14SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \
15 file://make-382.patch"
16
17S = "${WORKDIR}/git"
18
19
diff --git a/meta/recipes-sato/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc
deleted file mode 100644
index 9b338fd812..0000000000
--- a/meta/recipes-sato/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 evolution-data-server"
9RDEPENDS_${PN} = "libedata-cal"
10
11inherit autotools gettext 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/recipes-sato/pimlico/dates/dates-owl-window-menu.patch b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
deleted file mode 100644
index 714623efe6..0000000000
--- a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
+++ /dev/null
@@ -1,67 +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
7Upstream-Status: Inappropriate [enable feature]
8
9Index: git/src/dates_gtk.c
10===================================================================
11--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
12+++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100
13@@ -33,10 +33,6 @@
14 #endif
15
16 #ifndef DATES_PLATFORM_create_main_window
17-/* the default implementation assumes that menu is GtkMenuBar */
18-#ifdef DATES_MENU_WITHOUT_BAR
19-#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!!
20-#endif
21 static GtkWidget *
22 create_main_window (DatesData * d, GtkWidget * toolbar,
23 GtkWidget * menu, GtkAccelGroup * accel_group)
24@@ -59,7 +55,6 @@
25 gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
26
27 gtk_widget_show (menu);
28- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0);
29
30 gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
31 gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
32Index: git/src/dates_main.c
33===================================================================
34--- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100
35+++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100
36@@ -26,6 +26,8 @@
37 #include <libical/icaltime.h>
38 #include <gconf/gconf-client.h>
39
40+#include <gtk/gtkmenuitem.h>
41+#include <libowl/owlwindowmenu.h>
42 #include "dates_types.h"
43 #include "dates_platform.h"
44 #include "dates_callbacks.h"
45@@ -582,6 +584,9 @@
46 g_free (url_uri);
47 }
48
49+ owl_set_window_menu (GTK_WINDOW (data.main_window),
50+ GTK_MENU (data.main_menu));
51+
52 gtk_main ();
53
54 return 0;
55Index: git/src/dates_platform.h
56===================================================================
57--- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100
58+++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100
59@@ -20,7 +20,7 @@
60
61 #include "dates_types.h"
62
63-#ifdef WITH_HILDON
64+#if 1
65 #define DATES_MENU_WITHOUT_BAR 1
66 #endif
67
diff --git a/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch b/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
deleted file mode 100644
index eccc782e4b..0000000000
--- a/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids these linking errors:
3
4
5| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/dates-0.4.11+git0+514185dc1f6588085fda41eb59898b93d0487dd4-r2/git/src'^M
6| /bin/sh ../i586-poky-linux-libtool --tag=CC --mode=link ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -std=gnu99 -Wall -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/evolution-data-server-2.30 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/dbus-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libxml2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gconf/2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libsoup-2.4 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/dbus-1.0/include -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libowl -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -DUSE_OWL=1 -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o dates dates_gtk.o dates_main.o dates_callbacks.o gconf-bridge.o -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lecal-1.2 -lical -licalss -licalvcal -ledataserver-1.2 -lxml2 -lsoup-2.4 -lgio-2.0 -lgmodule-2.0 -lgconf-2 -ldbus-glib-1 -ldbus-1 -lpthread -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -pthread -lowl -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 libgtkdatesview.la
7| i586-poky-linux-libtool: link: ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -std=gnu99 -Wall -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/evolution-data-server-2.30 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/dbus-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libxml2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gconf/2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libsoup-2.4 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/dbus-1.0/include -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libowl -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -DUSE_OWL=1 -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o .libs/dates dates_gtk.o dates_main.o dates_callbacks.o gconf-bridge.o -pthread -pthread -L/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libecal-1.2.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libicalss.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libicalvcal.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libical.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libedataserver-1.2.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libsoup-2.4.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libxml2.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgnutls.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libtasn1.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgcrypt.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgpg-error.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgconf-2.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libdbus-glib-1.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libdbus-1.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libowl.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgtk-x11-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk-x11-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libatk-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk_pixbuf-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgio-2.0.so -lresolv /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpangocairo-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpangoft2-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libstdc++.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libcairo.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpixman-1.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpng12.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libxcb.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXau.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXdmcp.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libz.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so -lm /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libfontconfig.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libfreetype.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libexpat.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgobject-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgmodule-2.0.so -ldl /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgthread-2.0.so -lpthread /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libglib-2.0.so -lrt ./.libs/libgtkdatesview.a -pthread
8|
9| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: e: invalid DSO for symbol `pow@@GLIBC_2.0' definition^M
10| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libm.so: could not read symbols: Bad value^M
11| collect2: ld returned 1 exit status^M
12| make[2]: *** [dates] Error 1
13
14
15
16| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: z: invalid DSO for symbol `pango_layout_get_extents' definition
17| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so: could not read symbols: Bad value
18| collect2: ld returned 1 exit status
19| make[2]: *** [dates] Error 1
20
21
22Nitin A Kamble <nitin.a.kamble@intel.com>
23Date: 2011/01/11
24
25Update:
26This is identified as a libtool issue. While creating the libgtkdatesview.la
27file, libtool should have added these needed libraries in there.
28 A bug has been created for this issue:
29 http://bugzilla.pokylinux.org/show_bug.cgi?id=664
30Nitin A Kamble <nitin.a.kamble@intel.com>
31Date: 2011/01/19
32
33Upstream-Status: Pending
34
35Index: git/src/Makefile.am
36===================================================================
37--- git.orig/src/Makefile.am
38+++ git/src/Makefile.am
39@@ -34,6 +34,6 @@ dates_SOURCES = $(platform) \
40 gconf-bridge.h \
41 gconf-bridge.c
42
43-dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la
44+dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la -lm -lpango-1.0
45
46 MAINTAINERCLEANFILES = config.h.in Makefile.in
diff --git a/meta/recipes-sato/pimlico/dates/make-382.patch b/meta/recipes-sato/pimlico/dates/make-382.patch
deleted file mode 100644
index fad3c5826e..0000000000
--- a/meta/recipes-sato/pimlico/dates/make-382.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed
2in upstream git.
3
4JL - 15/12/10
5
6Upstream-Status: Accepted
7
8Index: git/Makefile.am
9===================================================================
10--- git.orig/Makefile.am
11+++ git/Makefile.am
12@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto
13 MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
14
15 snapshot:
16- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
17+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
18
diff --git a/meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch b/meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
deleted file mode 100644
index 6ade4708f2..0000000000
--- a/meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY
2therefore we introduce a check in configure for the this define
3and then we make sure that we use it when it really exists
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Upstream-Status: Pending
8
9Index: git/configure.ac
10===================================================================
11--- git.orig/configure.ac 2011-07-18 10:34:15.000000000 -0700
12+++ git/configure.ac 2011-07-18 10:54:26.403798188 -0700
13@@ -98,6 +98,8 @@
14 src/libgtkdatesview.pc
15 ])
16
17+AC_CHECK_DECLS([_NL_TIME_FIRST_WEEKDAY],[],[],[[#include <langinfo.h>]])
18+
19 AC_OUTPUT
20
21 echo " "
22Index: git/src/dates_view.c
23===================================================================
24--- git.orig/src/dates_view.c 2011-07-18 10:34:15.000000000 -0700
25+++ git/src/dates_view.c 2011-07-18 10:58:46.093798136 -0700
26@@ -1505,7 +1505,11 @@
27 priv->days = 1;
28 priv->months = 0;
29 priv->months_in_row = 4;
30+#if HAVE_DECL__NL_TIME_FIRST_WEEKDAY
31 priv->week_start = *nl_langinfo (_NL_TIME_FIRST_WEEKDAY) - 1;
32+#else
33+ priv->week_start = 0;
34+#endif
35 priv->dragbox = TRUE;
36 priv->single_click = TRUE;
37 priv->double_click = FALSE;
diff --git a/meta/recipes-sato/pimlico/dates_0.4.8.bb b/meta/recipes-sato/pimlico/dates_0.4.8.bb
deleted file mode 100644
index da3f27349c..0000000000
--- a/meta/recipes-sato/pimlico/dates_0.4.8.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require dates.inc
2
3PR = "r6"
4
5SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
deleted file mode 100644
index 9ee010554d..0000000000
--- a/meta/recipes-sato/pimlico/dates_git.bb
+++ /dev/null
@@ -1,18 +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
8SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4"
9PV = "0.4.11+git${SRCPV}"
10PR = "r8"
11
12S = "${WORKDIR}/git"
13
14SRC_URI = "git://git.gnome.org/${BPN};protocol=git \
15 file://make-382.patch \
16 file://dso_linking_change_build_fix.patch \
17 file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
18 "
diff --git a/meta/recipes-sato/pimlico/tasks.inc b/meta/recipes-sato/pimlico/tasks.inc
deleted file mode 100644
index 9cd525987b..0000000000
--- a/meta/recipes-sato/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+ evolution-data-server"
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/recipes-sato/pimlico/tasks/tasks-owl.diff b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
deleted file mode 100644
index aab23ff281..0000000000
--- a/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
+++ /dev/null
@@ -1,67 +0,0 @@
1This patch enable owl menu, which is hidden in the title bar to save space on
2small screen. It has not been used for a long time, rebase needed.
3
4Upstream-Status: Inappropriate [enable feature]
5
6Index: src/gtk/tasks-ui.xml
7===================================================================
8--- src/gtk/tasks-ui.xml (revision 338)
9+++ src/gtk/tasks-ui.xml (working copy)
10@@ -7,17 +7,14 @@
11 <menuitem action="EditTask"/>
12 <menuitem action="CompleteTask"/>
13 <separator/>
14+ <menuitem action="Undo"/>
15+ <menuitem action="Redo"/>
16+ <separator/>
17 <menuitem action="DeleteTask"/>
18 <menuitem action="PurgeTasks"/>
19 <separator/>
20+ <menuitem action="About"/>
21 <menuitem action="Quit"/>
22 </menu>
23- <menu action="EditMenu">
24- <menuitem action="Undo"/>
25- <menuitem action="Redo"/>
26- </menu>
27- <menu action="HelpMenu">
28- <menuitem action="About"/>
29- </menu>
30 </menubar>
31 </ui>
32Index: src/gtk/main.c
33===================================================================
34--- src/gtk/main.c (revision 338)
35+++ src/gtk/main.c (working copy)
36@@ -21,6 +21,7 @@
37 #include <libecal/e-cal.h>
38 #include <glib/gi18n.h>
39 #include <gtk/gtk.h>
40+#include <libowl/owlwindowmenu.h>
41
42 #include <libkoto/ical-util.h>
43 #include <libkoto/koto-actions.h>
44@@ -564,8 +565,8 @@
45 gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
46 gtk_ui_manager_ensure_update (ui_manager);
47
48- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
49- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0);
50+ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu");
51+ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu));
52
53 box = gtk_vbox_new (FALSE, 4);
54 gtk_container_set_border_width (GTK_CONTAINER (box), 4);
55Index: src/gtk/Makefile.am
56===================================================================
57--- src/gtk/Makefile.am (revision 338)
58+++ src/gtk/Makefile.am (working copy)
59@@ -4,7 +4,7 @@
60 bin_PROGRAMS = tasks
61 tasks_CPPFLAGS = -I$(top_srcdir)/
62 tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
63-tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)
64+tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl
65
66 tasks_SOURCES = \
67 main.c \
diff --git a/meta/recipes-sato/pimlico/tasks_0.19.bb b/meta/recipes-sato/pimlico/tasks_0.19.bb
deleted file mode 100644
index f0d954212f..0000000000
--- a/meta/recipes-sato/pimlico/tasks_0.19.bb
+++ /dev/null
@@ -1,15 +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/${BPN}/${BPN}-${PV}.tar.gz"
9
10SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08"
11SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e"
12
13OWL_poky = "--with-owl"
14
15PR = "r2"
diff --git a/meta/recipes-sato/pimlico/tasks_git.bb b/meta/recipes-sato/pimlico/tasks_git.bb
deleted file mode 100644
index 16c043076c..0000000000
--- a/meta/recipes-sato/pimlico/tasks_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require tasks.inc
2
3SRC_URI = "git://git.gnome.org/${BPN};protocol=git"
4
5SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65"
6PV = "0.13+git${SRCPV}"
7PR = "r3"
8
9S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
deleted file mode 100644
index 835625c056..0000000000
--- a/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
+++ /dev/null
@@ -1,34 +0,0 @@
1#
2# Copyright (C) 2007-2008 OpenedHand Ltd.
3#
4
5DESCRIPTION = "X11 Pimlico Appications List"
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r28"
10
11PACKAGES = "\
12 task-core-apps-x11-pimlico \
13 task-core-apps-x11-pimlico-dbg \
14 task-core-apps-x11-pimlico-dev \
15 "
16
17PACKAGE_ARCH = "${MACHINE_ARCH}"
18
19ALLOW_EMPTY = "1"
20
21WEB ?= ""
22#WEB = "web-webkit"
23# WebKit takes too much space to fit on some devices
24# List here for now...
25#WEB_c7x0 = ""
26#WEB_mx31ads = ""
27
28RDEPENDS_task-core-apps-x11-pimlico = "\
29 evolution-data-server \
30 contacts \
31 dates \
32 tasks \
33 gaku \
34 ${WEB}"
diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb b/meta/recipes-sato/tasks/task-core-x11-sato.bb
index ed43075d6b..cf294b302c 100644
--- a/meta/recipes-sato/tasks/task-core-x11-sato.bb
+++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Sato Tasks for Poky"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r31" 9PR = "r32"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-x11-sato \ 12 task-core-x11-sato \
@@ -21,6 +21,9 @@ ALLOW_EMPTY = "1"
21NETWORK_MANAGER ?= "connman-gnome" 21NETWORK_MANAGER ?= "connman-gnome"
22NETWORK_MANAGER_libc-uclibc = "" 22NETWORK_MANAGER_libc-uclibc = ""
23 23
24WEB ?= ""
25#WEB = "web-webkit"
26
24RDEPENDS_task-core-x11-sato = "\ 27RDEPENDS_task-core-x11-sato = "\
25 matchbox-desktop \ 28 matchbox-desktop \
26 matchbox-session-sato \ 29 matchbox-session-sato \
@@ -34,4 +37,6 @@ RDEPENDS_task-core-x11-sato = "\
34 gthumb \ 37 gthumb \
35 x11vnc \ 38 x11vnc \
36 libsdl \ 39 libsdl \
40 gaku \
41 ${WEB} \
37 ${NETWORK_MANAGER}" 42 ${NETWORK_MANAGER}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-04 21:22:43 +0000