diff options
author | Ross Burton <ross.burton@intel.com> | 2012-08-20 15:55:20 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-20 22:51:54 +0200 |
commit | 443481fec3855476f60ee34358887d00368e6859 (patch) | |
tree | 4093495b704677feafa584ec5c3cb16995049c03 /meta-gnome/recipes-gnome/pimlico | |
parent | e8c81c42c829516e0ae1b1ac4b939226e2b1cd0b (diff) | |
download | meta-openembedded-443481fec3855476f60ee34358887d00368e6859.tar.gz |
meta-gnome: add Pimlico (contacts, dates, tasks)
This has just been removed from oe-core and some people are still using the
applications.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/pimlico')
19 files changed, 494 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts.inc b/meta-gnome/recipes-gnome/pimlico/contacts.inc new file mode 100644 index 000000000..9798985a4 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/contacts.inc | |||
@@ -0,0 +1,34 @@ | |||
1 | DESCRIPTION = "Address-book application." | ||
2 | HOMEPAGE = "http://pimlico-project.org/contacts.html" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " | ||
6 | SECTION = "x11" | ||
7 | DEPENDS = "glib-2.0 gtk+ evolution-data-server" | ||
8 | DEPENDS_append_poky = " libowl" | ||
9 | RDEPENDS_${PN} = "libedata-book" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
12 | |||
13 | OWL = "--disable-owl" | ||
14 | OWL_poky = "--enable-owl" | ||
15 | |||
16 | EXTRA_OECONF += "--disable-gnome-vfs ${OWL}" | ||
17 | EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" | ||
18 | |||
19 | do_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 | |||
25 | FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ | ||
26 | ${datadir}/pixmaps/stock_person.png \ | ||
27 | ${datadir}/icons/hicolor" | ||
28 | |||
29 | SRC_URI = "file://stock_contact.png \ | ||
30 | file://stock_person.png \ | ||
31 | file://contacts-conditionally-install-schema.patch \ | ||
32 | " | ||
33 | |||
34 | SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes " | ||
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch b/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch new file mode 100644 index 000000000..2ab7882c8 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL | ||
2 | |||
3 | If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not | ||
4 | be installed. | ||
5 | |||
6 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | --- | ||
10 | data/Makefile.am | 7 ++++--- | ||
11 | 1 files changed, 4 insertions(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/data/Makefile.am b/data/Makefile.am | ||
14 | index 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 | -- | ||
36 | 1.7.7.6 | ||
37 | |||
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch b/meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch new file mode 100644 index 000000000..532387667 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | Upstream-Status: Inappropriate [enable feature] | ||
2 | |||
3 | Index: 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); | ||
18 | Index: 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 | |||
31 | Index: 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-gnome/recipes-gnome/pimlico/contacts/make-382.patch b/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch new file mode 100644 index 000000000..a7cfee3a0 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Fix for stricter parser in make 3.82. This fix has been pushed to upstream git. | ||
2 | |||
3 | JL - 15/12/10 | ||
4 | |||
5 | Upstream-Status: Accepted | ||
6 | |||
7 | Index: 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-gnome/recipes-gnome/pimlico/contacts/stock_contact.png b/meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png new file mode 100644 index 000000000..123b4485a --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png | |||
Binary files differ | |||
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png b/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png new file mode 100644 index 000000000..2b1328b4e --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png | |||
Binary files differ | |||
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb b/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb new file mode 100644 index 000000000..251bbe1d7 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require contacts.inc | ||
2 | |||
3 | PR = "r7" | ||
4 | |||
5 | SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" | ||
6 | |||
7 | SRC_URI[md5sum] = "aab5affbf93d6fa7b978b323a8d44de0" | ||
8 | SRC_URI[sha256sum] = "9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d" | ||
9 | |||
10 | LIC_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 | |||
15 | do_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-gnome/recipes-gnome/pimlico/contacts_git.bb b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb new file mode 100644 index 000000000..45a6a0df4 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require contacts.inc | ||
2 | |||
3 | LIC_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 | |||
8 | SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933" | ||
9 | PV = "0.12+git${SRCPV}" | ||
10 | PR = "r4" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \ | ||
15 | file://make-382.patch" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | |||
diff --git a/meta-gnome/recipes-gnome/pimlico/dates.inc b/meta-gnome/recipes-gnome/pimlico/dates.inc new file mode 100644 index 000000000..9b338fd81 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/dates.inc | |||
@@ -0,0 +1,20 @@ | |||
1 | DESCRIPTION = "Dates is a calendar application." | ||
2 | HOMEPAGE = "http://pimlico-project.org/dates.html" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "GPLv2 & GPLv2+ & LGPLv2+" | ||
6 | |||
7 | SECTION = "x11" | ||
8 | DEPENDS = "glib-2.0 gtk+ libglade evolution-data-server" | ||
9 | RDEPENDS_${PN} = "libedata-cal" | ||
10 | |||
11 | inherit autotools gettext pkgconfig gtk-icon-cache | ||
12 | |||
13 | # Poky/Sato specific enhancements | ||
14 | OWL = "--disable-owl" | ||
15 | OWL_poky = "--enable-owl --disable-dnd" | ||
16 | |||
17 | EXTRA_OECONF += "${OWL}" | ||
18 | DEPENDS_append_poky = " libowl" | ||
19 | SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes " | ||
20 | |||
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch b/meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch new file mode 100644 index 000000000..714623efe --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch | |||
@@ -0,0 +1,67 @@ | |||
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 | |||
7 | Upstream-Status: Inappropriate [enable feature] | ||
8 | |||
9 | Index: 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); | ||
32 | Index: 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; | ||
55 | Index: 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-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch b/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch new file mode 100644 index 000000000..649d59d91 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | after gcc linking has changed, all the libraries must be explicitely specified | ||
2 | This 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 | ... | ||
7 | | /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 | ||
8 | | /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libm.so: could not read symbols: Bad value^M | ||
9 | | collect2: ld returned 1 exit status^M | ||
10 | | make[2]: *** [dates] Error 1 | ||
11 | |||
12 | |||
13 | |||
14 | | /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 | ||
15 | | /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so: could not read symbols: Bad value | ||
16 | | collect2: ld returned 1 exit status | ||
17 | | make[2]: *** [dates] Error 1 | ||
18 | |||
19 | |||
20 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
21 | Date: 2011/01/11 | ||
22 | |||
23 | Update: | ||
24 | This is identified as a libtool issue. While creating the libgtkdatesview.la | ||
25 | file, libtool should have added these needed libraries in there. | ||
26 | A bug has been created for this issue: | ||
27 | http://bugzilla.pokylinux.org/show_bug.cgi?id=664 | ||
28 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
29 | Date: 2011/01/19 | ||
30 | |||
31 | Upstream-Status: Pending | ||
32 | |||
33 | Index: git/src/Makefile.am | ||
34 | =================================================================== | ||
35 | --- git.orig/src/Makefile.am | ||
36 | +++ git/src/Makefile.am | ||
37 | @@ -34,6 +34,6 @@ dates_SOURCES = $(platform) \ | ||
38 | gconf-bridge.h \ | ||
39 | gconf-bridge.c | ||
40 | |||
41 | -dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la | ||
42 | +dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la -lm -lpango-1.0 | ||
43 | |||
44 | MAINTAINERCLEANFILES = config.h.in Makefile.in | ||
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch b/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch new file mode 100644 index 000000000..fad3c5826 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed | ||
2 | in upstream git. | ||
3 | |||
4 | JL - 15/12/10 | ||
5 | |||
6 | Upstream-Status: Accepted | ||
7 | |||
8 | Index: 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-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch b/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch new file mode 100644 index 000000000..6ade4708f --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY | ||
2 | therefore we introduce a check in configure for the this define | ||
3 | and then we make sure that we use it when it really exists | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: 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 " " | ||
22 | Index: 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-gnome/recipes-gnome/pimlico/dates_0.4.8.bb b/meta-gnome/recipes-gnome/pimlico/dates_0.4.8.bb new file mode 100644 index 000000000..da3f27349 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/dates_0.4.8.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require dates.inc | ||
2 | |||
3 | PR = "r6" | ||
4 | |||
5 | SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz" | ||
diff --git a/meta-gnome/recipes-gnome/pimlico/dates_git.bb b/meta-gnome/recipes-gnome/pimlico/dates_git.bb new file mode 100644 index 000000000..9ee010554 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/dates_git.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require dates.inc | ||
2 | |||
3 | LIC_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 | |||
8 | SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4" | ||
9 | PV = "0.4.11+git${SRCPV}" | ||
10 | PR = "r8" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | SRC_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-gnome/recipes-gnome/pimlico/tasks.inc b/meta-gnome/recipes-gnome/pimlico/tasks.inc new file mode 100644 index 000000000..9cd525987 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/tasks.inc | |||
@@ -0,0 +1,16 @@ | |||
1 | DESCRIPTION = "Task list application" | ||
2 | HOMEPAGE = "http://pimlico-project.org/tasks.html" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "GPLv2 & GPLv2+" | ||
6 | |||
7 | SECTION = "x11" | ||
8 | DEPENDS = "glib-2.0 gtk+ evolution-data-server" | ||
9 | DEPENDS_append_poky = " libowl" | ||
10 | |||
11 | inherit autotools pkgconfig gtk-icon-cache | ||
12 | |||
13 | OWL ?= "--disable-owl" | ||
14 | OWL_poky ?= "--enable-owl" | ||
15 | |||
16 | EXTRA_OECONF += "${OWL}" | ||
diff --git a/meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff b/meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff new file mode 100644 index 000000000..aab23ff28 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff | |||
@@ -0,0 +1,67 @@ | |||
1 | This patch enable owl menu, which is hidden in the title bar to save space on | ||
2 | small screen. It has not been used for a long time, rebase needed. | ||
3 | |||
4 | Upstream-Status: Inappropriate [enable feature] | ||
5 | |||
6 | Index: 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> | ||
32 | Index: 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); | ||
55 | Index: 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-gnome/recipes-gnome/pimlico/tasks_0.19.bb b/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb new file mode 100644 index 000000000..f0d954212 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require tasks.inc | ||
2 | |||
3 | LIC_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 | |||
8 | SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" | ||
9 | |||
10 | SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08" | ||
11 | SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e" | ||
12 | |||
13 | OWL_poky = "--with-owl" | ||
14 | |||
15 | PR = "r2" | ||
diff --git a/meta-gnome/recipes-gnome/pimlico/tasks_git.bb b/meta-gnome/recipes-gnome/pimlico/tasks_git.bb new file mode 100644 index 000000000..16c043076 --- /dev/null +++ b/meta-gnome/recipes-gnome/pimlico/tasks_git.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require tasks.inc | ||
2 | |||
3 | SRC_URI = "git://git.gnome.org/${BPN};protocol=git" | ||
4 | |||
5 | SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65" | ||
6 | PV = "0.13+git${SRCPV}" | ||
7 | PR = "r3" | ||
8 | |||
9 | S = "${WORKDIR}/git" | ||