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>
This commit is contained in:
Ross Burton
Richard Purdie
parent
af8e6b6c57
commit
5e775b5e5c
|
|
@ -18,7 +18,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
|
|||
# - x11-sato - OpenedHand Sato environment
|
||||
# - apps-x11-core - X Terminal, file manager, file editor
|
||||
# - apps-x11-games
|
||||
# - apps-x11-pimlico - OpenedHand Pimlico apps
|
||||
# - tools-sdk - SDK
|
||||
# - tools-debug - debugging tools
|
||||
# - tools-profile - profiling tools
|
||||
|
|
@ -34,7 +33,6 @@ PACKAGE_GROUP_x11-base = "task-core-x11-base"
|
|||
PACKAGE_GROUP_x11-sato = "task-core-x11-sato"
|
||||
PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core"
|
||||
PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games"
|
||||
PACKAGE_GROUP_apps-x11-pimlico = "task-core-apps-x11-pimlico"
|
||||
PACKAGE_GROUP_tools-debug = "task-core-tools-debug"
|
||||
PACKAGE_GROUP_tools-profile = "task-core-tools-profile"
|
||||
PACKAGE_GROUP_tools-testapps = "task-core-tools-testapps"
|
||||
|
|
@ -65,7 +63,7 @@ CORE_IMAGE_EXTRA_INSTALL ?= ""
|
|||
IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
|
||||
|
||||
X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
|
||||
ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management"
|
||||
ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
|
||||
SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear"
|
||||
SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
DESCRIPTION = "Address-book application."
|
||||
HOMEPAGE = "http://pimlico-project.org/contacts.html"
|
||||
BUGTRACKER = "https://bugzilla.gnome.org/"
|
||||
|
||||
LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
|
||||
SECTION = "x11"
|
||||
DEPENDS = "glib-2.0 gtk+ evolution-data-server"
|
||||
DEPENDS_append_poky = " libowl"
|
||||
RDEPENDS_${PN} = "libedata-book"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
OWL = "--disable-owl"
|
||||
OWL_poky = "--enable-owl"
|
||||
|
||||
EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
|
||||
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 \
|
||||
${datadir}/icons/hicolor"
|
||||
|
||||
SRC_URI = "file://stock_contact.png \
|
||||
file://stock_person.png \
|
||||
file://contacts-conditionally-install-schema.patch \
|
||||
"
|
||||
|
||||
SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
||||
|
||||
If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not
|
||||
be installed.
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
data/Makefile.am | 7 ++++---
|
||||
1 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/data/Makefile.am b/data/Makefile.am
|
||||
index f790823..b6fd643 100644
|
||||
--- a/data/Makefile.am
|
||||
+++ b/data/Makefile.am
|
||||
@@ -14,13 +14,14 @@ dist_man1_MANS = contacts.1
|
||||
|
||||
if HAVE_GCONF
|
||||
install-data-local:
|
||||
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
|
||||
+ if [ "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" != "1" ]; then \
|
||||
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
|
||||
$(GCONFTOOL) --makefile-install-rule $(schema_DATA) || \
|
||||
(echo ;\
|
||||
echo "*****************************************************"; \
|
||||
echo "Installation of schemas failed, install them manually"; \
|
||||
- echo "*****************************************************";)
|
||||
- @true
|
||||
+ echo "*****************************************************";); \
|
||||
+ fi
|
||||
endif
|
||||
|
||||
CLEANFILES = $(desktop_DATA)
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
Upstream-Status: Inappropriate [enable feature]
|
||||
|
||||
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 <libowl/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 */
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Fix for stricter parser in make 3.82. This fix has been pushed to upstream git.
|
||||
|
||||
JL - 15/12/10
|
||||
|
||||
Upstream-Status: Accepted
|
||||
|
||||
Index: git/Makefile.am
|
||||
===================================================================
|
||||
--- git.orig/Makefile.am
|
||||
+++ git/Makefile.am
|
||||
@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT)
|
||||
MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing
|
||||
|
||||
snapshot:
|
||||
- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
|
||||
+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB |
|
|
@ -1,18 +0,0 @@
|
|||
require contacts.inc
|
||||
|
||||
PR = "r7"
|
||||
|
||||
SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "aab5affbf93d6fa7b978b323a8d44de0"
|
||||
SRC_URI[sha256sum] = "9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
file://src/contacts-main.h;endline=18;md5=0371af46fbc72e33575e0072dca5fb19 \
|
||||
file://src/contacts-dbus.c;endline=18;md5=e4da9ac1a0539fafc7df431010904fd5 \
|
||||
file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee"
|
||||
|
||||
do_configure_prepend () {
|
||||
# It used 8 spaces to instead of a tab, but it doesn't work for us
|
||||
sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
require contacts.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \
|
||||
file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \
|
||||
file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
|
||||
|
||||
SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933"
|
||||
PV = "0.12+git${SRCPV}"
|
||||
PR = "r4"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \
|
||||
file://make-382.patch"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
DESCRIPTION = "Dates is a calendar application."
|
||||
HOMEPAGE = "http://pimlico-project.org/dates.html"
|
||||
BUGTRACKER = "https://bugzilla.gnome.org/"
|
||||
|
||||
LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"
|
||||
|
||||
SECTION = "x11"
|
||||
DEPENDS = "glib-2.0 gtk+ libglade evolution-data-server"
|
||||
RDEPENDS_${PN} = "libedata-cal"
|
||||
|
||||
inherit autotools gettext pkgconfig gtk-icon-cache
|
||||
|
||||
# Poky/Sato specific enhancements
|
||||
OWL = "--disable-owl"
|
||||
OWL_poky = "--enable-owl --disable-dnd"
|
||||
|
||||
EXTRA_OECONF += "${OWL}"
|
||||
DEPENDS_append_poky = " libowl"
|
||||
SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
|
||||
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
---
|
||||
src/dates_gtk.c | 5 -----
|
||||
src/dates_main.c | 5 +++++
|
||||
src/dates_platform.h | 2 +-
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
Upstream-Status: Inappropriate [enable feature]
|
||||
|
||||
Index: git/src/dates_gtk.c
|
||||
===================================================================
|
||||
--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
|
||||
+++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100
|
||||
@@ -33,10 +33,6 @@
|
||||
#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)
|
||||
@@ -59,7 +55,6 @@
|
||||
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);
|
||||
Index: git/src/dates_main.c
|
||||
===================================================================
|
||||
--- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100
|
||||
+++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100
|
||||
@@ -26,6 +26,8 @@
|
||||
#include <libical/icaltime.h>
|
||||
#include <gconf/gconf-client.h>
|
||||
|
||||
+#include <gtk/gtkmenuitem.h>
|
||||
+#include <libowl/owlwindowmenu.h>
|
||||
#include "dates_types.h"
|
||||
#include "dates_platform.h"
|
||||
#include "dates_callbacks.h"
|
||||
@@ -582,6 +584,9 @@
|
||||
g_free (url_uri);
|
||||
}
|
||||
|
||||
+ owl_set_window_menu (GTK_WINDOW (data.main_window),
|
||||
+ GTK_MENU (data.main_menu));
|
||||
+
|
||||
gtk_main ();
|
||||
|
||||
return 0;
|
||||
Index: git/src/dates_platform.h
|
||||
===================================================================
|
||||
--- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100
|
||||
+++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "dates_types.h"
|
||||
|
||||
-#ifdef WITH_HILDON
|
||||
+#if 1
|
||||
#define DATES_MENU_WITHOUT_BAR 1
|
||||
#endif
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,18 +0,0 @@
|
|||
Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed
|
||||
in upstream git.
|
||||
|
||||
JL - 15/12/10
|
||||
|
||||
Upstream-Status: Accepted
|
||||
|
||||
Index: git/Makefile.am
|
||||
===================================================================
|
||||
--- git.orig/Makefile.am
|
||||
+++ git/Makefile.am
|
||||
@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto
|
||||
MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
|
||||
|
||||
snapshot:
|
||||
- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
|
||||
+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY
|
||||
therefore we introduce a check in configure for the this define
|
||||
and then we make sure that we use it when it really exists
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: git/configure.ac
|
||||
===================================================================
|
||||
--- git.orig/configure.ac 2011-07-18 10:34:15.000000000 -0700
|
||||
+++ git/configure.ac 2011-07-18 10:54:26.403798188 -0700
|
||||
@@ -98,6 +98,8 @@
|
||||
src/libgtkdatesview.pc
|
||||
])
|
||||
|
||||
+AC_CHECK_DECLS([_NL_TIME_FIRST_WEEKDAY],[],[],[[#include <langinfo.h>]])
|
||||
+
|
||||
AC_OUTPUT
|
||||
|
||||
echo " "
|
||||
Index: git/src/dates_view.c
|
||||
===================================================================
|
||||
--- git.orig/src/dates_view.c 2011-07-18 10:34:15.000000000 -0700
|
||||
+++ git/src/dates_view.c 2011-07-18 10:58:46.093798136 -0700
|
||||
@@ -1505,7 +1505,11 @@
|
||||
priv->days = 1;
|
||||
priv->months = 0;
|
||||
priv->months_in_row = 4;
|
||||
+#if HAVE_DECL__NL_TIME_FIRST_WEEKDAY
|
||||
priv->week_start = *nl_langinfo (_NL_TIME_FIRST_WEEKDAY) - 1;
|
||||
+#else
|
||||
+ priv->week_start = 0;
|
||||
+#endif
|
||||
priv->dragbox = TRUE;
|
||||
priv->single_click = TRUE;
|
||||
priv->double_click = FALSE;
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
require dates.inc
|
||||
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
require dates.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
|
||||
file://src/dates_view.h;endline=22;md5=29f934f356eb970309cdeb6693b3123a \
|
||||
file://src/dates_hildon.c;endline=19;md5=63938904198b25de429abb65fbdbdb8a \
|
||||
file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
|
||||
|
||||
SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4"
|
||||
PV = "0.4.11+git${SRCPV}"
|
||||
PR = "r8"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRC_URI = "git://git.gnome.org/${BPN};protocol=git \
|
||||
file://make-382.patch \
|
||||
file://dso_linking_change_build_fix.patch \
|
||||
file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
|
||||
"
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
DESCRIPTION = "Task list application"
|
||||
HOMEPAGE = "http://pimlico-project.org/tasks.html"
|
||||
BUGTRACKER = "https://bugzilla.gnome.org/"
|
||||
|
||||
LICENSE = "GPLv2 & GPLv2+"
|
||||
|
||||
SECTION = "x11"
|
||||
DEPENDS = "glib-2.0 gtk+ evolution-data-server"
|
||||
DEPENDS_append_poky = " libowl"
|
||||
|
||||
inherit autotools pkgconfig gtk-icon-cache
|
||||
|
||||
OWL ?= "--disable-owl"
|
||||
OWL_poky ?= "--enable-owl"
|
||||
|
||||
EXTRA_OECONF += "${OWL}"
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
This patch enable owl menu, which is hidden in the title bar to save space on
|
||||
small screen. It has not been used for a long time, rebase needed.
|
||||
|
||||
Upstream-Status: Inappropriate [enable feature]
|
||||
|
||||
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 <libowl/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 \
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
require tasks.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \
|
||||
file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \
|
||||
file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52"
|
||||
|
||||
SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08"
|
||||
SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e"
|
||||
|
||||
OWL_poky = "--with-owl"
|
||||
|
||||
PR = "r2"
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
require tasks.inc
|
||||
|
||||
SRC_URI = "git://git.gnome.org/${BPN};protocol=git"
|
||||
|
||||
SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65"
|
||||
PV = "0.13+git${SRCPV}"
|
||||
PR = "r3"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2007-2008 OpenedHand Ltd.
|
||||
#
|
||||
|
||||
DESCRIPTION = "X11 Pimlico Appications List"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
PR = "r28"
|
||||
|
||||
PACKAGES = "\
|
||||
task-core-apps-x11-pimlico \
|
||||
task-core-apps-x11-pimlico-dbg \
|
||||
task-core-apps-x11-pimlico-dev \
|
||||
"
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
ALLOW_EMPTY = "1"
|
||||
|
||||
WEB ?= ""
|
||||
#WEB = "web-webkit"
|
||||
# WebKit takes too much space to fit on some devices
|
||||
# List here for now...
|
||||
#WEB_c7x0 = ""
|
||||
#WEB_mx31ads = ""
|
||||
|
||||
RDEPENDS_task-core-apps-x11-pimlico = "\
|
||||
evolution-data-server \
|
||||
contacts \
|
||||
dates \
|
||||
tasks \
|
||||
gaku \
|
||||
${WEB}"
|
||||
|
|
@ -6,7 +6,7 @@ DESCRIPTION = "Sato Tasks for Poky"
|
|||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
PR = "r31"
|
||||
PR = "r32"
|
||||
|
||||
PACKAGES = "\
|
||||
task-core-x11-sato \
|
||||
|
|
@ -21,6 +21,9 @@ ALLOW_EMPTY = "1"
|
|||
NETWORK_MANAGER ?= "connman-gnome"
|
||||
NETWORK_MANAGER_libc-uclibc = ""
|
||||
|
||||
WEB ?= ""
|
||||
#WEB = "web-webkit"
|
||||
|
||||
RDEPENDS_task-core-x11-sato = "\
|
||||
matchbox-desktop \
|
||||
matchbox-session-sato \
|
||||
|
|
@ -34,4 +37,6 @@ RDEPENDS_task-core-x11-sato = "\
|
|||
gthumb \
|
||||
x11vnc \
|
||||
libsdl \
|
||||
gaku \
|
||||
${WEB} \
|
||||
${NETWORK_MANAGER}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue