summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-sato
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb33
-rw-r--r--meta/recipes-sato/clipboard-manager/files/daemonize.patch44
-rw-r--r--meta/recipes-sato/clipboard-manager/files/makefile.patch18
-rw-r--r--meta/recipes-sato/clipboard-manager/files/script.patch39
-rw-r--r--meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h5
-rw-r--r--meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch30
-rw-r--r--meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch132
-rw-r--r--meta/recipes-sato/eds/eds-dbus/iconv-detect.h5
-rw-r--r--meta/recipes-sato/eds/eds-dbus/nossl.patch68
-rw-r--r--meta/recipes-sato/eds/eds-dbus/oh-contact.patch134
-rw-r--r--meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch62
-rw-r--r--meta/recipes-sato/eds/eds-dbus/parallelmake.patch201
-rw-r--r--meta/recipes-sato/eds/eds-dbus_2.20.0.bb90
-rw-r--r--meta/recipes-sato/eds/eds-dbus_git.bb102
-rw-r--r--meta/recipes-sato/eds/eds-tools_bzr.bb13
-rw-r--r--meta/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml12
-rw-r--r--meta/recipes-sato/epdfview/epdfview/epdfview-ui.xml57
-rw-r--r--meta/recipes-sato/epdfview/epdfview/epdfview.desktop10
-rw-r--r--meta/recipes-sato/epdfview/epdfview/owl-menus.patch325
-rw-r--r--meta/recipes-sato/epdfview/epdfview_0.1.6.bb21
-rw-r--r--meta/recipes-sato/epdfview/epdfview_0.1.7.bb21
-rw-r--r--meta/recipes-sato/gaku/gaku_svn.bb26
-rw-r--r--meta/recipes-sato/gtk-engines/gtk-sato-engine.inc23
-rw-r--r--meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb14
-rw-r--r--meta/recipes-sato/images/poky-image-sato-directdisk.bb7
-rw-r--r--meta/recipes-sato/images/poky-image-sato-live.bb9
-rw-r--r--meta/recipes-sato/images/poky-image-sato.bb7
-rw-r--r--meta/recipes-sato/images/poky-image-sdk-live.bb9
-rw-r--r--meta/recipes-sato/images/poky-image-sdk.bb7
-rw-r--r--meta/recipes-sato/kf/files/fix-configure.patch25
-rw-r--r--meta/recipes-sato/kf/files/fix-desktop-file.patch20
-rw-r--r--meta/recipes-sato/kf/files/gcc4.patch30
-rw-r--r--meta/recipes-sato/kf/kf_0.5.4.1.bb16
-rw-r--r--meta/recipes-sato/leafpad/files/leafpad.desktop10
-rw-r--r--meta/recipes-sato/leafpad/files/owl-menu.patch61
-rw-r--r--meta/recipes-sato/leafpad/leafpad_0.8.17.bb28
-rw-r--r--meta/recipes-sato/libowl/libowl_svn.bb20
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch33
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb20
-rw-r--r--meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb19
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb24
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb11
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb22
-rwxr-xr-xmeta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg23
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch13
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb60
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb36
-rw-r--r--meta/recipes-sato/matchbox-panel-2/startup_fix.diff17
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato/session22
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb53
-rw-r--r--meta/recipes-sato/matchbox-stroke/files/configure_fix.patch13
-rw-r--r--meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb21
-rw-r--r--meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb18
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb9
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc13
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb5
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb10
-rw-r--r--meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb25
-rw-r--r--meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb30
-rw-r--r--meta/recipes-sato/matchbox-themes-gtk/files/gtkrc1
-rw-r--r--meta/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb17
-rw-r--r--meta/recipes-sato/owl-video-widget/files/owl-video-widget.desktop10
-rw-r--r--meta/recipes-sato/owl-video-widget/files/owl-video-widget.pngbin0 -> 4923 bytes
-rw-r--r--meta/recipes-sato/owl-video-widget/files/stock_media-play.pngbin0 -> 329 bytes
-rw-r--r--meta/recipes-sato/owl-video-widget/files/stock_volume-0.pngbin0 -> 570 bytes
-rw-r--r--meta/recipes-sato/owl-video-widget/files/stock_volume-max.pngbin0 -> 689 bytes
-rw-r--r--meta/recipes-sato/owl-video-widget/files/stock_volume-med.pngbin0 -> 630 bytes
-rw-r--r--meta/recipes-sato/owl-video-widget/files/stock_volume-min.pngbin0 -> 570 bytes
-rw-r--r--meta/recipes-sato/owl-video-widget/libowl-av_svn.bb22
-rw-r--r--meta/recipes-sato/owl-video-widget/owl-video_svn.bb38
-rw-r--r--meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch16
-rw-r--r--meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.pngbin0 -> 999 bytes
-rw-r--r--meta/recipes-sato/pcmanfm/files/gnome-fs-directory.pngbin0 -> 2044 bytes
-rw-r--r--meta/recipes-sato/pcmanfm/files/gnome-fs-regular.pngbin0 -> 3220 bytes
-rw-r--r--meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.pngbin0 -> 2855 bytes
-rw-r--r--meta/recipes-sato/pcmanfm/files/owl-window-menu.patch80
-rw-r--r--meta/recipes-sato/pcmanfm/pcmanfm_0.9.7.bb35
-rw-r--r--meta/recipes-sato/pimlico/contacts.inc31
-rw-r--r--meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch52
-rw-r--r--meta/recipes-sato/pimlico/contacts/stock_contact.pngbin0 -> 2311 bytes
-rw-r--r--meta/recipes-sato/pimlico/contacts/stock_person.pngbin0 -> 2280 bytes
-rw-r--r--meta/recipes-sato/pimlico/contacts_0.9.bb5
-rw-r--r--meta/recipes-sato/pimlico/contacts_git.bb17
-rw-r--r--meta/recipes-sato/pimlico/dates.inc20
-rw-r--r--meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch65
-rw-r--r--meta/recipes-sato/pimlico/dates_0.4.8.bb5
-rw-r--r--meta/recipes-sato/pimlico/dates_git.bb13
-rw-r--r--meta/recipes-sato/pimlico/tasks.inc16
-rw-r--r--meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch26
-rw-r--r--meta/recipes-sato/pimlico/tasks/tasks-owl.diff62
-rw-r--r--meta/recipes-sato/pimlico/tasks_0.16.bb14
-rw-r--r--meta/recipes-sato/pimlico/tasks_git.bb8
-rw-r--r--meta/recipes-sato/puzzles/files/makedist_hack.patch17
-rw-r--r--meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch198
-rw-r--r--meta/recipes-sato/puzzles/oh-puzzles_svn.bb69
-rw-r--r--meta/recipes-sato/puzzles/puzzles_r7593.bb53
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc24
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch51
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb6
-rw-r--r--meta/recipes-sato/screenshot/screenshot_svn.bb21
-rw-r--r--meta/recipes-sato/settings-daemon/files/70settings-daemon.sh1
-rw-r--r--meta/recipes-sato/settings-daemon/files/addsoundkeys.patch47
-rw-r--r--meta/recipes-sato/settings-daemon/settings-daemon_svn.bb26
-rw-r--r--meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb31
-rw-r--r--meta/recipes-sato/tasks/task-poky-x11-sato.bb30
-rw-r--r--meta/recipes-sato/web/web-webkit/link-with-g++.patch32
-rw-r--r--meta/recipes-sato/web/web-webkit_svn.bb26
-rw-r--r--meta/recipes-sato/web/web/owl-window-menu.patch100
-rw-r--r--meta/recipes-sato/web/web_svn.bb16
109 files changed, 3532 insertions, 0 deletions
diff --git a/meta/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb b/meta/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb
new file mode 100644
index 0000000000..82dd1d047f
--- /dev/null
+++ b/meta/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb
@@ -0,0 +1,33 @@
1LICENSE = "GPL"
2DESCRIPTION = "clipboard manager"
3DEPENDS = "virtual/libx11"
4
5SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/tags/clipboard-manager/;module=${PV};proto=https \
6 file://makefile.patch;patch=1 \
7 file://script.patch;patch=1 \
8 file://daemonize.patch;patch=1 \
9 "
10
11S = "${WORKDIR}/${PV}"
12
13inherit autotools pkgconfig
14
15do_install_append () {
16 mv ${D}/${sysconfdir}/X11/Xsession.d/clipboard.sh ${D}/${sysconfdir}/X11/Xsession.d/70clipboard
17 chmod u+x ${D}/${sysconfdir}/X11/Xsession.d/70clipboard
18}
19
20pkg_postinst_clipboard-manager () {
21#!/bin/sh -e
22if [ x"$D" = "x" ]; then
23 {
24 if [ x$(pidof clipboard-manager) != x ]; then
25 kill -TERM $(pidof clipboard-manager)
26 fi
27
28 ${sysconfdir}/X11/Xsession.d/70clipboard
29 } > /dev/null
30else
31 exit 1
32fi
33}
diff --git a/meta/recipes-sato/clipboard-manager/files/daemonize.patch b/meta/recipes-sato/clipboard-manager/files/daemonize.patch
new file mode 100644
index 0000000000..51ce4781a5
--- /dev/null
+++ b/meta/recipes-sato/clipboard-manager/files/daemonize.patch
@@ -0,0 +1,44 @@
1Index: 0.6.4/manager.c
2===================================================================
3--- 0.6.4.orig/manager.c 2007-06-28 12:23:37.000000000 +0100
4+++ 0.6.4/manager.c 2007-06-28 12:36:14.000000000 +0100
5@@ -68,7 +68,8 @@
6 ClipboardManager *manager;
7 int terminated = False;
8 Display *display;
9-
10+ pid_t pid;
11+
12 display = XOpenDisplay (NULL);
13
14 if (!display)
15@@ -83,6 +84,29 @@
16 exit (1);
17 }
18
19+ /* deamonize */
20+ pid = fork();
21+ switch (pid)
22+ {
23+ case -1: fprintf (stderr, "Fork failed.\n");
24+ /* Fall through */
25+ default: exit(0); break;
26+ case 0: break;
27+ }
28+
29+ chdir ("/");
30+ setsid ();
31+ umask (0);
32+
33+ pid = fork();
34+ switch (pid)
35+ {
36+ case -1: fprintf (stderr, "Fork failed.\n");
37+ /* Fall through */
38+ default: exit(0); break;
39+ case 0: break;
40+ }
41+
42 XSetErrorHandler (x_error);
43 manager = clipboard_manager_new (display,
44 error_trap_push, error_trap_pop,
diff --git a/meta/recipes-sato/clipboard-manager/files/makefile.patch b/meta/recipes-sato/clipboard-manager/files/makefile.patch
new file mode 100644
index 0000000000..6e48da004c
--- /dev/null
+++ b/meta/recipes-sato/clipboard-manager/files/makefile.patch
@@ -0,0 +1,18 @@
1Index: 0.6.4/Makefile.am
2===================================================================
3--- 0.6.4.orig/Makefile.am 2007-06-28 12:23:37.000000000 +0100
4+++ 0.6.4/Makefile.am 2007-06-28 14:21:23.000000000 +0100
5@@ -1,5 +1,3 @@
6-SUBDIRS = debian
7-
8 bin_PROGRAMS = clipboard-manager
9
10 INCLUDES = \
11@@ -21,6 +19,6 @@
12 clipboard.txt \
13 clipboard.sh
14
15-servicedir = $(sysconfdir)/osso-af-init
16+servicedir = $(sysconfdir)/X11/Xsession.d
17
18 service_DATA = clipboard.sh
diff --git a/meta/recipes-sato/clipboard-manager/files/script.patch b/meta/recipes-sato/clipboard-manager/files/script.patch
new file mode 100644
index 0000000000..09e68620d7
--- /dev/null
+++ b/meta/recipes-sato/clipboard-manager/files/script.patch
@@ -0,0 +1,39 @@
1Index: 0.6.4/clipboard.sh
2===================================================================
3--- 0.6.4.orig/clipboard.sh 2007-06-28 12:23:37.000000000 +0100
4+++ 0.6.4/clipboard.sh 2007-06-28 14:27:39.000000000 +0100
5@@ -1,33 +1,2 @@
6 #!/bin/sh
7-# Clipboard persistence manager startup script
8-
9-if [ "x$AF_PIDDIR" = "x" ]; then
10- echo "$0: Error, AF_PIDDIR is not defined"
11- exit 2
12-fi
13-if [ "x$LAUNCHWRAPPER_NICE_TRYRESTART" = "x" ]; then
14- echo "$0: Error, LAUNCHWRAPPER_NICE_TRYRESTART is not defined"
15- exit 2
16-fi
17-if [ ! -w $AF_PIDDIR ]; then
18- echo "$0: Error, directory $AF_PIDDIR is not writable"
19- exit 2
20-fi
21-PROG=/usr/bin/clipboard-manager
22-SVC="clipboard-manager"
23-
24-case "$1" in
25-start) START=TRUE
26- ;;
27-stop) START=FALSE
28- ;;
29-*) echo "Usage: $0 {start|stop}"
30- exit 1
31- ;;
32-esac
33-
34-if [ $START = TRUE ]; then
35- source $LAUNCHWRAPPER_NICE_TRYRESTART start "$SVC" $PROG
36-else
37- source $LAUNCHWRAPPER_NICE_TRYRESTART stop "$SVC" $PROG
38-fi
39+/usr/bin/clipboard-manager &
diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h b/meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h
new file mode 100644
index 0000000000..46f476d5bc
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h
@@ -0,0 +1,5 @@
1/* This is an auto-generated header, DO NOT EDIT! */
2
3#define ICONV_ISO_D_FORMAT "iso-%d-%d"
4#define ICONV_ISO_S_FORMAT "iso-%d-%s"
5#define ICONV_10646 "iso-10646"
diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch b/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
new file mode 100644
index 0000000000..4a034b6c58
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
@@ -0,0 +1,30 @@
1Index: trunk/configure.in
2===================================================================
3--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000
4+++ trunk/configure.in 2005-09-28 19:13:22.000000000 +0000
5@@ -254,25 +221,6 @@
6 AC_SUBST(ICONV_CFLAGS)
7 AC_SUBST(ICONV_LIBS)
8
9-CFLAGS="$CFLAGS -I$srcdir"
10-
11-AC_MSG_CHECKING(preferred charset formats for system iconv)
12-AC_TRY_RUN([
13-#define CONFIGURE_IN
14-#include "iconv-detect.c"
15-],[
16- AC_MSG_RESULT(found)
17-],[
18- AC_MSG_RESULT(not found)
19- AC_WARN([
20- *** The iconv-detect program was unable to determine the
21- *** preferred charset formats recognized by your system
22- *** iconv library. It is suggested that you install a
23- *** working iconv library such as the one found at
24- *** ftp://ftp.gnu.org/pub/gnu/libiconv
25- ])
26-])
27-
28 CFLAGS="$save_CFLAGS"
29 LIBS="$save_LIBS"
30
diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
new file mode 100644
index 0000000000..e5c0f51840
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
@@ -0,0 +1,132 @@
1Index: addressbook/libedata-book/ximian-vcard.h
2===================================================================
3--- addressbook/libedata-book/ximian-vcard.h (revision 578)
4+++ addressbook/libedata-book/ximian-vcard.h (working copy)
5@@ -1,80 +1,40 @@
6 #define XIMIAN_VCARD \
7 "BEGIN:VCARD\n" \
8-"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \
9-"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \
10-"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \
11-"TEL;WORK;VOICE:(617) 613-2000\n" \
12-"TEL;WORK;FAX:(617) 613-2001\n" \
13-"EMAIL;INTERNET:hello@ximian.com\n" \
14-"URL:http://www.ximian.com/\n" \
15-"ORG:Novell;Ximian Group\n" \
16-"PHOTO;ENCODING=b;TYPE=JPEG:/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\n" \
17-" IFRoZSBHSU1Q/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCM\n" \
18-" cHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMj\n" \
19-" IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAbgBkAwEiAAIRAQMRAf/EA\n" \
20-" BwAAAIDAQEBAQAAAAAAAAAAAAAHBQYIBAMBAv/EAEYQAAEDAwEFBgMEBgQPAAAAAAECAwQABREG\n" \
21-" BxIhMWETIkFRcYEUkaEIMkLBFSNSsbLRFmJydRgkMzY3Q0RGgpKTosLh8P/EABsBAQACAwEBAAA\n" \
22-" AAAAAAAAAAAAEBQIDBgEH/8QALREAAQMCAwYGAgMAAAAAAAAAAQACAwQREiFRBRMiMUFhMnGBkb\n" \
23-" HRBsEUofD/2gAMAwEAAhEDEQA/AH/RRRREVwXe9W2wwFzbpNZixkc1uqwPQeZ6CoHXevLfom1ds\n" \
24-" 9h6a6D8PGCsFZHMk+CR4n86yzdbrqfaZqYBSnp0hRPZMoG62ynoOSR1Pua8Lg0XPJegX5Jv6k+0\n" \
25-" bBjrWxp22LlkcBIlHs0HqEjiR64peT9umupqyWrhHhpP4WI6eHureNW7Tmw+DGaTI1FJVJdxksM\n" \
26-" qKG09CrmfbFMCHpCw2xATDs8JrH4gykq+Z4mqifbMUZsxpd/QUllK53M2SCb2xa+bXvf0gcV0Uw\n" \
27-" 0R/DVktH2hdUwlpFxjQrg1490tLPuOH0pvv2qE4jdchx1p8lNAj91Va87OtM3RCt+2Nx3Dyci/q\n" \
28-" yPYcD7g1EZ+RR4rSMI9b/S2mhdbhKsmkdtWmNTuNxnXVW2cvgGZRASo+SV8j74PSmOlQUMpORWP\n" \
29-" NU7MrjY0rlQFmdDTxOE4cQOo8R1Hyqe2Z7ZJ2m32bXfHnJVpJCUuqO8uP7+Kenh4eVXkFRFUMxx\n" \
30-" G4UOSN0Zs4LU1FeEOWxOityYzqHWXEhSFoOQoHkQa963rBFFFFERUdfr1E09Y5d1mr3Y8ZsrV5n\n" \
31-" yA6k4A6mpGkL9ojUym0W/TrLmAsGU+AeYBwgfPJ/4RREqrrcb1tJ1oUpBXLmObqUZ7rSByT0SkZ\n" \
32-" J8zk1pHQmiLXo+zpbabC3SAp55Q7zyvM9PIUudiGmURbS7fpCMvzFFton8LSTxx6qH0FM7VV9VY\n" \
33-" 9MzZ7aQt5tASw3+26ohKB/zEVSVFVvZzGMw02tqe/kpbI8LMR6/C/Xxq9QagfbbP+IW1QQ4Rycf\n" \
34-" xncHRAIJ/rEfsmu2a9Fgsl2XIZjtj8bqwgfM1+9L2VFksESAV9o6hG886ebjqjvLWepUSarutdn\n" \
35-" MXV+obRcZks/CwCQ5DKMpeBOTxzwzgA9KwfTtfxPOSB5GQUXc9pOjoC+zXe2HV5xiOC6PmkEfWp\n" \
36-" xe6tAWghSVDIIOQRXxekNOx4b0WPZYLLTram19mwlJKSMHjjNUzQd2dZM7SNxczcLOsttqVzdYz\n" \
37-" 3FewI9iKpK2mjMZdFe7ed9NfT9qZDI4OAd1Vkko50ndoui22kuXq2NBOO9JZSOH9sD9/z86c8gc\n" \
38-" DUJNQlaFJUkKSoYII4EVGoKp9PIHt9e6lyRNlZhcqlsJ2guQpydL3F4mO7kw1KP3Fcyj0PEjrnz\n" \
39-" rSAIIyOVYfvsJ3TGqlCKpTfYuJfjLHMDOR8jw9q2Foy+o1FpWBckY/XMpUoeRxxHsciu/jeJGB7\n" \
40-" eRXPvaWuLT0U/RRRWaxQeVY82x3BVw2oXbJyhgoZR0AQM/UmthK+6fSsWbRQW9pV73x/tZPtwNE\n" \
41-" Wj9Nw0WuwwIKQAGI6G/cAZ+tRW0lx5nTEW4Ntqdat9xjy5CEjJLSFZP5H2qaYdCkpUk5BGQa7Ap\n" \
42-" DrSm3EpWhYKVJUMgg8wRXz+kqyyTG7VXUsV22Clrfc48+CzMiPIejvIC23EHIUDXNe79b7HbXbh\n" \
43-" c5SI8ZvmtZ5nyA5k9BS7d0nfdMPuSdD3JtEZaitdom5Uznx3DzT6cPWkvq/V1611fGW5nZtBCgy\n" \
44-" zFbXhtCycE5JxknxPhXR07RUeB3D11H+9lAfwcxmrrqLbxcHpikWGAw1FScByUkqWvrgEBPpxqi\n" \
45-" ztdXWdqmNqIIjx7gykJUphJCXAM/eBJ5g4PQCmBZNiDKWEu364uF0jJYh4AT6qUDn2FVu6bPIkT\n" \
46-" aTB08xKeMOU2H99eCtKRvZGQMZ7hwceNZxVGzsbmMzIBv5dfNeOjnsCdUwbTtKsV8nJgIccZkqw\n" \
47-" lJcThDqvJJz8s4zUtLVzpc2vZZKt+qBIkyUKt0V0ONKSe+7g5SCPDr9Kv0tznXP1cNMyQfxnXBC\n" \
48-" tqUyuB3gslftPjJLkGWB3u82o/Ij86bf2e7iqRoxyIpWfhpC0JHQ4V/5GlVtJcBt0RPiXif+00w\n" \
49-" Ps5BQtNxP4TJP8Ka6rZZJpW37/Kq68ATlPeiiirBQ0HlWR9t9qVbtpEp/dwiY0h5J8Mgbp/h+ta\n" \
50-" 4pM7fdKLumn2rxGbKn4BKl4HEtn73ywD7GiL7o28JuulLbKCsqLKUL/tJ7p+oqyIe4c6RGyzU4g\n" \
51-" THLNJc3WpCt9gk8A54j3GPcdaZuoosy82V23QpaYpkEIdeIJKUeIAHieXPkTXA11DuassJsCefY\n" \
52-" /SvYZN5FiGZU9edRwLDAXJny2mRukoStQBWQOQHjSjg7PYE7ZmzcZb7cG6KK5CZD6txOCcJQvPg\n" \
53-" QAQfAn2q6RNOWi1D9J3R5dwlR2xmZPVv9mlI8ByTj59ar09Lm0jUIQl5Y0zAUMrQSPiXfHHpyz4\n" \
54-" D1qTRvMQIieQAQXOtllfIDre/X2WqVmI8Qz6D9q0bP9SO37SrSpW8ZUVXw7q+YcKeSgeRyMZ65q\n" \
55-" qammvWTalEv1yjOJtaWfh25CBvBOUkHPlxUeHlyq/MiPCitxorSGWG07qG0DASK45xZlx3GJDaH\n" \
56-" WljCkLGQR6VGinY2ofIG8Lri2gOi37hxYG3zC+uT2HY6ZDbyFMrAUlwK7pB5HNRcp7nxqpzdN3G\n" \
57-" CFQ7NObTa3nApcaSN/suOe4SDw6VK3O4swojsp9WGmxk9fIDrW4UzWkbt2K/v691vjec8YtZUTa\n" \
58-" BL+IuMaIjiWWytXQn/wBD608tgtrVC0W2+tOFSFqd9icD6AVnmFFl6n1AhoAmRPdwcfgR4n2H7q\n" \
59-" 2Ppi1N2exRojaQlKEBIHkAK7Gmi3MTWaLn6iTeSF+qmaKKK3rSiuedEanQ3I7qQpC0kEEZzXRRR\n" \
60-" FjnaRoSVoq/KcYQv9HOr3mHB/qzz3SenhVi0ftAbnNNwLo6G5iQEodUcJd9fJX760ZqLTkHUdsd\n" \
61-" hTWEOtuJwQoVl/XGyS7aakOPwGnJcDORujK0DqPH2qJV0cdUzC/0Oi3QTuhddqY84IuFukwnFFK\n" \
62-" JDSmlEcwFDGR86ISI1tgtQ4jYaYaTuoSP/udJS1azvFoAZLnbsp4dm/klPQHmKs0faVEWkfEw32\n" \
63-" 1f1CFj8q56XZNSwYG5t7fSt46yB5ucimM5L4c643pXWqU5tCteMpRKUfIIH86ipmvnnAUwoQSf2\n" \
64-" 3lZ+g/nWEey5yfCtrquBo8Su0+4sQ46pEp1LTSeZUfoPOlnfr67fZKQlK0QkK/VtficV5nrXOkX\n" \
65-" XUk9KQHp0gnghI7qPyAp1bOdkCmH2rneQHHxxQjHdb9OvWr2j2c2Didm74VZVVplGFuQXRsc2fO\n" \
66-" Qgb1cmsSXQN1JH+TT4D+dPEAAADkK848duMylppISkDGBXrVkoCKKKKIiiqrrbX9m0JARIua1re\n" \
67-" dJDMdoArcI58+AA8zVLsO26RqiS9Gsukpct5lHaKbTLaSrd8wFEZ9s0RN6vGRGZktlDqAoHzFKq\n" \
68-" JtomzrPOuzGjZvwEBRTJfckttpbUOae9jJ5cBk8R514Wrbo7e489+3aTlvtQGTIkqElsdm2Mkq4\n" \
69-" 4zyPKiKf1Hsj09flKdXEQh4/jR3VfMUvJ/2et1ZMOe8keSgFfyqz2LbfJ1M9IZs2kJsx2O0XnEN\n" \
70-" yEAhA4ZwcZ58hxr7ZdtkvUS5SbTo2fJMRsuPkPoSG0jzKsDPPhz4HyoipDewC47+FXFWOjYH51Y\n" \
71-" bTsAgtrSqc88/jwWrA+QxUlYtujupZ6oNo0nLlSUtqdKEyW04SMZOVYHiKjP8ACUt5/wB3pX/XT\n" \
72-" /KiJnWLQ1nsTSURorad39lIFWZKUoThIAHSlNqDbLP0siKu96MnQ0ygSyVyGzvYxnlnB4jga87F\n" \
73-" ttlamXJbs2j50xcZvtXUtyEZCfPB5+gyaIm9RSetm3J68RbhJgaSmPM25vtZaviW09knjxIOM8j\n" \
74-" y8q7LHtzstwv/AOhrlBftkkudkFOLS43v5xgqSeHHx5daImrRX5QtK0hSTkGiiLMP2ho8wa1iSn\n" \
75-" QoxVRQ20fAKClFQ9eIqq7LLJe7vreG7ZZCoZhqD8iZjustjnnwORkY8c+Wa1ZqbStt1PBMa4MId\n" \
76-" Rz7wzg+dL8bEbA1vpa7RtK+CkpdWAfXjRFB7UpCNe6Kdm6NnJft1qluKuUJlvdKznPbYH3hzPXJ\n" \
77-" PMGqZsk/zc2gf3G5/Cumc3sRsTO92Rcb3uB3XVjP1r4jYfYGwoN76QsYUEurGR5HjREudhUt2BP\n" \
78-" 1TMYID0eyuuoJGRvJII+oq96I2iwtVz7rb7ZZWbalyzyJ9wKUjLsrKEkjH4cE8+Jz049bew+wNb\n" \
79-" 3Z76N4YO66sZHlzob2H2Bkktb6CRglLqxkeXOiJZbAv9IMj+7X/wB6ag9lGnEaj17CRJA+BhZmy\n" \
80-" lK+6EI44PQq3R6E06W9h9gZVvNb6FYxlLqwcfOhvYhYWt7s99G8MK3XVjI68aIo7UxgbR9IajhQ\n" \
81-" 7/Du9yiSF3S3tMNrStlkAAt94DPDI4eJFUvYfNetqNYz4xAfjWZx5skZAUnJHD1FMVrYhYWVbzW\n" \
82-" +2ojGUOrBx86EbD7A0FBvfRvDCt11YyPI8aIo23zdP6i2e621TaUJiXCfa1IucFPJt5KVnfHRWS\n" \
83-" euPPNZ2YadfkNsspUp1aglCU8yTyrTSNh9gbCgjfSFjCgl1YyPI8al9PbItP2WamUywkuJ5KOVE\n" \
84-" emeVEVw02ZH9H4YkEqdDYCifE4oqXbaS02lCRhIGBRRF//Z\n" \
85+"VERSION:3.0\n" \
86+"FN:OpenedHand Ltd\n" \
87+"URL:http://www.o-hand.com/\n" \
88+"EMAIL:info@openedhand.com\n" \
89+"TEL;TYPE=VOICE:+44 208 819 6559\n" \
90+"ADR;TYPE=WORK:;216 - 218 Homesdale Road;Unit R\, Homesdale Business Center;\n" \
91+" Bromley;;BR1 2QZ;United Kingdom\n" \
92+"LABEL:Unit R, Homesdale Business Center\\n216 - 218 Homesdale Road\\nBromley\\nBR1 2QZ\\nUnited Kingdom\n" \
93+"PHOTO;ENCODING=b:iVBORw0KGgoAAAANSUhEUgAAAC0AAAA\n" \
94+" wCAYAAACFUvPfAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOCwAADgsBOfdp+wAAABl0RVh\n" \
95+" 0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAVWSURBVGiB7ZltiBVVGMd/c93d1DQ\n" \
96+" lStMSBHsRj2/ZelY0lbCIIrQgg8pKqI4gKEkSabZiUhlSmpYvxxKxVxSL9KMf1qRSZ0UTPRm\n" \
97+" KWIoviCSo2/qy3tOHmdXZufN69yp98P/l3pnzf/7P/56Ze84zzzjWWqQWI4AFwDDgKLASWOo\n" \
98+" qYwlAajHS5w1N4Y0BPgQGAUeAz11llhNCiPc3sMRVZlWYF0ZBalEH/AKMBboCA4BPgfdDCeq\n" \
99+" ArcDoEO+9CCMNwEifJ4BlUov6FN5AQEst3kk17f/SDhFjb0ktegWO43hvSy3uCBwv8HXDeFd\n" \
100+" qcXvg+KMYXr3Uokua6eExYx3wbpdWxPGqWsekFoVQTJj3oM+rAR6K4dUAQ+Ite6aTflXXwPc\n" \
101+" kXrdAwlsy6HUGqjPmLUHU5fnf46bpG4Wbpm8UqiqkUye1qAJsKrMCqJTpNyqkkwmZbg+pRac\n" \
102+" K5auITqppqcWjwL5KJAO+lFrMJLocyIy022MOXsEThyPAQeAkcAq4DbgLuAcYDDghfidgITC\n" \
103+" 5DK9XkWY6yvAxYDXwg6vM73GBfrE1AXgJr5JL082MPH/Es3iV2SJXmeY0sqvMCWAFsEJqMd6\n" \
104+" P7V+WyxCyrtONwABXmQ+yGA7DVWYjXqG/NG9sFLKY/gYY4ypzrD2JXGVaXGWmA68Cl9ujlWZ\n" \
105+" 6E/Cyq8yF9iQJwlVmNTCtPRpJpvcBL7rKFNuTIAquMiuBkmfGrIgzbfFm+FxWoVpd2zln7hn\n" \
106+" AXzljgPjVY52rzO604LpVg56CKy9Y69QW4F6pB552HNtYtHZzlxM9P2uY29ASF+sqc1FqMQf\n" \
107+" 4Oq/puJmujzkPQK3u103qAWusLW6y1nkeuA9wwN5pLU86OIuaep3aIVeJtPX4W8BUwvROV5k\n" \
108+" D8YZrqwt03ALOKynaw7BO4/Dl/R+II/j9knXZrF5DlOkfkwIcmmfjNWsywHZyqjqsfW69k1R\n" \
109+" r/JRN6xqiTG+OI8tlg/o4kNpMaQOLPHxmwGtxw64ye4B/8khGmT4am7/6yiiSH/0j4cCYFMq\n" \
110+" RPHph05fxqrW49HENmzTENXBacTyPWAG4FDhuStpMHOvcnUc8gN4p42fziBXwauFWdJdadIx\n" \
111+" lO3ZPHvFrcexNYfRKGW+DAqWXJmE2bWMe8atRsCuFkusKFoAToXOxNW/V+XO/gnM4TwKgWCg\n" \
112+" Wv4sblFp0BvrkESxQOgtPx5F/m3G0ueCVltlbBZZPdkzZvy2B8RjJTcsSFChd3Mf7LdtIbFf\n" \
113+" 7GizMI4NxCw1nLl2ak0KbkG6zLQquMnuBQ4FzPYCJSUGNyszDKT4SiguiybFM36n+GHdw2sG\n" \
114+" LcTpSix7As7lN+5/rQ+fn+x2jWLiv7//51pp/B2LtWMc6b1rHWQt2PtYZX6Sl744pZqnFpl2\n" \
115+" NelJ60VFoNfYxMBWvBQBe1TYVWJIU3DD58AW89zBb8yaWWghA5Y0Df6ZdZU7j9SOCWCi1GF2\n" \
116+" OaBqkFt3xCrPcJQG03cYX0XbNrgE2SC36lW+vFP77lu/xrmZZcGzgtvPfJ26h7RJ0GpjoKrO\n" \
117+" l3CQB/Z7ABmBUCnUBENx9zwO7XGWOl5j2hScBX4VEWoDZwGJXmbIe/6UW44A1eC2zclAEFgM\n" \
118+" zS0z7CeYA8yMCDwGzgA1Zn9KlFoPxZu6JMs2GEW3aTzYJ+ILo3eok3qa0ETgAnHSVOS+1qAZ\n" \
119+" 64s3m48AzpLwTLAN/xpr2jY/AuwfTSkuAZqAjpZ3SSuNsYofJVWY7cD8wF+/PkIROXH/DALs\n" \
120+" TZzoIf8udibfF972OppJwBXg4s+kgpBZD8KrBoXgFfG+8ZnpZm0UGNAE7gVmuMtv+A/CTlwt\n" \
121+" ArmsGAAAAAElFTkSuQmCC\n" \
122 "END:VCARD"
123Index: addressbook/backends/file/Makefile.am
124===================================================================
125--- addressbook/backends/file/Makefile.am (revision 578)
126+++ addressbook/backends/file/Makefile.am (working copy)
127@@ -1,4 +1,5 @@
128 INCLUDES = \
129+ -DCREATE_DEFAULT_VCARD \
130 -DG_LOG_DOMAIN=\"libebookbackend\" \
131 -I$(top_srcdir) \
132 -I$(top_builddir) \
diff --git a/meta/recipes-sato/eds/eds-dbus/iconv-detect.h b/meta/recipes-sato/eds/eds-dbus/iconv-detect.h
new file mode 100644
index 0000000000..46f476d5bc
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/iconv-detect.h
@@ -0,0 +1,5 @@
1/* This is an auto-generated header, DO NOT EDIT! */
2
3#define ICONV_ISO_D_FORMAT "iso-%d-%d"
4#define ICONV_ISO_S_FORMAT "iso-%d-%s"
5#define ICONV_10646 "iso-10646"
diff --git a/meta/recipes-sato/eds/eds-dbus/nossl.patch b/meta/recipes-sato/eds/eds-dbus/nossl.patch
new file mode 100644
index 0000000000..30568ff075
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/nossl.patch
@@ -0,0 +1,68 @@
1Index: git/camel/Makefile.am
2===================================================================
3--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000
4+++ git/camel/Makefile.am 2010-02-05 15:25:20.000000000 +0000
5@@ -80,7 +80,6 @@
6 camel-store-summary.c \
7 camel-store.c \
8 camel-tcp-stream-raw.c \
9- camel-tcp-stream-ssl.c \
10 camel-tcp-stream.c \
11 camel-transport.c \
12 camel-uid-cache.c \
13@@ -133,7 +132,6 @@
14 camel-store-summary.h \
15 camel-store.h \
16 camel-tcp-stream-raw.h \
17- camel-tcp-stream-ssl.h \
18 camel-tcp-stream.h \
19 camel-transport.h \
20 camel-uid-cache.h \
21Index: git/camel/camel.h
22===================================================================
23--- git.orig/camel/camel.h 2010-02-05 15:26:30.000000000 +0000
24+++ git/camel/camel.h 2010-02-05 15:26:52.000000000 +0000
25@@ -122,7 +122,6 @@
26 #include <camel/camel-string-utils.h>
27 #include <camel/camel-tcp-stream.h>
28 #include <camel/camel-tcp-stream-raw.h>
29-#include <camel/camel-tcp-stream-ssl.h>
30 #include <camel/camel-text-index.h>
31 #include <camel/camel-transport.h>
32 #include <camel/camel-trie.h>
33Index: git/camel/providers/imap/camel-imap-store.c
34===================================================================
35--- git.orig/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:19.000000000 +0000
36+++ git/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:38.000000000 +0000
37@@ -51,7 +51,6 @@
38 #include "camel/camel-stream.h"
39 #include "camel/camel-string-utils.h"
40 #include "camel/camel-tcp-stream-raw.h"
41-#include "camel/camel-tcp-stream-ssl.h"
42 #include "camel/camel-url.h"
43 #include "camel/camel-utf8.h"
44
45Index: git/configure.ac
46===================================================================
47--- git.orig/configure.ac 2010-02-05 15:31:59.000000000 +0000
48+++ git/configure.ac 2010-02-05 15:33:00.000000000 +0000
49@@ -1272,7 +1272,8 @@
50 dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
51 dnl libical is fixed, we have to work-around the buggy CFlags.
52 dnl *****
53- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
54+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
55+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
56 LIBICAL_EXTRA_LIBS=""
57 AC_SUBST(LIBICAL_EXTRA_CFLAGS)
58 AC_SUBST(LIBICAL_EXTRA_LIBS)
59Index: git/calendar/libecal/libecal.pc.in
60===================================================================
61--- git.orig/calendar/libecal/libecal.pc.in 2010-02-05 15:39:41.000000000 +0000
62+++ git/calendar/libecal/libecal.pc.in 2010-02-05 15:39:55.000000000 +0000
63@@ -12,4 +12,4 @@
64 Version: @VERSION@
65 Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 dbus-glib-1
66 Libs: -L${libdir} -lecal-1.2
67-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
68+Cflags: -I${privincludedir}
diff --git a/meta/recipes-sato/eds/eds-dbus/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
new file mode 100644
index 0000000000..fdd7e4bdfb
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
@@ -0,0 +1,134 @@
1Index: addressbook/libedata-book/ximian-vcard.h
2===================================================================
3--- addressbook/libedata-book/ximian-vcard.h.orig 2010-02-05 14:57:14.000000000 +0000
4+++ addressbook/libedata-book/ximian-vcard.h 2010-02-05 14:58:14.000000000 +0000
5@@ -1,80 +1,40 @@
6 #define XIMIAN_VCARD \
7 "BEGIN:VCARD\n" \
8-"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \
9-"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \
10-"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \
11-"TEL;WORK;VOICE:(617) 613-2000\n" \
12-"TEL;WORK;FAX:(617) 613-2001\n" \
13-"EMAIL;INTERNET:hello@ximian.com\n" \
14-"URL:http://www.ximian.com/\n" \
15-"ORG:Novell;Ximian Group\n" \
16-"PHOTO;ENCODING=b;TYPE=JPEG:/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\n" \
17-" IFRoZSBHSU1Q/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCM\n" \
18-" cHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMj\n" \
19-" IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAbgBkAwEiAAIRAQMRAf/EA\n" \
20-" BwAAAIDAQEBAQAAAAAAAAAAAAAHBQYIBAMBAv/EAEYQAAEDAwEFBgMEBgQPAAAAAAECAwQABREG\n" \
21-" BxIhMWETIkFRcYEUkaEIMkLBFSNSsbLRFmJydRgkMzY3Q0RGgpKTosLh8P/EABsBAQACAwEBAAA\n" \
22-" AAAAAAAAAAAAEBQIDBgEH/8QALREAAQMCAwYGAgMAAAAAAAAAAQACAwQREiFRBRMiMUFhMnGBkb\n" \
23-" HRBsEUofD/2gAMAwEAAhEDEQA/AH/RRRREVwXe9W2wwFzbpNZixkc1uqwPQeZ6CoHXevLfom1ds\n" \
24-" 9h6a6D8PGCsFZHMk+CR4n86yzdbrqfaZqYBSnp0hRPZMoG62ynoOSR1Pua8Lg0XPJegX5Jv6k+0\n" \
25-" bBjrWxp22LlkcBIlHs0HqEjiR64peT9umupqyWrhHhpP4WI6eHureNW7Tmw+DGaTI1FJVJdxksM\n" \
26-" qKG09CrmfbFMCHpCw2xATDs8JrH4gykq+Z4mqifbMUZsxpd/QUllK53M2SCb2xa+bXvf0gcV0Uw\n" \
27-" 0R/DVktH2hdUwlpFxjQrg1490tLPuOH0pvv2qE4jdchx1p8lNAj91Va87OtM3RCt+2Nx3Dyci/q\n" \
28-" yPYcD7g1EZ+RR4rSMI9b/S2mhdbhKsmkdtWmNTuNxnXVW2cvgGZRASo+SV8j74PSmOlQUMpORWP\n" \
29-" NU7MrjY0rlQFmdDTxOE4cQOo8R1Hyqe2Z7ZJ2m32bXfHnJVpJCUuqO8uP7+Kenh4eVXkFRFUMxx\n" \
30-" G4UOSN0Zs4LU1FeEOWxOityYzqHWXEhSFoOQoHkQa963rBFFFFERUdfr1E09Y5d1mr3Y8ZsrV5n\n" \
31-" yA6k4A6mpGkL9ojUym0W/TrLmAsGU+AeYBwgfPJ/4RREqrrcb1tJ1oUpBXLmObqUZ7rSByT0SkZ\n" \
32-" J8zk1pHQmiLXo+zpbabC3SAp55Q7zyvM9PIUudiGmURbS7fpCMvzFFton8LSTxx6qH0FM7VV9VY\n" \
33-" 9MzZ7aQt5tASw3+26ohKB/zEVSVFVvZzGMw02tqe/kpbI8LMR6/C/Xxq9QagfbbP+IW1QQ4Rycf\n" \
34-" xncHRAIJ/rEfsmu2a9Fgsl2XIZjtj8bqwgfM1+9L2VFksESAV9o6hG886ebjqjvLWepUSarutdn\n" \
35-" MXV+obRcZks/CwCQ5DKMpeBOTxzwzgA9KwfTtfxPOSB5GQUXc9pOjoC+zXe2HV5xiOC6PmkEfWp\n" \
36-" xe6tAWghSVDIIOQRXxekNOx4b0WPZYLLTram19mwlJKSMHjjNUzQd2dZM7SNxczcLOsttqVzdYz\n" \
37-" 3FewI9iKpK2mjMZdFe7ed9NfT9qZDI4OAd1Vkko50ndoui22kuXq2NBOO9JZSOH9sD9/z86c8gc\n" \
38-" DUJNQlaFJUkKSoYII4EVGoKp9PIHt9e6lyRNlZhcqlsJ2guQpydL3F4mO7kw1KP3Fcyj0PEjrnz\n" \
39-" rSAIIyOVYfvsJ3TGqlCKpTfYuJfjLHMDOR8jw9q2Foy+o1FpWBckY/XMpUoeRxxHsciu/jeJGB7\n" \
40-" eRXPvaWuLT0U/RRRWaxQeVY82x3BVw2oXbJyhgoZR0AQM/UmthK+6fSsWbRQW9pV73x/tZPtwNE\n" \
41-" Wj9Nw0WuwwIKQAGI6G/cAZ+tRW0lx5nTEW4Ntqdat9xjy5CEjJLSFZP5H2qaYdCkpUk5BGQa7Ap\n" \
42-" DrSm3EpWhYKVJUMgg8wRXz+kqyyTG7VXUsV22Clrfc48+CzMiPIejvIC23EHIUDXNe79b7HbXbh\n" \
43-" c5SI8ZvmtZ5nyA5k9BS7d0nfdMPuSdD3JtEZaitdom5Uznx3DzT6cPWkvq/V1611fGW5nZtBCgy\n" \
44-" zFbXhtCycE5JxknxPhXR07RUeB3D11H+9lAfwcxmrrqLbxcHpikWGAw1FScByUkqWvrgEBPpxqi\n" \
45-" ztdXWdqmNqIIjx7gykJUphJCXAM/eBJ5g4PQCmBZNiDKWEu364uF0jJYh4AT6qUDn2FVu6bPIkT\n" \
46-" aTB08xKeMOU2H99eCtKRvZGQMZ7hwceNZxVGzsbmMzIBv5dfNeOjnsCdUwbTtKsV8nJgIccZkqw\n" \
47-" lJcThDqvJJz8s4zUtLVzpc2vZZKt+qBIkyUKt0V0ONKSe+7g5SCPDr9Kv0tznXP1cNMyQfxnXBC\n" \
48-" tqUyuB3gslftPjJLkGWB3u82o/Ij86bf2e7iqRoxyIpWfhpC0JHQ4V/5GlVtJcBt0RPiXif+00w\n" \
49-" Ps5BQtNxP4TJP8Ka6rZZJpW37/Kq68ATlPeiiirBQ0HlWR9t9qVbtpEp/dwiY0h5J8Mgbp/h+ta\n" \
50-" 4pM7fdKLumn2rxGbKn4BKl4HEtn73ywD7GiL7o28JuulLbKCsqLKUL/tJ7p+oqyIe4c6RGyzU4g\n" \
51-" THLNJc3WpCt9gk8A54j3GPcdaZuoosy82V23QpaYpkEIdeIJKUeIAHieXPkTXA11DuassJsCefY\n" \
52-" /SvYZN5FiGZU9edRwLDAXJny2mRukoStQBWQOQHjSjg7PYE7ZmzcZb7cG6KK5CZD6txOCcJQvPg\n" \
53-" QAQfAn2q6RNOWi1D9J3R5dwlR2xmZPVv9mlI8ByTj59ar09Lm0jUIQl5Y0zAUMrQSPiXfHHpyz4\n" \
54-" D1qTRvMQIieQAQXOtllfIDre/X2WqVmI8Qz6D9q0bP9SO37SrSpW8ZUVXw7q+YcKeSgeRyMZ65q\n" \
55-" qammvWTalEv1yjOJtaWfh25CBvBOUkHPlxUeHlyq/MiPCitxorSGWG07qG0DASK45xZlx3GJDaH\n" \
56-" WljCkLGQR6VGinY2ofIG8Lri2gOi37hxYG3zC+uT2HY6ZDbyFMrAUlwK7pB5HNRcp7nxqpzdN3G\n" \
57-" CFQ7NObTa3nApcaSN/suOe4SDw6VK3O4swojsp9WGmxk9fIDrW4UzWkbt2K/v691vjec8YtZUTa\n" \
58-" BL+IuMaIjiWWytXQn/wBD608tgtrVC0W2+tOFSFqd9icD6AVnmFFl6n1AhoAmRPdwcfgR4n2H7q\n" \
59-" 2Ppi1N2exRojaQlKEBIHkAK7Gmi3MTWaLn6iTeSF+qmaKKK3rSiuedEanQ3I7qQpC0kEEZzXRRR\n" \
60-" FjnaRoSVoq/KcYQv9HOr3mHB/qzz3SenhVi0ftAbnNNwLo6G5iQEodUcJd9fJX760ZqLTkHUdsd\n" \
61-" hTWEOtuJwQoVl/XGyS7aakOPwGnJcDORujK0DqPH2qJV0cdUzC/0Oi3QTuhddqY84IuFukwnFFK\n" \
62-" JDSmlEcwFDGR86ISI1tgtQ4jYaYaTuoSP/udJS1azvFoAZLnbsp4dm/klPQHmKs0faVEWkfEw32\n" \
63-" 1f1CFj8q56XZNSwYG5t7fSt46yB5ucimM5L4c643pXWqU5tCteMpRKUfIIH86ipmvnnAUwoQSf2\n" \
64-" 3lZ+g/nWEey5yfCtrquBo8Su0+4sQ46pEp1LTSeZUfoPOlnfr67fZKQlK0QkK/VtficV5nrXOkX\n" \
65-" XUk9KQHp0gnghI7qPyAp1bOdkCmH2rneQHHxxQjHdb9OvWr2j2c2Didm74VZVVplGFuQXRsc2fO\n" \
66-" Qgb1cmsSXQN1JH+TT4D+dPEAAADkK848duMylppISkDGBXrVkoCKKKKIiiqrrbX9m0JARIua1re\n" \
67-" dJDMdoArcI58+AA8zVLsO26RqiS9Gsukpct5lHaKbTLaSrd8wFEZ9s0RN6vGRGZktlDqAoHzFKq\n" \
68-" JtomzrPOuzGjZvwEBRTJfckttpbUOae9jJ5cBk8R514Wrbo7e489+3aTlvtQGTIkqElsdm2Mkq4\n" \
69-" 4zyPKiKf1Hsj09flKdXEQh4/jR3VfMUvJ/2et1ZMOe8keSgFfyqz2LbfJ1M9IZs2kJsx2O0XnEN\n" \
70-" yEAhA4ZwcZ58hxr7ZdtkvUS5SbTo2fJMRsuPkPoSG0jzKsDPPhz4HyoipDewC47+FXFWOjYH51Y\n" \
71-" bTsAgtrSqc88/jwWrA+QxUlYtujupZ6oNo0nLlSUtqdKEyW04SMZOVYHiKjP8ACUt5/wB3pX/XT\n" \
72-" /KiJnWLQ1nsTSURorad39lIFWZKUoThIAHSlNqDbLP0siKu96MnQ0ygSyVyGzvYxnlnB4jga87F\n" \
73-" ttlamXJbs2j50xcZvtXUtyEZCfPB5+gyaIm9RSetm3J68RbhJgaSmPM25vtZaviW09knjxIOM8j\n" \
74-" y8q7LHtzstwv/AOhrlBftkkudkFOLS43v5xgqSeHHx5daImrRX5QtK0hSTkGiiLMP2ho8wa1iSn\n" \
75-" QoxVRQ20fAKClFQ9eIqq7LLJe7vreG7ZZCoZhqD8iZjustjnnwORkY8c+Wa1ZqbStt1PBMa4MId\n" \
76-" Rz7wzg+dL8bEbA1vpa7RtK+CkpdWAfXjRFB7UpCNe6Kdm6NnJft1qluKuUJlvdKznPbYH3hzPXJ\n" \
77-" PMGqZsk/zc2gf3G5/Cumc3sRsTO92Rcb3uB3XVjP1r4jYfYGwoN76QsYUEurGR5HjREudhUt2BP\n" \
78-" 1TMYID0eyuuoJGRvJII+oq96I2iwtVz7rb7ZZWbalyzyJ9wKUjLsrKEkjH4cE8+Jz049bew+wNb\n" \
79-" 3Z76N4YO66sZHlzob2H2Bkktb6CRglLqxkeXOiJZbAv9IMj+7X/wB6ag9lGnEaj17CRJA+BhZmy\n" \
80-" lK+6EI44PQq3R6E06W9h9gZVvNb6FYxlLqwcfOhvYhYWt7s99G8MK3XVjI68aIo7UxgbR9IajhQ\n" \
81-" 7/Du9yiSF3S3tMNrStlkAAt94DPDI4eJFUvYfNetqNYz4xAfjWZx5skZAUnJHD1FMVrYhYWVbzW\n" \
82-" +2ojGUOrBx86EbD7A0FBvfRvDCt11YyPI8aIo23zdP6i2e621TaUJiXCfa1IucFPJt5KVnfHRWS\n" \
83-" euPPNZ2YadfkNsspUp1aglCU8yTyrTSNh9gbCgjfSFjCgl1YyPI8al9PbItP2WamUywkuJ5KOVE\n" \
84-" emeVEVw02ZH9H4YkEqdDYCifE4oqXbaS02lCRhIGBRRF//Z\n" \
85+"VERSION:3.0\n" \
86+"FN:OpenedHand Ltd\n" \
87+"URL:http://www.o-hand.com/\n" \
88+"EMAIL:info@openedhand.com\n" \
89+"TEL;TYPE=VOICE:+44 208 819 6559\n" \
90+"ADR;TYPE=WORK:;216 - 218 Homesdale Road;Unit R\, Homesdale Business Center;\n" \
91+" Bromley;;BR1 2QZ;United Kingdom\n" \
92+"LABEL:Unit R, Homesdale Business Center\\n216 - 218 Homesdale Road\\nBromley\\nBR1 2QZ\\nUnited Kingdom\n" \
93+"PHOTO;ENCODING=b:iVBORw0KGgoAAAANSUhEUgAAAC0AAAA\n" \
94+" wCAYAAACFUvPfAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOCwAADgsBOfdp+wAAABl0RVh\n" \
95+" 0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAVWSURBVGiB7ZltiBVVGMd/c93d1DQ\n" \
96+" lStMSBHsRj2/ZelY0lbCIIrQgg8pKqI4gKEkSabZiUhlSmpYvxxKxVxSL9KMf1qRSZ0UTPRm\n" \
97+" KWIoviCSo2/qy3tOHmdXZufN69yp98P/l3pnzf/7P/56Ze84zzzjWWqQWI4AFwDDgKLASWOo\n" \
98+" qYwlAajHS5w1N4Y0BPgQGAUeAz11llhNCiPc3sMRVZlWYF0ZBalEH/AKMBboCA4BPgfdDCeq\n" \
99+" ArcDoEO+9CCMNwEifJ4BlUov6FN5AQEst3kk17f/SDhFjb0ktegWO43hvSy3uCBwv8HXDeFd\n" \
100+" qcXvg+KMYXr3Uokua6eExYx3wbpdWxPGqWsekFoVQTJj3oM+rAR6K4dUAQ+Ite6aTflXXwPc\n" \
101+" kXrdAwlsy6HUGqjPmLUHU5fnf46bpG4Wbpm8UqiqkUye1qAJsKrMCqJTpNyqkkwmZbg+pRac\n" \
102+" K5auITqppqcWjwL5KJAO+lFrMJLocyIy022MOXsEThyPAQeAkcAq4DbgLuAcYDDghfidgITC\n" \
103+" 5DK9XkWY6yvAxYDXwg6vM73GBfrE1AXgJr5JL082MPH/Es3iV2SJXmeY0sqvMCWAFsEJqMd6\n" \
104+" P7V+WyxCyrtONwABXmQ+yGA7DVWYjXqG/NG9sFLKY/gYY4ypzrD2JXGVaXGWmA68Cl9ujlWZ\n" \
105+" 6E/Cyq8yF9iQJwlVmNTCtPRpJpvcBL7rKFNuTIAquMiuBkmfGrIgzbfFm+FxWoVpd2zln7hn\n" \
106+" AXzljgPjVY52rzO604LpVg56CKy9Y69QW4F6pB552HNtYtHZzlxM9P2uY29ASF+sqc1FqMQf\n" \
107+" 4Oq/puJmujzkPQK3u103qAWusLW6y1nkeuA9wwN5pLU86OIuaep3aIVeJtPX4W8BUwvROV5k\n" \
108+" D8YZrqwt03ALOKynaw7BO4/Dl/R+II/j9knXZrF5DlOkfkwIcmmfjNWsywHZyqjqsfW69k1R\n" \
109+" r/JRN6xqiTG+OI8tlg/o4kNpMaQOLPHxmwGtxw64ye4B/8khGmT4am7/6yiiSH/0j4cCYFMq\n" \
110+" RPHph05fxqrW49HENmzTENXBacTyPWAG4FDhuStpMHOvcnUc8gN4p42fziBXwauFWdJdadIx\n" \
111+" lO3ZPHvFrcexNYfRKGW+DAqWXJmE2bWMe8atRsCuFkusKFoAToXOxNW/V+XO/gnM4TwKgWCg\n" \
112+" Wv4sblFp0BvrkESxQOgtPx5F/m3G0ueCVltlbBZZPdkzZvy2B8RjJTcsSFChd3Mf7LdtIbFf\n" \
113+" 7GizMI4NxCw1nLl2ak0KbkG6zLQquMnuBQ4FzPYCJSUGNyszDKT4SiguiybFM36n+GHdw2sG\n" \
114+" LcTpSix7As7lN+5/rQ+fn+x2jWLiv7//51pp/B2LtWMc6b1rHWQt2PtYZX6Sl744pZqnFpl2\n" \
115+" NelJ60VFoNfYxMBWvBQBe1TYVWJIU3DD58AW89zBb8yaWWghA5Y0Df6ZdZU7j9SOCWCi1GF2\n" \
116+" OaBqkFt3xCrPcJQG03cYX0XbNrgE2SC36lW+vFP77lu/xrmZZcGzgtvPfJ26h7RJ0GpjoKrO\n" \
117+" l3CQB/Z7ABmBUCnUBENx9zwO7XGWOl5j2hScBX4VEWoDZwGJXmbIe/6UW44A1eC2zclAEFgM\n" \
118+" zS0z7CeYA8yMCDwGzgA1Zn9KlFoPxZu6JMs2GEW3aTzYJ+ILo3eok3qa0ETgAnHSVOS+1qAZ\n" \
119+" 64s3m48AzpLwTLAN/xpr2jY/AuwfTSkuAZqAjpZ3SSuNsYofJVWY7cD8wF+/PkIROXH/DALs\n" \
120+" TZzoIf8udibfF972OppJwBXg4s+kgpBZD8KrBoXgFfG+8ZnpZm0UGNAE7gVmuMtv+A/CTlwt\n" \
121+" ArmsGAAAAAElFTkSuQmCC\n" \
122 "END:VCARD"
123Index: addressbook/backends/file/Makefile.am
124===================================================================
125--- addressbook/backends/file/Makefile.am.orig 2010-02-05 14:57:14.000000000 +0000
126+++ addressbook/backends/file/Makefile.am 2010-02-05 14:59:10.000000000 +0000
127@@ -2,6 +2,7 @@
128
129 libebookbackendfile_la_CPPFLAGS = \
130 $(AM_CPPFLAGS) \
131+ -DCREATE_DEFAULT_VCARD \
132 -DG_LOG_DOMAIN=\"libebookbackend\" \
133 -I$(top_srcdir) \
134 -I$(top_builddir) \
diff --git a/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
new file mode 100644
index 0000000000..128307a5f2
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
@@ -0,0 +1,62 @@
1Index: git/camel/providers/Makefile.am
2===================================================================
3--- git.orig/camel/providers/Makefile.am 2010-07-06 18:49:34.000000000 +0800
4+++ git/camel/providers/Makefile.am 2010-07-08 17:23:56.000000000 +0800
5@@ -6,6 +6,10 @@
6 IMAP4_DIR=imap4
7 endif
8
9+if ENABLE_IMAPX
10+IMAPX_DIR=imapx
11+endif
12+
13 if ENABLE_HULA
14 HULA_DIR=hula
15 endif
16@@ -15,6 +19,6 @@
17 SENDMAIL_DIR=sendmail
18 endif
19
20-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap imapx $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR)
21+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAPX_DIR) $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR)
22
23 -include $(top_srcdir)/git.mk
24Index: git/configure.ac
25===================================================================
26--- git.orig/configure.ac 2010-07-08 17:24:36.000000000 +0800
27+++ git/configure.ac 2010-07-08 17:32:06.000000000 +0800
28@@ -1002,6 +1002,26 @@
29 AM_CONDITIONAL(ENABLE_IMAP4, [test x$enable_imap4 = xyes])
30
31 dnl ******************************
32+dnl IMAPX code support.
33+dnl ******************************
34+AC_ARG_ENABLE(imapx,
35+ AS_HELP_STRING([--enable-imapx=no/yes],
36+ [Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation]),
37+ [],[enable_imapx=no])
38+
39+if test "x$enable_imapx" = "xyes"; then
40+ AC_DEFINE(ENABLE_IMAPX,1,[Really don't try this at home])
41+ AC_PATH_PROG(GPERF, gperf)
42+ if test -z "$GPERF" ; then
43+ AC_MSG_ERROR([You need gperf to compile imapx provider])
44+ fi
45+ msg_imapx=yes
46+else
47+ msg_imapx=no
48+fi
49+AM_CONDITIONAL(ENABLE_IMAPX, [test x$enable_imapx = xyes])
50+
51+dnl ******************************
52 dnl Hula support
53 dnl ******************************
54 AC_ARG_ENABLE([hula],
55@@ -1541,3 +1561,7 @@
56 if test "x$msg_hula" = "xyes"; then
57 echo "Hula support: $msg_hula"
58 fi
59+
60+if test "x$msg_imapx" = "xyes"; then
61+ echo "IMAPX support: $msg_imapx"
62+fi
diff --git a/meta/recipes-sato/eds/eds-dbus/parallelmake.patch b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
new file mode 100644
index 0000000000..08cfac0d83
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
@@ -0,0 +1,201 @@
1Update git.mk to the version from Pango which has parallel make fixes.
2http://git.gnome.org/browse/pango/log/git.mk
3commit 6118d5891fee776a087855c335a73c79fdaf036c
4
5RP 16/3/10
6
7Index: git/git.mk
8===================================================================
9--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
10+++ git/git.mk 2010-03-16 11:30:23.000000000 +0000
11@@ -82,97 +82,106 @@
12 ### .gitignore generation
13
14 $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
15- @echo Generating $@; \
16- GTKDOCGITIGNOREFILES=; \
17- test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
18- GTKDOCGITIGNOREFILES=" \
19- $(DOC_MODULE)-decl-list.txt \
20- $(DOC_MODULE)-decl.txt \
21- tmpl/$(DOC_MODULE)-unused.sgml \
22- tmpl/*.bak \
23- xml html \
24- "; \
25- GNOMEDOCUTILSGITIGNOREFILES=; \
26- test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
27- GNOMEDOCUTILSGITIGNOREFILES=" \
28- $(_DOC_C_DOCS) \
29- $(_DOC_LC_DOCS) \
30- $(_DOC_OMF_ALL) \
31- $(_DOC_DSK_ALL) \
32- $(_DOC_HTML_ALL) \
33- $(_DOC_POFILES) \
34- */.xml2po.mo \
35- */*.omf.out \
36- "; \
37- INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
38- INTLTOOLGITIGNOREFILES=" \
39- po/Makefile.in.in \
40- po/Makefile.in \
41- po/Makefile \
42- po/*.gmo \
43- po/*.mo \
44- po/POTFILES \
45- po/stamp-it \
46- po/.intltool-merge-cache \
47- intltool-extract.in \
48- intltool-merge.in \
49- intltool-update.in \
50- "; \
51- AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
52- AUTOCONFGITIGNOREFILES=" \
53- autom4te.cache \
54- configure \
55- config.h \
56- stamp-h1 \
57- libtool \
58- config.lt \
59- "; \
60- for x in \
61- .gitignore \
62- $$GTKDOCGITIGNOREFILES \
63- $$GNOMEDOCUTILSGITIGNOREFILES \
64- $$INTLTOOLGITIGNOREFILES \
65- $$AUTOCONFGITIGNOREFILES \
66- $(GITIGNOREFILES) \
67- $(CLEANFILES) \
68- $(PROGRAMS) \
69- $(EXTRA_PROGRAMS) \
70- $(LTLIBRARIES) \
71- so_locations \
72- .libs _libs \
73- $(MOSTLYCLEANFILES) \
74- "*.$(OBJEXT)" \
75- "*.lo" \
76- $(DISTCLEANFILES) \
77- $(am__CONFIG_DISTCLEAN_FILES) \
78- $(CONFIG_CLEAN_FILES) \
79- TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
80- "*.tab.c" \
81- $(MAINTAINERCLEANFILES) \
82- $(BUILT_SOURCES) \
83- $(DEPDIR) \
84- Makefile \
85- Makefile.in \
86- "*.orig" \
87- "*.rej" \
88- "*.bak" \
89- "*~" \
90- ".*.sw[nop]" \
91- ; do echo /$$x; done | \
92+ $(AM_V_GEN) \
93+ { \
94+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
95+ for x in \
96+ $(DOC_MODULE)-decl-list.txt \
97+ $(DOC_MODULE)-decl.txt \
98+ tmpl/$(DOC_MODULE)-unused.sgml \
99+ "tmpl/*.bak" \
100+ xml html \
101+ ; do echo /$$x; done; \
102+ fi; \
103+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
104+ for x in \
105+ $(_DOC_C_DOCS) \
106+ $(_DOC_LC_DOCS) \
107+ $(_DOC_OMF_ALL) \
108+ $(_DOC_DSK_ALL) \
109+ $(_DOC_HTML_ALL) \
110+ $(_DOC_POFILES) \
111+ "*/.xml2po.mo" \
112+ "*/*.omf.out" \
113+ ; do echo /$$x; done; \
114+ fi; \
115+ if test -f $(srcdir)/po/Makefile.in.in; then \
116+ for x in \
117+ po/Makefile.in.in \
118+ po/Makefile.in \
119+ po/Makefile \
120+ po/POTFILES \
121+ po/stamp-it \
122+ po/.intltool-merge-cache \
123+ "po/*.gmo" \
124+ "po/*.mo" \
125+ po/$(GETTEXT_PACKAGE).pot \
126+ intltool-extract.in \
127+ intltool-merge.in \
128+ intltool-update.in \
129+ ; do echo /$$x; done; \
130+ fi; \
131+ if test -f $(srcdir)/configure; then \
132+ for x in \
133+ autom4te.cache \
134+ configure \
135+ config.h \
136+ stamp-h1 \
137+ libtool \
138+ config.lt \
139+ ; do echo /$$x; done; \
140+ fi; \
141+ for x in \
142+ .gitignore \
143+ $(GITIGNOREFILES) \
144+ $(CLEANFILES) \
145+ $(PROGRAMS) \
146+ $(check_PROGRAMS) \
147+ $(EXTRA_PROGRAMS) \
148+ $(LTLIBRARIES) \
149+ so_locations \
150+ .libs _libs \
151+ $(MOSTLYCLEANFILES) \
152+ "*.$(OBJEXT)" \
153+ "*.lo" \
154+ $(DISTCLEANFILES) \
155+ $(am__CONFIG_DISTCLEAN_FILES) \
156+ $(CONFIG_CLEAN_FILES) \
157+ TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
158+ "*.tab.c" \
159+ $(MAINTAINERCLEANFILES) \
160+ $(BUILT_SOURCES) \
161+ $(DEPDIR) \
162+ Makefile \
163+ Makefile.in \
164+ "*.orig" \
165+ "*.rej" \
166+ "*.bak" \
167+ "*~" \
168+ ".*.sw[nop]" \
169+ ; do echo /$$x; done; \
170+ } | \
171 sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
172 sed 's@/[.]/@/@g' | \
173- LANG=C sort | uniq > $@.tmp && \
174+ LC_ALL=C sort | uniq > $@.tmp && \
175 mv $@.tmp $@;
176
177-all: $(srcdir)/.gitignore gitignore-recurse
178-gitignore-recurse:
179+all: $(srcdir)/.gitignore gitignore-recurse-maybe
180+gitignore-recurse-maybe:
181 @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
182- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
183- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
184- done; \
185+ $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
186 fi;
187+gitignore-recurse:
188+ @for subdir in $(DIST_SUBDIRS); do \
189+ case " $(SUBDIRS) " in \
190+ *" $$subdir "*) :;; \
191+ *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
192+ esac; \
193+ done
194+gitignore: $(srcdir)/.gitignore gitignore-recurse
195+
196 maintainer-clean: gitignore-clean
197 gitignore-clean:
198 -rm -f $(srcdir)/.gitignore
199-.PHONY: gitignore-clean gitignore-recurse
200
201+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb
new file mode 100644
index 0000000000..2cbc9037a9
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb
@@ -0,0 +1,90 @@
1DESCRIPTION = "Evolution database backend server"
2HOMEPAGE = "http://www.gnome.org/projects/evolution/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "LGPLv2 & LGPLv2+"
6
7DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade"
8
9PR = "r1"
10
11SRC_URI = "http://ftp.gnome.org/pub/GNOME/mobile/2.23/2.23.92/sources/evolution-data-server-dbus-${PV}.tar.gz \
12 file://oh-contact.patch;patch=1;pnum=0 \
13 file://no_iconv_test.patch;patch=1 \
14 file://iconv-detect.h"
15
16S = "${WORKDIR}/evolution-data-server-dbus-${PV}"
17
18inherit autotools pkgconfig
19
20# -ldb needs this on some platforms
21LDFLAGS += "-lpthread"
22
23do_configure_append () {
24 cp ${WORKDIR}/iconv-detect.h ${S}
25}
26
27EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
28 --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
29 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
30
31
32PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
33 libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
34 libedataserver libedataserver-dev \
35 libedataserverui libedataserverui-dev"
36
37FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
38FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \
39 ${libdir}/evolution-data-server*/extensions/.debug/"
40RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
41
42FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* \
43 ${libdir}/libcamel-provider-*.so.* \
44 ${libdir}/evolution-data-server-*/camel-providers/*.so \
45 ${libdir}/evolution-data-server-*/camel-providers/*.urls"
46FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
47 ${libdir}/pkgconfig/camel*pc \
48 ${includedir}/evolution-data-server*/camel"
49
50FILES_libebook = "${libdir}/libebook-*.so.*"
51FILES_libebook-dev = "${libdir}/libebook-1.2.so \
52 ${libdir}/pkgconfig/libebook-*.pc \
53 ${includedir}/evolution-data-server*/libebook/*.h"
54RRECOMMENDS_libebook = "libedata-book"
55
56FILES_libecal = "${libdir}/libecal-*.so.* \
57 ${datadir}/evolution-data-server-1.4/zoneinfo"
58
59FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
60 ${includedir}/evolution-data-server*/libecal/*.h \
61 ${includedir}/evolution-data-server*/libical/*.h"
62RRECOMMENDS_libecal = "libedata-cal tzdata"
63
64FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
65 ${datadir}/dbus-1/services/*.AddressBook.service \
66 ${libdir}/libedata-book-*.so.* \
67 ${libdir}/evolution-data-server-*/extensions/libebook*.so \
68 ${datadir}/evolution-data-server-1.4/weather/Locations.xml"
69FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
70 ${libdir}/pkgconfig/libedata-book-*.pc \
71 ${includedir}/evolution-data-server-*/libedata-book"
72
73FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
74 ${datadir}/dbus-1/services/*.Calendar.service \
75 ${libdir}/libedata-cal-*.so.* \
76 ${libdir}/evolution-data-server-*/extensions/libecal*.so"
77FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
78 ${libdir}/pkgconfig/libedata-cal-*.pc \
79 ${includedir}/evolution-data-server-*/libedata-cal"
80
81FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
82FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
83 ${libdir}/pkgconfig/libedataserver-*.pc \
84 ${includedir}/evolution-data-server-*/libedataserver/*.h"
85
86FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
87FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
88 ${libdir}/pkgconfig/libedataserverui-*.pc \
89 ${includedir}/evolution-data-server-*/libedataserverui/*.h"
90
diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb
new file mode 100644
index 0000000000..e11c91d5d7
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus_git.bb
@@ -0,0 +1,102 @@
1DESCRIPTION = "Evolution database backend server"
2HOMEPAGE = "http://www.gnome.org/projects/evolution/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "LGPLv2 & LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
7 file://camel/camel.h;endline=24;md5=b02175c88f821224746b347a89731a2b \
8 file://libedataserver/e-data-server-util.h;endline=23;md5=9df8127bd8cfdc5469e938fc710d1f40 \
9 file://calendar/libecal/e-cal.h;endline=24;md5=5d496b9b6fd2a4fdbbfc31ef9455c9d0"
10
11DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup-2.4 libglade libical gnome-keyring gperf-native"
12
13PV = "2.30+git${SRCPV}"
14PR = "r0"
15
16SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
17 file://oh-contact.patch;patch=1;pnum=0 \
18 file://nossl.patch;patch=1 \
19 file://optional_imapx_provider.patch;patch=1 \
20 file://iconv-detect.h"
21
22S = "${WORKDIR}/git"
23
24inherit autotools pkgconfig
25
26# -ldb needs this on some platforms
27LDFLAGS += "-lpthread"
28
29# Parallel make shows many issues with this source code.
30# Current problems seem to be duplicate execution of the calander/backends
31# directories by make resulting in truncated/corrupt .la files
32PARALLEL_MAKE = ""
33
34do_configure_prepend () {
35 echo "EXTRA_DIST = " > ${S}/gtk-doc.make
36}
37
38do_configure_append () {
39 cp ${WORKDIR}/iconv-detect.h ${S}
40}
41
42EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
43 --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
44 --disable-smime --disable-ssl --disable-nntp --disable-gtk-doc --without-weather"
45
46PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
47 libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
48 libedataserver libedataserver-dev \
49 libedataserverui libedataserverui-dev"
50
51FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
52FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \
53 ${libdir}/evolution-data-server*/extensions/.debug/"
54RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
55
56FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* \
57 ${libdir}/libcamel-provider-*.so.* \
58 ${libdir}/evolution-data-server-*/camel-providers/*.so \
59 ${libdir}/evolution-data-server-*/camel-providers/*.urls"
60FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
61 ${libdir}/pkgconfig/camel*pc \
62 ${includedir}/evolution-data-server*/camel"
63
64FILES_libebook = "${libdir}/libebook-*.so.*"
65FILES_libebook-dev = "${libdir}/libebook-1.2.so \
66 ${libdir}/pkgconfig/libebook-*.pc \
67 ${includedir}/evolution-data-server*/libebook/*.h"
68RRECOMMENDS_libebook = "libedata-book"
69
70FILES_libecal = "${libdir}/libecal-*.so.* \
71 ${datadir}/evolution-data-server-1.4/zoneinfo"
72FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
73 ${includedir}/evolution-data-server*/libecal/*.h \
74 ${includedir}/evolution-data-server*/libical/*.h"
75RRECOMMENDS_libecal = "libedata-cal tzdata"
76
77FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
78 ${datadir}/dbus-1/services/*.AddressBook.service \
79 ${libdir}/libedata-book-*.so.* \
80 ${libdir}/evolution-data-server-*/extensions/libebook*.so"
81FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
82 ${libdir}/pkgconfig/libedata-book-*.pc \
83 ${includedir}/evolution-data-server-*/libedata-book"
84
85FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
86 ${datadir}/dbus-1/services/*.Calendar.service \
87 ${libdir}/libedata-cal-*.so.* \
88 ${libdir}/evolution-data-server-*/extensions/libecal*.so"
89FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
90 ${libdir}/pkgconfig/libedata-cal-*.pc \
91 ${includedir}/evolution-data-server-*/libedata-cal"
92
93FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
94FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
95 ${libdir}/pkgconfig/libedataserver-*.pc \
96 ${includedir}/evolution-data-server-*/libedataserver/*.h"
97
98FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
99FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
100 ${libdir}/pkgconfig/libedataserverui-*.pc \
101 ${includedir}/evolution-data-server-*/libedataserverui/*.h"
102
diff --git a/meta/recipes-sato/eds/eds-tools_bzr.bb b/meta/recipes-sato/eds/eds-tools_bzr.bb
new file mode 100644
index 0000000000..85e1c4b7c4
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-tools_bzr.bb
@@ -0,0 +1,13 @@
1LICENSE = "GPL"
2SECTION = "x11"
3DEPENDS = "dbus-glib eds-dbus"
4RDEPENDS = "libedata-book"
5DESCRIPTION = "Test applications for EDS"
6
7SRC_URI = "bzr://burtonini.com/bzr/${PN};proto=http"
8
9inherit autotools pkgconfig
10
11S = "${WORKDIR}/${PN}"
12
13FILES_${PN} += "${libdir}/evolution-data-server-1.2/extensions/*.so"
diff --git a/meta/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml b/meta/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml
new file mode 100644
index 0000000000..3ddf5147df
--- /dev/null
+++ b/meta/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml
@@ -0,0 +1,12 @@
1<ui>
2 <menubar name="MenuBar">
3 <menu name="TopMenu" action="Top">
4 <menu action="FileMenu">
5 <placeholder name="PrintPlaceHolder">
6 <separator/>
7 <menuitem name="Print" action="Print"/>
8 </placeholder>
9 </menu>
10 </menu>
11 </menubar>
12</ui>
diff --git a/meta/recipes-sato/epdfview/epdfview/epdfview-ui.xml b/meta/recipes-sato/epdfview/epdfview/epdfview-ui.xml
new file mode 100644
index 0000000000..602d86f903
--- /dev/null
+++ b/meta/recipes-sato/epdfview/epdfview/epdfview-ui.xml
@@ -0,0 +1,57 @@
1<ui>
2 <menubar name="MenuBar">
3 <menu name="TopMenu" action="Top">
4 <menu action="FileMenu">
5 <menuitem name="OpenFile" action="OpenFile"/>
6 <menuitem name="ReloadFile" action="ReloadFile"/>
7 <menuitem name="SaveFile" action="SaveFile"/>
8 <placeholder name="PrintPlaceHolder"/>
9 <separator/>
10 <menuitem name="Quit" action="Quit"/>
11 </menu>
12 <menu action="EditMenu">
13 <menuitem name="Find" action="Find"/>
14 <separator />
15 <menuitem name="Preferences" action="Preferences"/>
16 </menu>
17 <menu action="ViewMenu">
18 <menuitem name="ShowToolBar" action="ShowToolBar"/>
19 <menuitem name="ShowStatusBar" action="ShowStatusBar"/>
20 <menuitem name="ShowIndex" action="ShowIndex"/>
21 <separator/>
22 <menuitem name="ZoomIn" action="ZoomIn"/>
23 <menuitem name="ZoomOut" action="ZoomOut"/>
24 <menuitem name="ZoomFit" action="ZoomFit"/>
25 <menuitem name="ZoomWidth" action="ZoomWidth"/>
26 <separator />
27 <menuitem name="FullScreen" action="FullScreen"/>
28 <separator />
29 <menuitem name="RotateRight" action="RotateRight"/>
30 <menuitem name="RotateLeft" action="RotateLeft"/>
31 </menu>
32 <menu action="GoMenu">
33 <menuitem name="GoToFirstPage" action="GoToFirstPage"/>
34 <menuitem name="GoToPreviousPage" action="GoToPreviousPage"/>
35 <menuitem name="GoToNextPage" action="GoToNextPage"/>
36 <menuitem name="GoToLastPage" action="GoToLastPage"/>
37 </menu>
38 <menu action="HelpMenu">
39 <menuitem name="About" action="About"/>
40 </menu>
41 </menu>
42 </menubar>
43
44 <toolbar name="ToolBar">
45 <toolitem name="OpenFile" action="OpenFile"/>
46 <separator/>
47 <toolitem name="GoToPreviousPage" action="GoToPreviousPage"/>
48 <toolitem name="GoToNextPage" action="GoToNextPage"/>
49 <separator/>
50 <toolitem name="ZoomIn" action="ZoomIn"/>
51 <toolitem name="ZoomOut" action="ZoomOut"/>
52 <toolitem name="ZoomFit" action="ZoomFit"/>
53 <toolitem name="ZoomWidth" action="ZoomWidth"/>
54 </toolbar>
55
56 <accelerator name="SlashAccelerator" action="Slash"/>
57</ui>
diff --git a/meta/recipes-sato/epdfview/epdfview/epdfview.desktop b/meta/recipes-sato/epdfview/epdfview/epdfview.desktop
new file mode 100644
index 0000000000..d3bf06d2aa
--- /dev/null
+++ b/meta/recipes-sato/epdfview/epdfview/epdfview.desktop
@@ -0,0 +1,10 @@
1[Desktop Entry]
2Categories=Viewer;Office;GTK;
3Comment=Lightweight PDF document viewer
4Exec=epdfview %f
5GenericName=PDF Viewer
6Icon=accessories-text-editor
7Name=PDF Viewer
8MimeType=application/pdf;
9Terminal=false
10Type=Application
diff --git a/meta/recipes-sato/epdfview/epdfview/owl-menus.patch b/meta/recipes-sato/epdfview/epdfview/owl-menus.patch
new file mode 100644
index 0000000000..755b71e7a4
--- /dev/null
+++ b/meta/recipes-sato/epdfview/epdfview/owl-menus.patch
@@ -0,0 +1,325 @@
1Index: epdfview-0.1.7/src/Makefile.am
2===================================================================
3--- epdfview-0.1.7.orig/src/Makefile.am 2010-07-13 12:30:44.014172385 +0100
4+++ epdfview-0.1.7/src/Makefile.am 2010-07-13 12:30:48.780063260 +0100
5@@ -58,7 +58,7 @@
6 main.cxx
7
8 libshell_cxxflags = -I$(top_srcdir)/src/gtk $(GTK2_CFLAGS)
9-libshell_ldadd = $(GTK2_LIBS) $(top_builddir)/src/gtk/libshell-gtk.a
10+libshell_ldadd = $(GTK2_LIBS) $(top_builddir)/src/gtk/libshell-gtk.a -lowl
11
12 epdfview_CXXFLAGS = \
13 -DLOCALEDIR='"$(datadir)/locale"' \
14Index: epdfview-0.1.7/src/gtk/MainView.cxx
15===================================================================
16--- epdfview-0.1.7.orig/src/gtk/MainView.cxx 2010-07-13 12:30:44.014172385 +0100
17+++ epdfview-0.1.7/src/gtk/MainView.cxx 2010-07-13 12:30:48.782124540 +0100
18@@ -20,6 +20,7 @@
19 #include <string.h>
20 #include <gettext.h>
21 #include <gtk/gtk.h>
22+#include <libowl/owlwindowmenu.h>
23 #include <epdfview.h>
24 #include "StockIcons.h"
25 #include "FindView.h"
26@@ -86,6 +87,7 @@
27 // The actions for menus and toolbars.
28 static const GtkActionEntry g_NormalEntries[] =
29 {
30+ { "Top", NULL, "", NULL, NULL, NULL },
31 { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL },
32 { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL },
33 { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL },
34@@ -100,7 +102,7 @@
35 N_("Reload the current document"),
36 G_CALLBACK (main_window_reload_cb) },
37
38- { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>S",
39+ { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>W",
40 N_("Save a copy of the current document"),
41 G_CALLBACK (main_window_save_file_cb) },
42
43@@ -110,11 +112,11 @@
44 G_CALLBACK (main_window_print_cb) },
45 #endif // HAVE_CUPS
46
47- { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
48+ { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>Q",
49 N_("Close this window"),
50 G_CALLBACK (main_window_quit_cb) },
51
52- { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>F",
53+ { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>S",
54 N_("Find a word in the document"),
55 G_CALLBACK (main_window_find_cb) },
56
57@@ -138,19 +140,19 @@
58 N_("Rotate the document 90 degrees counter-clockwise"),
59 G_CALLBACK (main_window_rotate_left_cb) },
60
61- { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
62+ { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>1",
63 N_("Go to the first page"),
64 G_CALLBACK (main_window_go_to_first_page_cb) },
65
66- { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down",
67+ { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Down",
68 N_("Go to the next page"),
69 G_CALLBACK (main_window_go_to_next_page_cb) },
70
71- { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up",
72+ { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Up",
73 N_("Go to the previous page"),
74 G_CALLBACK (main_window_go_to_previous_page_cb) },
75
76- { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>End",
77+ { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>0",
78 N_("Go to the last page"),
79 G_CALLBACK (main_window_go_to_last_page_cb) },
80
81@@ -172,7 +174,7 @@
82
83 static GtkToggleActionEntry g_ToggleEntries[] =
84 {
85- { "FullScreen", NULL, N_("F_ull screen"), "F11",
86+ { "FullScreen", NULL, N_("F_ull screen"), "<control>F",
87 N_("Toggle full screen window"),
88 G_CALLBACK (main_window_fullscreen_cb), FALSE },
89
90@@ -184,7 +186,7 @@
91 N_("Show or hide the statusbar"),
92 G_CALLBACK (main_window_show_statusbar_cb), TRUE },
93
94- { "ShowIndex", NULL, N_("Show I_ndex"), "F9",
95+ { "ShowIndex", NULL, N_("Show I_ndex"), "<control>I",
96 N_("Show or hide the document's outline"),
97 G_CALLBACK (main_window_show_index_cb), FALSE },
98
99@@ -234,9 +236,8 @@
100 GtkAccelGroup *accelGroup = gtk_ui_manager_get_accel_group (m_UIManager);
101 gtk_window_add_accel_group (GTK_WINDOW (m_MainWindow), accelGroup);
102 // Add the menu bar and tool bar.
103- GtkWidget *menuBar = gtk_ui_manager_get_widget (m_UIManager, "/MenuBar");
104- gtk_box_pack_start (GTK_BOX (m_MainBox), menuBar, FALSE, FALSE, 0);
105- gtk_widget_show (menuBar);
106+ owl_set_window_menu_item (GTK_WINDOW (m_MainWindow),
107+ GTK_MENU_ITEM(gtk_ui_manager_get_widget(m_UIManager, "/MenuBar/TopMenu")));
108 GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
109 gtk_box_pack_start (GTK_BOX (m_MainBox), toolBar, FALSE, FALSE, 0);
110 // Add the current page tool item.
111@@ -285,7 +286,7 @@
112 MainView::activeZoomFit (gboolean active)
113 {
114 GtkAction *zoomFit =
115- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit");
116+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomFit");
117 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomFit), active);
118 }
119
120@@ -293,7 +294,7 @@
121 MainView::activeZoomWidth (gboolean active)
122 {
123 GtkAction *zoomWidth =
124- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth");
125+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomWidth");
126 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active);
127 }
128
129@@ -484,7 +485,7 @@
130 MainView::sensitiveFind (gboolean sensitive)
131 {
132 GtkAction *find =
133- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/EditMenu/Find");
134+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/EditMenu/Find");
135 gtk_action_set_sensitive (find, sensitive);
136 }
137
138@@ -492,7 +493,7 @@
139 MainView::sensitiveGoToFirstPage (gboolean sensitive)
140 {
141 GtkAction *goToFirstPage = gtk_ui_manager_get_action (m_UIManager,
142- "/MenuBar/GoMenu/GoToFirstPage");
143+ "/MenuBar/TopMenu/GoMenu/GoToFirstPage");
144 gtk_action_set_sensitive (goToFirstPage, sensitive);
145 }
146
147@@ -500,7 +501,7 @@
148 MainView::sensitiveGoToLastPage (gboolean sensitive)
149 {
150 GtkAction *goToLastPage =
151- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToLastPage");
152+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/GoMenu/GoToLastPage");
153 gtk_action_set_sensitive (goToLastPage, sensitive);
154 }
155
156@@ -508,7 +509,7 @@
157 MainView::sensitiveGoToNextPage (gboolean sensitive)
158 {
159 GtkAction *goToNextPage =
160- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToNextPage");
161+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/GoMenu/GoToNextPage");
162 gtk_action_set_sensitive (goToNextPage, sensitive);
163 }
164
165@@ -522,7 +523,7 @@
166 MainView::sensitiveGoToPreviousPage (gboolean sensitive)
167 {
168 GtkAction *goToPreviousPage = gtk_ui_manager_get_action (m_UIManager,
169- "/MenuBar/GoMenu/GoToPreviousPage");
170+ "/MenuBar/TopMenu/GoMenu/GoToPreviousPage");
171 gtk_action_set_sensitive (goToPreviousPage, sensitive);
172 }
173
174@@ -530,7 +531,7 @@
175 MainView::sensitiveOpen (gboolean sensitive)
176 {
177 GtkAction *open =
178- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/OpenFile");
179+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/OpenFile");
180 gtk_action_set_sensitive (open, sensitive);
181 }
182
183@@ -539,7 +540,7 @@
184 MainView::sensitivePrint (gboolean sensitive)
185 {
186 GtkAction *print = gtk_ui_manager_get_action (m_UIManager,
187- "/MenuBar/FileMenu/PrintPlaceHolder/Print");
188+ "/MenuBar/TopMenu/FileMenu/PrintPlaceHolder/Print");
189 gtk_action_set_sensitive (print, sensitive);
190 }
191 #endif // HAVE_CUPS
192@@ -548,7 +549,7 @@
193 MainView::sensitiveReload (gboolean sensitive)
194 {
195 GtkAction *reload =
196- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/ReloadFile");
197+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/ReloadFile");
198 gtk_action_set_sensitive (reload, sensitive);
199 }
200
201@@ -556,7 +557,7 @@
202 MainView::sensitiveRotateLeft (gboolean sensitive)
203 {
204 GtkAction *rotateLeft =
205- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/RotateLeft");
206+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/RotateLeft");
207 gtk_action_set_sensitive (rotateLeft, sensitive);
208 }
209
210@@ -564,7 +565,7 @@
211 MainView::sensitiveRotateRight (gboolean sensitive)
212 {
213 GtkAction *rotateRight = gtk_ui_manager_get_action (m_UIManager,
214- "/MenuBar/ViewMenu/RotateRight");
215+ "/MenuBar/TopMenu/ViewMenu/RotateRight");
216 gtk_action_set_sensitive (rotateRight, sensitive);
217 }
218
219@@ -572,7 +573,7 @@
220 MainView::sensitiveSave (gboolean sensitive)
221 {
222 GtkAction *save =
223- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/SaveFile");
224+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/SaveFile");
225 gtk_action_set_sensitive (save, sensitive);
226 }
227
228@@ -586,7 +587,7 @@
229 MainView::sensitiveZoomIn (gboolean sensitive)
230 {
231 GtkAction *zoomIn =
232- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomIn");
233+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomIn");
234 gtk_action_set_sensitive (zoomIn, sensitive);
235 }
236
237@@ -594,7 +595,7 @@
238 MainView::sensitiveZoomOut (gboolean sensitive)
239 {
240 GtkAction *zoomOut =
241- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomOut");
242+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomOut");
243 gtk_action_set_sensitive (zoomOut, sensitive);
244 }
245
246@@ -602,7 +603,7 @@
247 MainView::sensitiveZoomFit (gboolean sensitive)
248 {
249 GtkAction *zoomFit =
250- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit");
251+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomFit");
252 gtk_action_set_sensitive (zoomFit, sensitive);
253 }
254
255@@ -610,7 +611,7 @@
256 MainView::sensitiveZoomWidth (gboolean sensitive)
257 {
258 GtkAction *zoomWidth =
259- gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth");
260+ gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomWidth");
261 gtk_action_set_sensitive (zoomWidth, sensitive);
262 }
263
264@@ -654,7 +655,7 @@
265 }
266 GtkAction *showIndex =
267 gtk_ui_manager_get_action (m_UIManager,
268- "/MenuBar/ViewMenu/ShowIndex");
269+ "/MenuBar/TopMenu/ViewMenu/ShowIndex");
270 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (showIndex), show);
271 }
272
273@@ -695,13 +696,13 @@
274 gtk_window_fullscreen (GTK_WINDOW (m_MainWindow));
275 // Hide the menu bar, tool bar, status bar and the index bar. Then
276 // zoom to fit.
277- gtk_widget_hide (menuBar);
278+// gtk_widget_hide (menuBar);
279 gtk_widget_hide (toolBar);
280 gtk_widget_hide (m_StatusBar);
281 gtk_widget_hide (m_Sidebar);
282 gtk_toggle_action_set_active (
283 GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
284- "/MenuBar/ViewMenu/ZoomFit")), TRUE);
285+ "/MenuBar/TopMenu/ViewMenu/ZoomFit")), TRUE);
286 }
287 else
288 {
289@@ -711,15 +712,15 @@
290 // enabled.
291 main_window_show_index_cb (
292 GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
293- "/MenuBar/ViewMenu/ShowIndex")),
294+ "/MenuBar/TopMenu/ViewMenu/ShowIndex")),
295 (gpointer)m_Pter);
296 main_window_show_statusbar_cb (
297 GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
298- "/MenuBar/ViewMenu/ShowStatusBar")),
299+ "/MenuBar/TopMenu/ViewMenu/ShowStatusBar")),
300 (gpointer)m_Pter);
301 main_window_show_toolbar_cb (
302 GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
303- "/MenuBar/ViewMenu/ShowToolBar")),
304+ "/MenuBar/TopMenu/ViewMenu/ShowToolBar")),
305 (gpointer)m_Pter);
306 }
307 }
308@@ -814,7 +815,7 @@
309 MainView::showStatusbar (gboolean show)
310 {
311 GtkAction *toggleAction = gtk_ui_manager_get_action (m_UIManager,
312- "/MenuBar/ViewMenu/ShowStatusBar");
313+ "/MenuBar/TopMenu/ViewMenu/ShowStatusBar");
314 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggleAction), show);
315 if ( show )
316 {
317@@ -830,7 +831,7 @@
318 MainView::showToolbar (gboolean show)
319 {
320 GtkAction *toggleAction = gtk_ui_manager_get_action (m_UIManager,
321- "/MenuBar/ViewMenu/ShowToolBar");
322+ "/MenuBar/TopMenu/ViewMenu/ShowToolBar");
323 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggleAction), show);
324 GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
325 if ( show )
diff --git a/meta/recipes-sato/epdfview/epdfview_0.1.6.bb b/meta/recipes-sato/epdfview/epdfview_0.1.6.bb
new file mode 100644
index 0000000000..a528474d9b
--- /dev/null
+++ b/meta/recipes-sato/epdfview/epdfview_0.1.6.bb
@@ -0,0 +1,21 @@
1DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
2HOMEPAGE = "http://trac.emma-soft.com/epdfview/"
3LICENSE = "GPLv2"
4SECTION = "x11/applications"
5DEPENDS = "poppler gtk+ libowl"
6PR="r0"
7
8SRC_URI = "http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \
9 file://owl-menus.patch \
10 file://epdfview.desktop \
11 file://epdfview-ui.xml \
12 file://epdfview-ui-print.xml"
13
14inherit autotools gettext
15
16do_install_prepend() {
17 install ${WORKDIR}/epdfview-ui.xml ${S}/data/epdfview-ui.xml
18 install ${WORKDIR}/epdfview-ui-print.xml ${S}/data/epdfview-ui-print.xml
19 install ${WORKDIR}/epdfview.desktop ${S}/data/epdfview.desktop
20}
21
diff --git a/meta/recipes-sato/epdfview/epdfview_0.1.7.bb b/meta/recipes-sato/epdfview/epdfview_0.1.7.bb
new file mode 100644
index 0000000000..34e08bd140
--- /dev/null
+++ b/meta/recipes-sato/epdfview/epdfview_0.1.7.bb
@@ -0,0 +1,21 @@
1DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
2HOMEPAGE = "http://trac.emma-soft.com/epdfview/"
3LICENSE = "GPLv2"
4SECTION = "x11/applications"
5DEPENDS = "poppler gtk+"
6PR="r0"
7
8SRC_URI = "http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \
9 file://owl-menus.patch;patch=1 \
10 file://epdfview.desktop \
11 file://epdfview-ui.xml \
12 file://epdfview-ui-print.xml"
13
14inherit autotools gettext
15
16do_install_prepend() {
17 install ${WORKDIR}/epdfview-ui.xml ${S}/data/epdfview-ui.xml
18 install ${WORKDIR}/epdfview-ui-print.xml ${S}/data/epdfview-ui-print.xml
19 install ${WORKDIR}/epdfview.desktop ${S}/data/epdfview.desktop
20}
21
diff --git a/meta/recipes-sato/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_svn.bb
new file mode 100644
index 0000000000..a9a0b05552
--- /dev/null
+++ b/meta/recipes-sato/gaku/gaku_svn.bb
@@ -0,0 +1,26 @@
1DESCRIPTION = "Music player"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
4 file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a"
5DEPENDS = "gtk+ gstreamer libowl-av"
6
7RDEPENDS = "gst-plugins-base-audioconvert \
8 gst-plugins-base-audioresample \
9 gst-plugins-base-typefindfunctions \
10 gst-plugins-base-playbin"
11
12RRECOMMENDS = "gst-plugins-ugly-mad \
13 gst-plugins-good-id3demux \
14 gst-plugins-base-vorbis \
15 gst-plugins-base-alsa \
16 gst-plugins-base-ogg"
17
18PV = "0.0+svnr${SRCREV}"
19
20PR = "r3"
21
22SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
23
24S = "${WORKDIR}/${PN}"
25
26inherit autotools pkgconfig
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
new file mode 100644
index 0000000000..a7ebddff99
--- /dev/null
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
@@ -0,0 +1,23 @@
1DESCRIPTION = "Sato theme engine for GTK"
2HOMEPAGE = "http://www.o-hand.com"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "LGPLv2.1 & LGPLv2+"
6
7SECTION = "x11/base"
8DEPENDS = "gtk+"
9RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
10
11PACKAGES += "gtk-theme-sato"
12FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
13FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
14FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
15FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
16
17inherit autotools pkgconfig
18
19do_configure_prepend() {
20 for i in `ls gtk-common`; do
21 ln -sf ../gtk-common/$i gtk2-engine/$i
22 done
23}
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
new file mode 100644
index 0000000000..a7ee6c6e43
--- /dev/null
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
@@ -0,0 +1,14 @@
1require gtk-sato-engine.inc
2
3LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
4 file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \
5 file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a"
6
7PV = "0.3.2+svnr${SRCREV}"
8PR = "r0"
9
10SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
11
12EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
13
14S = "${WORKDIR}/gtk-engine"
diff --git a/meta/recipes-sato/images/poky-image-sato-directdisk.bb b/meta/recipes-sato/images/poky-image-sato-directdisk.bb
new file mode 100644
index 0000000000..5fa20b6cad
--- /dev/null
+++ b/meta/recipes-sato/images/poky-image-sato-directdisk.bb
@@ -0,0 +1,7 @@
1require recipes-core/images/poky-image-directdisk.inc
2
3DESCRIPTION = "Sato Direct Disk Image"
4
5ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
6
7do_bootdirectdisk[depends] += "poky-image-sato:do_rootfs"
diff --git a/meta/recipes-sato/images/poky-image-sato-live.bb b/meta/recipes-sato/images/poky-image-sato-live.bb
new file mode 100644
index 0000000000..08e3441861
--- /dev/null
+++ b/meta/recipes-sato/images/poky-image-sato-live.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "Sato Bootable Live Image"
2
3require recipes-core/images/poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
8
9do_bootimg[depends] += "poky-image-sato:do_rootfs"
diff --git a/meta/recipes-sato/images/poky-image-sato.bb b/meta/recipes-sato/images/poky-image-sato.bb
new file mode 100644
index 0000000000..58eb5d68c2
--- /dev/null
+++ b/meta/recipes-sato/images/poky-image-sato.bb
@@ -0,0 +1,7 @@
1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
4
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
6
7inherit poky-image
diff --git a/meta/recipes-sato/images/poky-image-sdk-live.bb b/meta/recipes-sato/images/poky-image-sdk-live.bb
new file mode 100644
index 0000000000..06c56ee155
--- /dev/null
+++ b/meta/recipes-sato/images/poky-image-sdk-live.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "Bootable Live SDK Image"
2
3require recipes-core/images/poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sdk-${MACHINE}.ext3"
8
9do_bootimg[depends] += "poky-image-sdk:do_rootfs"
diff --git a/meta/recipes-sato/images/poky-image-sdk.bb b/meta/recipes-sato/images/poky-image-sdk.bb
new file mode 100644
index 0000000000..1df832a0b2
--- /dev/null
+++ b/meta/recipes-sato/images/poky-image-sdk.bb
@@ -0,0 +1,7 @@
1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
4
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs"
6
7inherit poky-image
diff --git a/meta/recipes-sato/kf/files/fix-configure.patch b/meta/recipes-sato/kf/files/fix-configure.patch
new file mode 100644
index 0000000000..fc1ad9a418
--- /dev/null
+++ b/meta/recipes-sato/kf/files/fix-configure.patch
@@ -0,0 +1,25 @@
1diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in
2--- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in 2005-04-27 19:42:49.000000000 +0100
3+++ kf-0.5.4.1/configure.in 2005-09-29 14:12:32.000000000 +0100
4@@ -27,7 +27,7 @@
5 dnl AC_ARG_ENABLE(debug,)
6
7 dnl modules needed for package
8-MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16"
9+MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16 libxml-2.0"
10 dnl MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.15.1"
11
12 dnl GtkSpell
13@@ -60,9 +60,9 @@
14 AC_DEFINE([HAVE_LM_CONNECTION_SET_JID],1,[We have lm_connection_set_jid])
15 fi
16
17-dnl XScreenSaver stuff...
18-AC_DEFINE([HAVE_XSCREENSAVER], [1], [Whether to support XScreenSaver extension])
19-PACKAGE_LIBS="$PACKAGE_LIBS -lXss -L/usr/X11R6/lib"
20+#dnl XScreenSaver stuff...
21+#AC_DEFINE([HAVE_XSCREENSAVER], [1], [Whether to support XScreenSaver extension])
22+#PACKAGE_LIBS="$PACKAGE_LIBS -lXss -L/usr/X11R6/lib"
23
24 AC_SUBST(PACKAGE_CFLAGS)
25 AC_SUBST(PACKAGE_LIBS)
diff --git a/meta/recipes-sato/kf/files/fix-desktop-file.patch b/meta/recipes-sato/kf/files/fix-desktop-file.patch
new file mode 100644
index 0000000000..7a0f7d1bca
--- /dev/null
+++ b/meta/recipes-sato/kf/files/fix-desktop-file.patch
@@ -0,0 +1,20 @@
1Common subdirectories: kf-0.5.4.1.orig/data and kf-0.5.4.1/data
2diff -u kf-0.5.4.1.orig/kf.desktop kf-0.5.4.1/kf.desktop
3--- kf-0.5.4.1.orig/kf.desktop 2005-04-19 22:08:44.000000000 +0100
4+++ kf-0.5.4.1/kf.desktop 2005-10-03 14:36:47.000000000 +0100
5@@ -1,6 +1,6 @@
6 [Desktop Entry]
7 Encoding=UTF-8
8-Name=kf jabber client
9+Name=Instant Messenger
10 Name[pl]=kf klient sieci jabber
11 Name[lt]=Pokalbių programa kf
12 GenericName=Instant Messenger
13@@ -11,5 +11,6 @@
14 Icon=kf.png
15 Terminal=false
16 Type=Application
17-Categories=GTK;Application;Network;
18+Categories=GTK;PIM;Application;Network;
19 StartupNotify=true
20+X-MB-SingleInstance=true
diff --git a/meta/recipes-sato/kf/files/gcc4.patch b/meta/recipes-sato/kf/files/gcc4.patch
new file mode 100644
index 0000000000..58727ea0e0
--- /dev/null
+++ b/meta/recipes-sato/kf/files/gcc4.patch
@@ -0,0 +1,30 @@
1Index: kf-0.5.4.1/src/jispman.c
2===================================================================
3--- kf-0.5.4.1.orig/src/jispman.c 2006-12-03 15:33:47.000000000 +0100
4+++ kf-0.5.4.1/src/jispman.c 2006-12-03 15:35:01.000000000 +0100
5@@ -25,12 +25,6 @@
6 #include "emoticons.h"
7 #include "kf.h"
8
9-struct _KfJispManager {
10- GHashTable *jisps; /** A hash-table of all JISP pachages managed by this object, indexed by their filename */
11- GList *patterns; /** A list of patterns */
12-};
13-
14-
15 /**
16 * \brief create a new instance of KfJispManager
17 * \return a new instance of KfJispManager
18Index: kf-0.5.4.1/src/jispman.h
19===================================================================
20--- kf-0.5.4.1.orig/src/jispman.h 2006-12-03 15:33:47.000000000 +0100
21+++ kf-0.5.4.1/src/jispman.h 2006-12-03 15:34:37.000000000 +0100
22@@ -25,6 +25,8 @@
23 #include "jisp.h"
24
25 typedef struct _KfJispManager {
26+ GHashTable *jisps; /** A hash-table of all JISP pachages managed by this object, indexed by their filename */
27+ GList *patterns; /** A list of patterns */
28 } KfJispManager;
29
30 /**
diff --git a/meta/recipes-sato/kf/kf_0.5.4.1.bb b/meta/recipes-sato/kf/kf_0.5.4.1.bb
new file mode 100644
index 0000000000..2baa6d46f7
--- /dev/null
+++ b/meta/recipes-sato/kf/kf_0.5.4.1.bb
@@ -0,0 +1,16 @@
1DESCRIPTION = "Kf is a GTK+ instant messaging client."
2LICENSE = "GPL"
3DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth libglade"
4PR = "r4"
5
6SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
7 file://fix-configure.patch;patch=1 \
8 file://fix-desktop-file.patch;patch=0 \
9 file://gcc4.patch;patch=1"
10
11inherit autotools pkgconfig
12
13EXTRA_OECONF = "--disable-binreloc"
14
15export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
16
diff --git a/meta/recipes-sato/leafpad/files/leafpad.desktop b/meta/recipes-sato/leafpad/files/leafpad.desktop
new file mode 100644
index 0000000000..c7e2d5bb58
--- /dev/null
+++ b/meta/recipes-sato/leafpad/files/leafpad.desktop
@@ -0,0 +1,10 @@
1[Desktop Entry]
2Name=Notes
3Exec=/usr/bin/leafpad
4Comment=Text Editor
5Icon=accessories-text-editor
6Terminal=false
7Type=Application
8Categories=GTK;Utility;TextEditor;
9X-MB-SingleInstance=true
10StartupNotify=true
diff --git a/meta/recipes-sato/leafpad/files/owl-menu.patch b/meta/recipes-sato/leafpad/files/owl-menu.patch
new file mode 100644
index 0000000000..acfc880307
--- /dev/null
+++ b/meta/recipes-sato/leafpad/files/owl-menu.patch
@@ -0,0 +1,61 @@
1--- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100
2+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100
3@@ -152,7 +152,7 @@
4 }
5
6 accel_group = gtk_accel_group_new();
7- ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);
8+ ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group);
9 gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL);
10 gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL);
11 gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
12
13--- tmp/src/window.c.orig 2007-04-23 12:14:07.000000000 +0100
14+++ tmp/src/window.c 2007-04-23 12:14:07.000000000 +0100
15@@ -18,6 +18,8 @@
16 */
17
18 #include "leafpad.h"
19+#include <libowl/owlwindowmenu.h>
20+
21 /*
22 static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view)
23 {
24@@ -52,7 +54,6 @@
25 gtk_container_add(GTK_CONTAINER(window), vbox);
26
27 menubar = create_menu_bar(window);
28- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
29
30 sw = gtk_scrolled_window_new(NULL, NULL);
31 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
32
33--- tmp/src/main.c.orig 2007-04-23 12:15:03.000000000 +0100
34+++ tmp/src/main.c 2007-04-23 12:15:03.000000000 +0100
35@@ -244,6 +244,7 @@
36 Conf *conf;
37 GtkItemFactory *ifactory;
38 gchar *stdin_data = NULL;
39+ GtkWidget *menu;
40
41 bindtextdomain(PACKAGE, LOCALEDIR);
42 bind_textdomain_codeset(PACKAGE, "UTF-8");
43@@ -293,7 +294,10 @@
44 conf->autoindent);
45
46 gtk_widget_show_all(pub->mw->window);
47+ owl_set_window_menu (GTK_WINDOW(pub->mw->window),
48+ GTK_MENU(pub->mw->menubar));
49+
50 g_free(conf->fontname);
51 g_free(conf);
52
53
54--- tmp/src/Makefile.am.orig 2007-04-23 12:17:54.000000000 +0100
55+++ tmp/src/Makefile.am 2007-04-23 12:17:54.000000000 +0100
56@@ -27,4 +27,4 @@
57 i18n.h
58
59 leafpad_CFLAGS = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS)
60-leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS)
61+leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -lowl
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.17.bb b/meta/recipes-sato/leafpad/leafpad_0.8.17.bb
new file mode 100644
index 0000000000..5407b9e996
--- /dev/null
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.17.bb
@@ -0,0 +1,28 @@
1DESCRIPTION = "Simple GTK+ Text Editor"
2HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
3BUGTRACKER = ""
4
5LICENSE = "GPLv2 & GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
8 file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
9
10DEPENDS = "gtk+ intltool-native"
11DEPENDS_append_poky = " libowl"
12SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \
13 file://leafpad.desktop"
14PR = "r0"
15
16SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
17
18inherit autotools pkgconfig
19
20EXTRA_OECONF = " --enable-chooser --disable-gtktest --disable-print"
21
22do_install_append () {
23 install -d ${D}/${datadir}
24 install -d ${D}/${datadir}/applications
25 install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
26}
27
28FILES_${PN} += "${datadir}/applications/leafpad.desktop"
diff --git a/meta/recipes-sato/libowl/libowl_svn.bb b/meta/recipes-sato/libowl/libowl_svn.bb
new file mode 100644
index 0000000000..31a142c930
--- /dev/null
+++ b/meta/recipes-sato/libowl/libowl_svn.bb
@@ -0,0 +1,20 @@
1DESCRIPTION = "OpenedHand Widget Library"
2HOMEPAGE = "http://www.o-hand.com"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2 & LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://libowl/owlpaned.h;endline=20;md5=7fef844c4cc01b10541a7ab6ab5971af \
8 file://libowl/owltreemodelslice.h;endline=20;md5=a5421f2cdae8debe5e4c48c09a02beb9 \
9 file://libowl/owlcolourswatch.h;endline=24;md5=063c415c58719d536990ca8f606b5730"
10
11SECTION = "libs"
12DEPENDS = "gtk+"
13PV = "0.0+svnr${SRCREV}"
14PR = "r6"
15
16SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
17
18S = "${WORKDIR}/${PN}"
19
20inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
new file mode 100644
index 0000000000..9ab51ecedc
--- /dev/null
+++ b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
@@ -0,0 +1,33 @@
1Index: appearance/mb-appearance.c
2===================================================================
3--- appearance/mb-appearance.c (revision 1614)
4+++ appearance/mb-appearance.c (working copy)
5@@ -300,11 +300,13 @@
6 gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button),
7 gconf_value_get_string (value));
8 } else if (strcmp (key, HANDED_KEY) == 0) {
9+#if 0
10 GEnumValue *e;
11 e = g_enum_get_value_by_name (g_type_class_ref (GTK_TYPE_CORNER_TYPE),
12 gconf_value_get_string (value));
13 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (handed_check),
14 e->value == GTK_CORNER_TOP_RIGHT);
15+#endif
16 }
17 }
18
19@@ -395,12 +397,13 @@
20 gtk_container_add (GTK_CONTAINER (align), font_button);
21
22 /* Left/Right Handed */
23-
24+#if 0
25 frame = new_frame (_("Orientation"), &align);
26 gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
27 handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed"));
28 g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL);
29 gtk_container_add (GTK_CONTAINER (align), handed_check);
30+#endif
31
32 gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
33 g_signal_connect (gconf, "value-changed", G_CALLBACK (on_gconf_value_changed), NULL);
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
new file mode 100644
index 0000000000..af748f14ff
--- /dev/null
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
@@ -0,0 +1,20 @@
1DESCRIPTION = "Matchbox GTK+ theme configuration application."
2HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28"
8
9DEPENDS = "gconf gtk+"
10RDEPENDS = "settings-daemon"
11
12PV = "0.0+svnr${SRCREV}"
13
14S = "${WORKDIR}/${PN}"
15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
17 file://no-handed.patch;patch=1;pnum=0"
18
19inherit autotools pkgconfig
20
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
new file mode 100644
index 0000000000..bdae33d5a3
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
@@ -0,0 +1,19 @@
1DESCRIPTION = "Sato desktop folders"
2HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7
8SECTION = "x11"
9DEPENDS = ""
10CONFLICTS = "matchbox-common"
11PV = "0.0+svnr${SRCREV}"
12PR = "r0"
13
14SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=desktop-folders;proto=http"
15S = "${WORKDIR}/desktop-folders"
16
17inherit autotools pkgconfig
18
19FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
new file mode 100644
index 0000000000..0a02bb9f3d
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -0,0 +1,24 @@
1DESCRIPTION = "Matchbox Window Manager Desktop"
2LICENSE = "GPL"
3DEPENDS = "libmatchbox startup-notification"
4SECTION = "x11/wm"
5
6SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2"
7
8EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
9
10inherit autotools pkgconfig
11
12FILES_${PN} = "${bindir}/* \
13 ${datadir}/applications \
14 ${libdir}/matchbox/desktop/*.so \
15 ${datadir}/matchbox-desktop \
16 ${datadir}/pixmaps \
17 ${sysconfdir}/matchbox"
18
19FILES_${PN}-dev += "${libdir}/matchbox-desktop \
20 ${includedir}/matchbox-desktop \
21 ${libdir}/matchbox/desktop/*.*a \
22 ${datadir}/matchbox/desktop/modules/*a"
23
24FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
new file mode 100644
index 0000000000..83d4d0b3fd
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "Matchbox Window Manager Desktop"
2LICENSE = "GPL"
3DEPENDS = "gtk+ startup-notification"
4SECTION = "x11/wm"
5PR = "r1"
6
7SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2"
8
9EXTRA_OECONF = "--enable-startup-notification"
10
11inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
new file mode 100644
index 0000000000..324c81ff27
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
@@ -0,0 +1,22 @@
1DESCRIPTION = "Matchbox Window Manager Desktop"
2HOMEPAGE = "http://matchbox-project.org/"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2+ & LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://libtaku/eggsequence.h;endline=20;md5=b91f68f7642a1459fa1f4c9df94a8f15 \
8 file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \
9 file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00"
10
11DEPENDS = "gtk+ startup-notification dbus"
12SECTION = "x11/wm"
13PV = "2.0+svnr${SRCREV}"
14PR = "r0"
15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN}-2;proto=http"
17
18EXTRA_OECONF = "--enable-startup-notification --with-dbus"
19
20S = "${WORKDIR}/${PN}-2"
21
22inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
new file mode 100755
index 0000000000..43c5d3ed6a
--- /dev/null
+++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
@@ -0,0 +1,23 @@
1#!/bin/sh
2
3. /etc/formfactor/config
4
5CMD=""
6
7if [ "$HAVE_KEYBOARD" = "0" ]; then
8 CMD="matchbox-keyboard -d"
9elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
10 if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
11 CMD="matchbox-keyboard -d -o landscape"
12 elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
13 CMD="matchbox-keyboard -d -o portrait"
14 fi
15fi
16
17
18if [ "$CMD" ]; then
19 # Delay to make sure the window manager is active
20 # by waiting for the desktop to say its finished loading
21 dbus-wait org.matchbox_project.desktop Loaded
22 exec $CMD
23fi
diff --git a/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
new file mode 100644
index 0000000000..52cea0e8f7
--- /dev/null
+++ b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
@@ -0,0 +1,13 @@
1Index: matchbox-window-manager/configure.ac
2===================================================================
3--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
4+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000
5@@ -283,7 +283,7 @@
6 yes)
7
8 case "$expat" in
9- yes)
10+ yes|"")
11 EXPAT_LIBS="-lexpat"
12 ;;
13 *)
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
new file mode 100644
index 0000000000..0425fec78a
--- /dev/null
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -0,0 +1,60 @@
1DESCRIPTION = "Matchbox virtual keyboard for X11"
2HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://src/matchbox-keyboard.h;endline=20;md5=4ba16ff913ad245dd6d95a6c67f72526 \
8 file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
9
10DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
11RDEPENDS = "formfactor dbus-wait"
12SECTION = "x11"
13PV = "0.0+svnr${SRCREV}"
14PR = "r4"
15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
17 file://configure_fix.patch;patch=1;maxrev=1819 \
18 file://80matchboxkeyboard.shbg"
19
20S = "${WORKDIR}/${PN}"
21
22inherit autotools pkgconfig gettext
23
24EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
25
26PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \
27 matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
28
29FILES_${PN} = "${bindir}/* \
30 ${sysconfdir} \
31 ${datadir}/applications \
32 ${datadir}/pixmaps \
33 ${datadir}/matchbox-keyboard"
34
35FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
36FILES_matchbox-keyboard-im-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
37
38FILES_matchbox-keyboard-applet = "${libdir}/matchbox-panel/*.so"
39FILES_matchbox-keyboard-applet-dbg += "${libdir}/matchbox-panel/.debug"
40
41do_install_append () {
42 install -d ${D}/${sysconfdir}/X11/Xsession.d/
43 install -m 755 ${WORKDIR}/80matchboxkeyboard.shbg ${D}/${sysconfdir}/X11/Xsession.d/
44}
45
46pkg_postinst_matchbox-keyboard-im () {
47if [ "x$D" != "x" ]; then
48 exit 1
49fi
50
51gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
52}
53
54pkg_postrm_matchbox-keyboard-im () {
55if [ "x$D" != "x" ]; then
56 exit 1
57fi
58
59gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
60}
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
new file mode 100644
index 0000000000..45998633f4
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
@@ -0,0 +1,36 @@
1DESCRIPTION = "A simple GTK+ based panel for handheld devices."
2HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \
8 file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03"
9
10PRIORITY = "optional"
11DEPENDS = "gtk+ startup-notification dbus dbus-glib"
12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
14
15PV = "0.0+svnr${SRCREV}"
16PR = "r5"
17
18RPROVIDES_${PN} = "matchbox-panel"
19RREPLACES_${PN} = "matchbox-panel"
20RCONFLICTS_${PN} = "matchbox-panel"
21
22SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
23 file://startup_fix.diff;patch=1"
24
25EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
28
29S = "${WORKDIR}/${PN}"
30
31FILES_${PN} += "${libdir}/matchbox-panel/*.so \
32 ${datadir}/matchbox-panel/brightness/*.png \
33 ${datadir}/matchbox-panel/startup/*.png "
34FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
35
36inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
new file mode 100644
index 0000000000..9262d33eae
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
@@ -0,0 +1,17 @@
1Fixed the compile error caused by typo, upstream also need this.
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Index: matchbox-panel-2/applets/startup/startup.c
6===================================================================
7--- matchbox-panel-2/applets/startup/startup.c (revision 2109)
8+++ matchbox-panel-2/applets/startup/startup.c (working copy)
9@@ -229,7 +229,7 @@
10 applet = g_slice_new0 (StartupApplet);
11
12 applet->launch_list = NULL;
13- applet->hourglass_show = FALSE;
14+ applet->hourglass_shown = FALSE;
15
16 /* Create image */
17 applet->image = MB_PANEL_SCALING_IMAGE
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
new file mode 100644
index 0000000000..1a7e99c0a9
--- /dev/null
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
@@ -0,0 +1,22 @@
1#!/bin/sh
2
3. /etc/formfactor/config
4
5if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
6 SHOWCURSOR="no"
7else
8 SHOWCURSOR="yes"
9fi
10
11matchbox-desktop &
12
13# Lines containing feature-[foo] are removed at build time if the machine
14# doesn't have the feature "foo".
15
16START_APPLETS=showdesktop,windowselector
17END_APPLETS=clock,battery,systray,startup-notify,notify
18END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
19
20matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &
21
22exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
new file mode 100644
index 0000000000..5c01a13283
--- /dev/null
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -0,0 +1,53 @@
1DESCRIPTION = "Custom MB session files for poky"
2HOMEPAGE = "http://www.matchbox-project.org/"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPL"
6
7SECTION = "x11"
8RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session"
9PR = "r27"
10
11# This package is architecture specific because the session script is modified
12# based on the machine architecture.
13PACKAGE_ARCH = "${MACHINE_ARCH}"
14
15SRC_URI = "file://session"
16S = "${WORKDIR}"
17
18do_install() {
19 # This is the set of machine features that the script has markers for
20 FEATURES="phone"
21 SCRIPT="${S}/sedder"
22 rm -f $SCRIPT
23 touch $SCRIPT
24 for FEAT in $FEATURES; do
25 if echo ${MACHINE_FEATURES} | awk "/$FEAT/ {exit 1}"; then
26 echo "/feature-$FEAT/d" >> $SCRIPT
27 fi
28 done
29
30 install -d ${D}/${sysconfdir}/matchbox
31 sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session
32 chmod +x ${D}/${sysconfdir}/matchbox/session
33}
34
35pkg_postinst_${PN} () {
36#!/bin/sh -e
37if [ "x$D" != "x" ]; then
38 exit 1
39fi
40
41. ${sysconfdir}/init.d/functions
42
43gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato
44gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato
45gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/touchscreen true
46
47if [ "`machine_id`" = "gta01" ]
48then
49 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 6"
50else
51 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9"
52fi
53}
diff --git a/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch b/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
new file mode 100644
index 0000000000..52cea0e8f7
--- /dev/null
+++ b/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
@@ -0,0 +1,13 @@
1Index: matchbox-window-manager/configure.ac
2===================================================================
3--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
4+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000
5@@ -283,7 +283,7 @@
6 yes)
7
8 case "$expat" in
9- yes)
10+ yes|"")
11 EXPAT_LIBS="-lexpat"
12 ;;
13 *)
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
new file mode 100644
index 0000000000..f3626557e3
--- /dev/null
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
@@ -0,0 +1,21 @@
1DESCRIPTION = "Matchbox stroke recogniser"
2HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2"
6
7DEPENDS = "libfakekey expat libxft"
8SECTION = "x11/wm"
9PV = "0.0+svnr${SRCREV}"
10
11SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
12 file://configure_fix.patch;patch=1;maxrev=1819 "
13
14S = "${WORKDIR}/${PN}"
15
16inherit autotools pkgconfig gettext
17
18FILES_${PN} = "${bindir}/* \
19 ${datadir}/applications \
20 ${datadir}/pixmaps \
21 ${datadir}/matchbox-stroke"
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb
new file mode 100644
index 0000000000..169223f84e
--- /dev/null
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb
@@ -0,0 +1,18 @@
1DESCRIPTION = "Matchbox Terminal"
2HOMEPAGE = "http://www.matchbox-project.org/"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820"
8
9DEPENDS = "gtk+ vte"
10SECTION = "x11/utils"
11PV = "0.0+svnr${SRCREV}"
12PR = "r0"
13
14SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
15
16S = "${WORKDIR}/${PN}"
17
18inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
new file mode 100644
index 0000000000..30b632934e
--- /dev/null
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
@@ -0,0 +1,9 @@
1require matchbox-theme-sato.inc
2
3DEPENDS = "matchbox-wm-2"
4PV = "0.1+svnr${SRCREV}"
5
6SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
7S = "${WORKDIR}/matchbox-sato"
8
9EXTRA_OECONF = "--disable-matchbox-1 --enable-matchbox-2"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
new file mode 100644
index 0000000000..032dc2d6d5
--- /dev/null
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
@@ -0,0 +1,13 @@
1DESCRIPTION = "Matchbox window manager Sato themes"
2HOMEPAGE = "http://www.matchbox-project.org/"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "CCPL"
6LIC_FILES_CHKSUM = "file://COPYING;md5=aae86bb34b0a83716ca09f4e783d6ba4"
7
8DEPENDS = "matchbox-wm"
9SECTION = "x11/wm"
10
11inherit autotools pkgconfig
12
13FILES_${PN} += "${datadir}/themes"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
new file mode 100644
index 0000000000..74fb8cf65a
--- /dev/null
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
@@ -0,0 +1,5 @@
1require matchbox-theme-sato.inc
2
3PR = "r0"
4
5SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb
new file mode 100644
index 0000000000..7d492353bf
--- /dev/null
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb
@@ -0,0 +1,10 @@
1require matchbox-theme-sato.inc
2
3PV = "0.1+svnr${SRCREV}"
4PR = "r0"
5
6SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
7
8EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
9
10S = "${WORKDIR}/matchbox-sato"
diff --git a/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
new file mode 100644
index 0000000000..fb91f03b12
--- /dev/null
+++ b/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@@ -0,0 +1,25 @@
1DESCRIPTION = "Matchbox window manager extra themes"
2LICENSE = "GPL"
3DEPENDS = "matchbox-wm"
4SECTION = "x11/wm"
5
6SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-themes-extra/${PV}/matchbox-themes-extra-${PV}.tar.bz2"
7S = "${WORKDIR}/matchbox-themes-extra-${PV}"
8
9inherit autotools pkgconfig
10
11# split into several packages plus one meta package
12PACKAGES = "${PN} ${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
13
14ALLOW_EMPTY_${PN} = "1"
15FILES_${PN} = ""
16RDEPENDS_${PN} = "${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
17
18FILES_${PN}-industrial = "${datadir}/themes/Industrial \
19 ${datadir}/icons/Industrial"
20
21FILES_${PN}-expose = "${datadir}/themes/expose \
22 ${datadir}/icons/expose"
23
24FILES_${PN}-mbcrystal = "${datadir}/themes/mbcrystal \
25 ${datadir}/icons/mbcrystal"
diff --git a/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb b/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb
new file mode 100644
index 0000000000..6a9f18beaf
--- /dev/null
+++ b/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb
@@ -0,0 +1,30 @@
1DESCRIPTION = "Matchbox window manager extra themes"
2LICENSE = "GPL"
3DEPENDS = "matchbox-wm"
4SECTION = "x11/wm"
5PV = "0.3+svnr${SRCREV}"
6
7SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-themes-extra;proto=http"
8S = "${WORKDIR}/${PN}"
9
10inherit autotools pkgconfig
11
12# split into several packages plus one meta package
13PACKAGES = "${PN} ${PN}-industrial ${PN}-expose ${PN}-mbcrystal ${PN}-clearlooks"
14
15ALLOW_EMPTY_${PN} = 1
16FILES_${PN} = ""
17RDEPENDS_${PN} = "${PN}-industrial ${PN}-expose ${PN}-mbcrystal ${PN}-clearlooks"
18
19FILES_${PN}-industrial = "${datadir}/themes/Industrial \
20 ${datadir}/icons/Industrial"
21
22FILES_${PN}-expose = "${datadir}/themes/expose \
23 ${datadir}/icons/expose"
24
25FILES_${PN}-mbcrystal = "${datadir}/themes/mbcrystal \
26 ${datadir}/icons/mbcrystal"
27
28FILES_${PN}-clearlooks = "${datadir}/themes/Clearlooks \
29 ${datadir}/icons/Clearlooks"
30
diff --git a/meta/recipes-sato/matchbox-themes-gtk/files/gtkrc b/meta/recipes-sato/matchbox-themes-gtk/files/gtkrc
new file mode 100644
index 0000000000..6dc40c0aa5
--- /dev/null
+++ b/meta/recipes-sato/matchbox-themes-gtk/files/gtkrc
@@ -0,0 +1 @@
include "/usr/share/themes/Clearlooks/gtk-2.0/gtkrc"
diff --git a/meta/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb b/meta/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb
new file mode 100644
index 0000000000..60be56de13
--- /dev/null
+++ b/meta/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "Gtk2 theme files to accompany default Matchbox themes"
2LICENSE = "GPL"
3DEPENDS = "gtk-engines"
4RDEPENDS = "matchbox-wm gtk-engine-clearlooks"
5SECTION = "x11/base"
6PR = "r2"
7
8SRC_URI = "file://gtkrc"
9
10FILES_${PN} = "${datadir}/themes"
11
12do_install() {
13 install -d ${D}${datadir}/themes/blondie/gtk-2.0
14 install -d ${D}${datadir}/themes/MBOpus/gtk-2.0
15 install -m 644 ${WORKDIR}/gtkrc ${D}${datadir}/themes/blondie/gtk-2.0/
16 install -m 644 ${WORKDIR}/gtkrc ${D}${datadir}/themes/MBOpus/gtk-2.0/
17}
diff --git a/meta/recipes-sato/owl-video-widget/files/owl-video-widget.desktop b/meta/recipes-sato/owl-video-widget/files/owl-video-widget.desktop
new file mode 100644
index 0000000000..e7af07ee64
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/files/owl-video-widget.desktop
@@ -0,0 +1,10 @@
1[Desktop Entry]
2Name=Video
3Exec=video
4Icon=video-player
5Terminal=false
6Type=Application
7Categories=AudioVideo;Video;Player;
8X-MB-SingleInstance=true
9StartupNotify=true
10Comment=Video Player
diff --git a/meta/recipes-sato/owl-video-widget/files/owl-video-widget.png b/meta/recipes-sato/owl-video-widget/files/owl-video-widget.png
new file mode 100644
index 0000000000..f463fe1864
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/files/owl-video-widget.png
Binary files differ
diff --git a/meta/recipes-sato/owl-video-widget/files/stock_media-play.png b/meta/recipes-sato/owl-video-widget/files/stock_media-play.png
new file mode 100644
index 0000000000..c2b9c582a1
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/files/stock_media-play.png
Binary files differ
diff --git a/meta/recipes-sato/owl-video-widget/files/stock_volume-0.png b/meta/recipes-sato/owl-video-widget/files/stock_volume-0.png
new file mode 100644
index 0000000000..f3f57143d4
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/files/stock_volume-0.png
Binary files differ
diff --git a/meta/recipes-sato/owl-video-widget/files/stock_volume-max.png b/meta/recipes-sato/owl-video-widget/files/stock_volume-max.png
new file mode 100644
index 0000000000..03f5a03b45
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/files/stock_volume-max.png
Binary files differ
diff --git a/meta/recipes-sato/owl-video-widget/files/stock_volume-med.png b/meta/recipes-sato/owl-video-widget/files/stock_volume-med.png
new file mode 100644
index 0000000000..f774e42bb1
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/files/stock_volume-med.png
Binary files differ
diff --git a/meta/recipes-sato/owl-video-widget/files/stock_volume-min.png b/meta/recipes-sato/owl-video-widget/files/stock_volume-min.png
new file mode 100644
index 0000000000..f3f57143d4
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/files/stock_volume-min.png
Binary files differ
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
new file mode 100644
index 0000000000..be3469965a
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
@@ -0,0 +1,22 @@
1DESCRIPTION = "OpenedHand Widget Library Audio/Video"
2HOMEPAGE = "http://www.o-hand.com"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
7 file://libowl-av/owl-video-widget.h;endline=22;md5=0d4caab10952acdf470086c25c7f70c8 \
8 file://libowl-av/owl-audio-player.h;endline=22;md5=4af2d44f206a086f9f03881236f7390b"
9
10SECTION = "x11"
11DEPENDS = "gtk+ gstreamer gst-plugins-base"
12RDEPENDS = "gst-meta-base"
13RRECOMMENDS = "gst-meta-audio gst-meta-video"
14
15PV = "0.0+svnr${SRCREV}"
16PR = "r3"
17
18S = "${WORKDIR}/${PN}"
19
20SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
21
22inherit autotools pkgconfig
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
new file mode 100644
index 0000000000..50027f5f20
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
@@ -0,0 +1,38 @@
1DESCRIPTION = "OpenedHand Widget Library video widget"
2HOMEPAGE = "http://o-hand.com/"
3BUGTRACKER = "http://bugzilla.o-hand.com/"
4LICENSE = "LGPLv2.1 & GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
6 file://src/video.c;endline=22;md5=e8e9f23c3691c11af7d8fc03264ca9da \
7 file://src/bacon-volume.c;endline=20;md5=798804562b24e30bac482ba91c45e46d"
8SECTION = "x11"
9DEPENDS = "libowl-av"
10
11PV = "0.0+svnr${SRCREV}"
12PR = "r1"
13
14S = "${WORKDIR}/video"
15
16SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=video;proto=http \
17 file://owl-video-widget.png \
18 file://stock_media-play.png \
19 file://stock_volume-0.png \
20 file://stock_volume-min.png \
21 file://stock_volume-med.png \
22 file://stock_volume-max.png \
23 file://owl-video-widget.desktop"
24
25inherit autotools pkgconfig
26
27do_install_append () {
28 install -d ${D}/${datadir}/pixmaps
29 install -m 0644 ${WORKDIR}/stock_media-play.png ${D}/${datadir}/pixmaps
30 install -m 0644 ${WORKDIR}/stock_volume-0.png ${D}/${datadir}/pixmaps
31 install -m 0644 ${WORKDIR}/stock_volume-min.png ${D}/${datadir}/pixmaps
32 install -m 0644 ${WORKDIR}/stock_volume-med.png ${D}/${datadir}/pixmaps
33 install -m 0644 ${WORKDIR}/stock_volume-max.png ${D}/${datadir}/pixmaps
34 install -m 0644 ${WORKDIR}/owl-video-widget.png ${D}/${datadir}/pixmaps
35
36 install -d ${D}/${datadir}/applications
37 install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications
38}
diff --git a/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
new file mode 100644
index 0000000000..2f654a5fb6
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
@@ -0,0 +1,16 @@
1pcmanfm need a binary xml-purge(from its own source code) to optimize size of
2data file, which cause build error on cross-compile environment. Simplely
3remove it to work aound this issue.
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6
7Index: pcmanfm-0.9.7/data/ui/Makefile.am
8===================================================================
9--- pcmanfm-0.9.7.orig/data/ui/Makefile.am 2010-07-29 15:10:18.000000000 +0800
10+++ pcmanfm-0.9.7/data/ui/Makefile.am 2010-07-29 15:11:24.000000000 +0800
11@@ -21,4 +21,4 @@
12 # Purge GtkBuilder UI files
13 %.ui: %.glade
14 cp $< $@
15- $(top_builddir)/src/xml-purge $@
16+# $(top_builddir)/src/xml-purge $@
diff --git a/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png b/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
new file mode 100644
index 0000000000..b8e559456e
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
Binary files differ
diff --git a/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png b/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
new file mode 100644
index 0000000000..05921a6689
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
Binary files differ
diff --git a/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png b/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
new file mode 100644
index 0000000000..ce77a8e62d
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
Binary files differ
diff --git a/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png b/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
new file mode 100644
index 0000000000..bfe4bad56c
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
Binary files differ
diff --git a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
new file mode 100644
index 0000000000..f3d4e61a22
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
@@ -0,0 +1,80 @@
10.9.7 use a new menu bar from gtk_ui_manager, so need a translation here to
2enable owl menu
3
4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5
6Index: pcmanfm-0.9.7/configure.ac
7===================================================================
8--- pcmanfm-0.9.7.orig/configure.ac 2010-07-27 10:28:12.000000000 +0800
9+++ pcmanfm-0.9.7/configure.ac 2010-07-27 18:03:42.000000000 +0800
10@@ -70,6 +70,8 @@
11
12 gtk_modules="gtk+-2.0 >= 2.16.0"
13 PKG_CHECK_MODULES(GTK, [$gtk_modules])
14+OWL_LIBS="-lowl"
15+GTK_LIBS="$GTK_LIBS $OWL_LIBS"
16 AC_SUBST(GTK_CFLAGS)
17 AC_SUBST(GTK_LIBS)
18
19Index: pcmanfm-0.9.7/src/main-win.c
20===================================================================
21--- pcmanfm-0.9.7.orig/src/main-win.c 2010-07-27 10:56:08.000000000 +0800
22+++ pcmanfm-0.9.7/src/main-win.c 2010-07-27 17:28:59.000000000 +0800
23@@ -36,6 +36,8 @@
24 #include "main-win.h"
25 #include "pref.h"
26
27+#include "libowl/owlwindowmenu.h"
28+
29 static void fm_main_win_finalize (GObject *object);
30 G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW);
31
32@@ -466,9 +468,27 @@
33 fm_main_win_chdir(win, path);
34 }
35
36+/* Transfer gtk_ui_manager menubar to gtk menubar */
37+static GtkWidget * ui_menubar_to_menu(GtkWidget *menubar)
38+{
39+ GtkWidget *main_menu;
40+ GList *iter;
41+
42+ main_menu = gtk_menu_new();
43+
44+ for ( iter = gtk_container_get_children(GTK_CONTAINER(menubar));
45+ iter;
46+ iter = g_list_next(iter) )
47+ {
48+ GtkWidget *menu = GTK_WIDGET(iter->data);
49+ gtk_widget_reparent(menu, main_menu);
50+ }
51+ return main_menu;
52+}
53+
54 static void fm_main_win_init(FmMainWin *self)
55 {
56- GtkWidget *vbox, *menubar, *toolitem, *scroll;
57+ GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *scroll;
58 GtkUIManager* ui;
59 GtkActionGroup* act_grp;
60 GtkAction* act;
61@@ -537,7 +557,6 @@
62
63 self->popup = gtk_ui_manager_get_widget(ui, "/popup");
64
65- gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 );
66 gtk_box_pack_start( (GtkBox*)vbox, self->toolbar, FALSE, TRUE, 0 );
67
68 /* load bookmarks menu */
69@@ -586,6 +605,11 @@
70 gtk_container_add( (GtkContainer*)self, vbox );
71 gtk_widget_show_all(vbox);
72
73+ owl_menubar = ui_menubar_to_menu(menubar);
74+ gtk_widget_show_all (owl_menubar);
75+ owl_set_window_menu (GTK_WINDOW(self),
76+ GTK_MENU(owl_menubar));
77+
78 /* create new tab */
79 fm_main_win_add_tab(self, fm_path_get_home());
80 gtk_widget_grab_focus(self->folder_view);
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.7.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.7.bb
new file mode 100644
index 0000000000..46e46da685
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.7.bb
@@ -0,0 +1,35 @@
1DESCRIPTION = "Fast lightweight tabbed filemanager"
2HOMEPAGE = "http://pcmanfm.sourceforge.net/"
3BUGTRACKER = ""
4
5LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
7 file://src/pcmanfm.h;endline=22;md5=417b3855771a3a87f8ad753d994491f0 \
8 file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2"
9
10SECTION = "x11"
11PRIORITY = "optional"
12DEPENDS = "gtk+ startup-notification libfm"
13DEPENDS_append_poky = " libowl"
14
15PR = "r0"
16
17COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*)-(linux|freebsd.*)'
18
19SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
20 file://gnome-fs-directory.png \
21 file://gnome-fs-regular.png \
22 file://gnome-mime-text-plain.png \
23 file://emblem-symbolic-link.png \
24 file://cross-compile-fix.patch"
25
26SRC_URI_append_poky = " file://owl-window-menu.patch;patch=1"
27
28inherit autotools pkgconfig
29
30do_install_append () {
31 install -d ${D}/${datadir}
32 install -d ${D}/${datadir}/pixmaps/
33
34 install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps
35}
diff --git a/meta/recipes-sato/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc
new file mode 100644
index 0000000000..a424295aca
--- /dev/null
+++ b/meta/recipes-sato/pimlico/contacts.inc
@@ -0,0 +1,31 @@
1DESCRIPTION = "Address-book application."
2HOMEPAGE = "http://pimlico-project.org/contacts.html"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
6SECTION = "x11"
7DEPENDS = "glib-2.0 gtk+ eds-dbus"
8DEPENDS_append_poky = " libowl"
9RDEPENDS = "libedata-book"
10
11inherit autotools pkgconfig
12
13OWL = "--disable-owl"
14OWL_poky = "--enable-owl"
15
16EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
17EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
18
19do_install_append () {
20 install -d ${D}/${datadir}/pixmaps
21 install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
22 install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
23}
24
25FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
26 ${datadir}/pixmaps/stock_person.png"
27
28SRC_URI = "file://stock_contact.png \
29 file://stock_person.png"
30
31SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
diff --git a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
new file mode 100644
index 0000000000..4b9238b43a
--- /dev/null
+++ b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
@@ -0,0 +1,52 @@
1Index: contacts-0.9/src/contacts-gtk.c
2===================================================================
3--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
4+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100
5@@ -220,8 +220,8 @@
6 vbox7 = gtk_vbox_new (FALSE, 0);
7 gtk_container_add (GTK_CONTAINER (main_window), vbox7);
8
9- main_menubar = gtk_menu_bar_new ();
10- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0);
11+ main_menubar = gtk_menu_new ();
12+ gtk_widget_show (main_menubar);
13
14 contacts_menu = gtk_menu_item_new_with_mnemonic (_("C_ontacts"));
15 gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu);
16Index: contacts-0.9/src/Makefile.am
17===================================================================
18--- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100
19+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100
20@@ -40,7 +40,7 @@
21 contacts-@FRONTEND@.c \
22 contacts-@FRONTEND@.h
23
24-contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS)
25+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl
26
27 contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@
28
29Index: contacts-0.9/src/contacts-main.c
30===================================================================
31--- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100
32+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100
33@@ -27,6 +27,8 @@
34 #include <libgnomevfs/gnome-vfs.h>
35 #endif
36
37+#include <libowl/owlwindowmenu.h>
38+
39 #include "bacon-message-connection.h"
40 #include "contacts-defs.h"
41 #include "contacts-utils.h"
42@@ -266,6 +268,10 @@
43 gtk_widget_show_all (widget);
44 }
45
46+ gtk_widget_show_all (data->ui->main_menubar);
47+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window),
48+ GTK_MENU (data->ui->main_menubar));
49+
50 gtk_main ();
51
52 /* if we have modified the current contact, but not saved it, do so now */
diff --git a/meta/recipes-sato/pimlico/contacts/stock_contact.png b/meta/recipes-sato/pimlico/contacts/stock_contact.png
new file mode 100644
index 0000000000..123b4485ac
--- /dev/null
+++ b/meta/recipes-sato/pimlico/contacts/stock_contact.png
Binary files differ
diff --git a/meta/recipes-sato/pimlico/contacts/stock_person.png b/meta/recipes-sato/pimlico/contacts/stock_person.png
new file mode 100644
index 0000000000..2b1328b4e2
--- /dev/null
+++ b/meta/recipes-sato/pimlico/contacts/stock_person.png
Binary files differ
diff --git a/meta/recipes-sato/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb
new file mode 100644
index 0000000000..1e4628737d
--- /dev/null
+++ b/meta/recipes-sato/pimlico/contacts_0.9.bb
@@ -0,0 +1,5 @@
1require contacts.inc
2
3PR = "r2"
4
5SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb
new file mode 100644
index 0000000000..bff4e288db
--- /dev/null
+++ b/meta/recipes-sato/pimlico/contacts_git.bb
@@ -0,0 +1,17 @@
1require contacts.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
4 file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \
5 file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \
6 file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
7
8PV = "0.12+git${SRCPV}"
9PR = "r0"
10
11S = "${WORKDIR}/git"
12
13SRC_URI =+ "git://git.gnome.org/${PN};protocol=git"
14
15S = "${WORKDIR}/git"
16
17
diff --git a/meta/recipes-sato/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc
new file mode 100644
index 0000000000..6ef7b60611
--- /dev/null
+++ b/meta/recipes-sato/pimlico/dates.inc
@@ -0,0 +1,20 @@
1DESCRIPTION = "Dates is a calendar application."
2HOMEPAGE = "http://pimlico-project.org/dates.html"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"
6
7SECTION = "x11"
8DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
9RDEPENDS = "libedata-cal"
10
11inherit autotools pkgconfig gtk-icon-cache
12
13# Poky/Sato specific enhancements
14OWL = "--disable-owl"
15OWL_poky = "--enable-owl --disable-dnd"
16
17EXTRA_OECONF += "${OWL}"
18DEPENDS_append_poky = " libowl"
19SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
20
diff --git a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
new file mode 100644
index 0000000000..d5901658be
--- /dev/null
+++ b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
@@ -0,0 +1,65 @@
1---
2 src/dates_gtk.c | 5 -----
3 src/dates_main.c | 5 +++++
4 src/dates_platform.h | 2 +-
5 3 files changed, 7 insertions(+), 7 deletions(-)
6
7Index: git/src/dates_gtk.c
8===================================================================
9--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
10+++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100
11@@ -33,10 +33,6 @@
12 #endif
13
14 #ifndef DATES_PLATFORM_create_main_window
15-/* the default implementation assumes that menu is GtkMenuBar */
16-#ifdef DATES_MENU_WITHOUT_BAR
17-#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!!
18-#endif
19 static GtkWidget *
20 create_main_window (DatesData * d, GtkWidget * toolbar,
21 GtkWidget * menu, GtkAccelGroup * accel_group)
22@@ -59,7 +55,6 @@
23 gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
24
25 gtk_widget_show (menu);
26- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0);
27
28 gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
29 gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
30Index: git/src/dates_main.c
31===================================================================
32--- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100
33+++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100
34@@ -26,6 +26,8 @@
35 #include <libical/icaltime.h>
36 #include <gconf/gconf-client.h>
37
38+#include <gtk/gtkmenuitem.h>
39+#include <libowl/owlwindowmenu.h>
40 #include "dates_types.h"
41 #include "dates_platform.h"
42 #include "dates_callbacks.h"
43@@ -582,6 +584,9 @@
44 g_free (url_uri);
45 }
46
47+ owl_set_window_menu (GTK_WINDOW (data.main_window),
48+ GTK_MENU (data.main_menu));
49+
50 gtk_main ();
51
52 return 0;
53Index: git/src/dates_platform.h
54===================================================================
55--- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100
56+++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100
57@@ -20,7 +20,7 @@
58
59 #include "dates_types.h"
60
61-#ifdef WITH_HILDON
62+#if 1
63 #define DATES_MENU_WITHOUT_BAR 1
64 #endif
65
diff --git a/meta/recipes-sato/pimlico/dates_0.4.8.bb b/meta/recipes-sato/pimlico/dates_0.4.8.bb
new file mode 100644
index 0000000000..13afc157d0
--- /dev/null
+++ b/meta/recipes-sato/pimlico/dates_0.4.8.bb
@@ -0,0 +1,5 @@
1require dates.inc
2
3PR = "r3"
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
new file mode 100644
index 0000000000..49ca4eca86
--- /dev/null
+++ b/meta/recipes-sato/pimlico/dates_git.bb
@@ -0,0 +1,13 @@
1require dates.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
4 file://src/dates_view.h;endline=22;md5=29f934f356eb970309cdeb6693b3123a \
5 file://src/dates_hildon.c;endline=19;md5=63938904198b25de429abb65fbdbdb8a \
6 file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
7
8PV = "0.4.11+git${SRCPV}"
9PR = "r0"
10
11S = "${WORKDIR}/git"
12
13SRC_URI = "git://git.gnome.org/${PN};protocol=git"
diff --git a/meta/recipes-sato/pimlico/tasks.inc b/meta/recipes-sato/pimlico/tasks.inc
new file mode 100644
index 0000000000..7478408447
--- /dev/null
+++ b/meta/recipes-sato/pimlico/tasks.inc
@@ -0,0 +1,16 @@
1DESCRIPTION = "Task list application"
2HOMEPAGE = "http://pimlico-project.org/tasks.html"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2 & GPLv2+"
6
7SECTION = "x11"
8DEPENDS = "glib-2.0 gtk+ eds-dbus"
9DEPENDS_append_poky = " libowl"
10
11inherit autotools pkgconfig gtk-icon-cache
12
13OWL ?= "--disable-owl"
14OWL_poky ?= "--enable-owl"
15
16EXTRA_OECONF += "${OWL}"
diff --git a/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch b/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch
new file mode 100644
index 0000000000..6c458d2601
--- /dev/null
+++ b/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch
@@ -0,0 +1,26 @@
1commit ea52d46d691c5fce4473ea4e24a35411381f3a65
2Author: Ross Burton <ross@linux.intel.com>
3Date: Fri Aug 21 14:23:21 2009 +0100
4
5 Fix compilation on pre-GTK+ 2.16
6
7diff --git a/libkoto/koto-field-editor-factory.c b/libkoto/koto-field-editor-factory.c
8index bb776ab..d0e5328 100644
9--- a/libkoto/koto-field-editor-factory.c
10+++ b/libkoto/koto-field-editor-factory.c
11@@ -132,6 +132,7 @@ entry_set (GtkWidget *widget, icalproperty *prop)
12 * URL entries.
13 */
14
15+#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME
16 static void
17 url_entry_icon_clicked (GtkEntry *entry,
18 GtkEntryIconPosition icon_pos,
19@@ -146,7 +147,6 @@ url_entry_icon_clicked (GtkEntry *entry,
20 }
21 }
22
23-#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME
24 static void
25 on_url_entry_changed (GtkEntry *entry)
26 {
diff --git a/meta/recipes-sato/pimlico/tasks/tasks-owl.diff b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
new file mode 100644
index 0000000000..e4078066f5
--- /dev/null
+++ b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
@@ -0,0 +1,62 @@
1Index: src/gtk/tasks-ui.xml
2===================================================================
3--- src/gtk/tasks-ui.xml (revision 338)
4+++ src/gtk/tasks-ui.xml (working copy)
5@@ -7,17 +7,14 @@
6 <menuitem action="EditTask"/>
7 <menuitem action="CompleteTask"/>
8 <separator/>
9+ <menuitem action="Undo"/>
10+ <menuitem action="Redo"/>
11+ <separator/>
12 <menuitem action="DeleteTask"/>
13 <menuitem action="PurgeTasks"/>
14 <separator/>
15+ <menuitem action="About"/>
16 <menuitem action="Quit"/>
17 </menu>
18- <menu action="EditMenu">
19- <menuitem action="Undo"/>
20- <menuitem action="Redo"/>
21- </menu>
22- <menu action="HelpMenu">
23- <menuitem action="About"/>
24- </menu>
25 </menubar>
26 </ui>
27Index: src/gtk/main.c
28===================================================================
29--- src/gtk/main.c (revision 338)
30+++ src/gtk/main.c (working copy)
31@@ -21,6 +21,7 @@
32 #include <libecal/e-cal.h>
33 #include <glib/gi18n.h>
34 #include <gtk/gtk.h>
35+#include <libowl/owlwindowmenu.h>
36
37 #include <libkoto/ical-util.h>
38 #include <libkoto/koto-actions.h>
39@@ -564,8 +565,8 @@
40 gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
41 gtk_ui_manager_ensure_update (ui_manager);
42
43- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
44- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0);
45+ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu");
46+ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu));
47
48 box = gtk_vbox_new (FALSE, 4);
49 gtk_container_set_border_width (GTK_CONTAINER (box), 4);
50Index: src/gtk/Makefile.am
51===================================================================
52--- src/gtk/Makefile.am (revision 338)
53+++ src/gtk/Makefile.am (working copy)
54@@ -4,7 +4,7 @@
55 bin_PROGRAMS = tasks
56 tasks_CPPFLAGS = -I$(top_srcdir)/
57 tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
58-tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)
59+tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl
60
61 tasks_SOURCES = \
62 main.c \
diff --git a/meta/recipes-sato/pimlico/tasks_0.16.bb b/meta/recipes-sato/pimlico/tasks_0.16.bb
new file mode 100644
index 0000000000..999da76529
--- /dev/null
+++ b/meta/recipes-sato/pimlico/tasks_0.16.bb
@@ -0,0 +1,14 @@
1require tasks.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
4 file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \
5 file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \
6 file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52"
7
8SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
9 file://fix_pre-GTK+2.16.patch;apply=yes \
10 "
11
12OWL_poky = "--with-owl"
13
14PR = "r0"
diff --git a/meta/recipes-sato/pimlico/tasks_git.bb b/meta/recipes-sato/pimlico/tasks_git.bb
new file mode 100644
index 0000000000..1ab8cd18cd
--- /dev/null
+++ b/meta/recipes-sato/pimlico/tasks_git.bb
@@ -0,0 +1,8 @@
1require tasks.inc
2
3SRC_URI = "git://git.gnome.org/${PN};protocol=git"
4
5PV = "0.13+git${SRCPV}"
6PR = "r1"
7
8S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/puzzles/files/makedist_hack.patch b/meta/recipes-sato/puzzles/files/makedist_hack.patch
new file mode 100644
index 0000000000..d07e066026
--- /dev/null
+++ b/meta/recipes-sato/puzzles/files/makedist_hack.patch
@@ -0,0 +1,17 @@
1---
2 makedist.sh | 2 ++
3 1 file changed, 2 insertions(+)
4
5Index: puzzles/makedist.sh
6===================================================================
7--- puzzles.orig/makedist.sh 2007-05-17 11:49:59.000000000 +0100
8+++ puzzles/makedist.sh 2007-05-17 12:07:39.000000000 +0100
9@@ -30,6 +30,8 @@ fi
10
11 perl mkfiles.pl
12
13+exit 0
14+
15 mkdir tmp.$$
16 mkdir tmp.$$/puzzles$arcsuffix
17
diff --git a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
new file mode 100644
index 0000000000..61da9191a8
--- /dev/null
+++ b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
@@ -0,0 +1,198 @@
1Index: src/gtk.c
2===================================================================
3--- src/gtk.c (revision 22)
4+++ src/gtk.c (working copy)
5@@ -28,6 +28,8 @@
6 #include <gdk/gdkx.h>
7 #include <gdk-pixbuf/gdk-pixbuf.h>
8
9+#include <libowl/owlwindowmenu.h>
10+
11 #include <librsvg/rsvg.h>
12
13 #include <X11/Xlib.h>
14@@ -1237,6 +1239,7 @@
15 }
16 }
17
18+#if 0
19 static void
20 add_widget (GtkUIManager *merge,
21 GtkWidget *widget,
22@@ -1247,10 +1250,11 @@
23 gtk_box_pack_start (box, widget, FALSE, FALSE, 0);
24
25 toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box));
26- gtk_widget_show_all (toplevel);
27 }
28+#endif
29
30 static GtkActionEntry toplevel_actions[] = {
31+ { "Top", NULL, "" },
32 { "Game", NULL, N_("Game") },
33 { "Settings", NULL, N_("Settings") },
34 { "Help", NULL, N_("Help") },
35@@ -1303,11 +1307,13 @@
36 frontend *fe)
37 {
38 GString *xml;
39+ GError *error = NULL;
40 gboolean presets = FALSE;
41 GSList *radio_group = NULL;
42 int i;
43
44- xml = g_string_new ("<ui><menubar><placeholder name=\"TypePlaceholder\">"
45+ xml = g_string_new ("<ui><menubar><menu name=\"TopMenu\" action=\"Top\">"
46+ "<placeholder name=\"TypePlaceholder\">"
47 "<menu name=\"SettingsMenu\" action=\"Settings\">");
48
49 for (i = 0; i < midend_num_presets(fe->me); i++) {
50@@ -1359,8 +1365,14 @@
51 "<menuitem name=\"CustomMenu\" action=\"Custom\"/>");
52 }
53
54- g_string_append (xml, "</menu></placeholder></menubar></ui>");
55- gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, NULL);
56+ g_string_append (xml, "</menu></placeholder></menu></menubar></ui>");
57+
58+ gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, &error);
59+ if (error != NULL) {
60+ g_warning ("Error adding custom: %s", error->message);
61+ g_error_free (error);
62+ }
63+
64 g_string_free (xml, TRUE);
65 }
66
67@@ -1434,6 +1446,7 @@
68 new_window(char *arg, char **error)
69 {
70 frontend *fe;
71+ GError *err = NULL;
72 GtkBox *vbox;
73 GtkUIManager *merge;
74 GtkActionGroup *actions;
75@@ -1496,8 +1509,6 @@
76 gtk_window_add_accel_group(GTK_WINDOW(fe->window), fe->accelgroup);
77
78 merge = gtk_ui_manager_new ();
79- g_signal_connect (G_OBJECT (merge), "add_widget",
80- G_CALLBACK (add_widget), vbox);
81
82 actions = gtk_action_group_new ("PuzzleActions");
83 gtk_action_group_add_actions (actions, toplevel_actions,
84@@ -1509,22 +1520,39 @@
85
86 gtk_ui_manager_insert_action_group (merge, actions, 0);
87
88- gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml", NULL);
89+ gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml",
90+ &err);
91+ if (err != NULL) {
92+ g_warning ("Error making UI: %s", err->message);
93+ g_error_free (err);
94+ err = NULL;
95+ }
96
97 if (thegame.can_solve) {
98- char *str = "<ui><menubar><menu name=\"GameMenu\" action=\"Game\">"
99+ char *str = "<ui><menubar><menu name=\"TopMenu\" action=\"Top\">"
100+ "<menu name=\"GameMenu\" action=\"Game\">"
101 "<placeholder name=\"SolvePlaceholder\">"
102 "<separator name=\"SolveSep\"/>"
103 "<menuitem name=\"SolveMenu\" action=\"Solve\"/>"
104- "</placeholder></menu></menubar></ui>";
105+ "</placeholder></menu></menu></menubar></ui>";
106
107- gtk_ui_manager_add_ui_from_string (merge, str, -1, NULL);
108+ gtk_ui_manager_add_ui_from_string (merge, str, -1, &err);
109+ if (err != NULL) {
110+ g_warning ("Error adding solve. %s", err->message);
111+ g_error_free (err);
112+ }
113 }
114
115 if ((n = midend_num_presets(fe->me)) > 0 || thegame.can_configure) {
116 generate_settings_menu (merge, actions, fe);
117 }
118
119+ /* Do this so that the menu is packed now instead of in the idle loop */
120+ gtk_ui_manager_ensure_update (merge);
121+
122+ owl_set_window_menu_item (GTK_WINDOW (fe->window),
123+ GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/TopMenu")));
124+
125 setup_colours (fe);
126 setup_pixbufs (fe);
127
128@@ -1572,7 +1600,7 @@
129 GDK_BUTTON_RELEASE_MASK |
130 GDK_BUTTON_MOTION_MASK);
131
132- /* The window is shown once the menubar has been added */
133+ gtk_widget_show_all (fe->window);
134 return fe;
135 }
136
137Index: src/menu.xml
138===================================================================
139--- src/menu.xml (revision 22)
140+++ src/menu.xml (working copy)
141@@ -1,26 +1,25 @@
142 <ui>
143 <menubar>
144-<menu name="GameMenu" action="Game">
145- <menuitem name="NewMenu" action="New"/>
146- <menuitem name="RestartMenu" action="Restart"/>
147-<!-- <menuitem name="SpecificMenu" action="Specific"/> -->
148- <menuitem name="RandomMenu" action="Random"/>
149- <separator name="GameSep1"/>
150- <menuitem name="LoadMenu" action="Load"/>
151- <menuitem name="SaveMenu" action="Save"/>
152- <separator name="GameSep2"/>
153- <menuitem name="UndoMenu" action="Undo"/>
154- <menuitem name="RedoMenu" action="Redo"/>
155- <placeholder name="CopyPlaceholder"/>
156- <placeholder name="SolvePlaceholder"/>
157- <separator name="GameSep3"/>
158- <menuitem name="QuitMenu" action="Quit"/>
159-</menu>
160+<menu name="TopMenu" action="Top">
161+ <menu name="GameMenu" action="Game">
162+ <menuitem name="NewMenu" action="New"/>
163+ <menuitem name="RestartMenu" action="Restart"/>
164+ <!-- <menuitem name="SpecificMenu" action="Specific"/> -->
165+ <menuitem name="RandomMenu" action="Random"/>
166+ <separator name="GameSep1"/>
167+ <menuitem name="LoadMenu" action="Load"/>
168+ <menuitem name="SaveMenu" action="Save"/>
169+ <separator name="GameSep2"/>
170+ <menuitem name="UndoMenu" action="Undo"/>
171+ <menuitem name="RedoMenu" action="Redo"/>
172+ <placeholder name="CopyPlaceholder"/>
173+ <placeholder name="SolvePlaceholder"/>
174+ </menu>
175
176-<placeholder name="TypePlaceholder"/>
177-
178-<menu name="HelpMenu" action="Help">
179+ <placeholder name="TypePlaceholder"/>
180 <menuitem name="AboutMenu" action="About"/>
181+ <menuitem name="QuitMenu" action="Quit"/>
182+
183 </menu>
184 </menubar>
185 </ui>
186Index: src/Makefile.am
187===================================================================
188--- src/Makefile.am (revision 22)
189+++ src/Makefile.am (working copy)
190@@ -10,7 +10,7 @@
191 lightup loopy map mines net netslide pattern pegs rect samegame \
192 sixteen slant solo tents twiddle untangle
193
194-libpuzzles_la_LIBADD = $(PUZZLES_LIBS)
195+libpuzzles_la_LIBADD = $(PUZZLES_LIBS) -lowl
196 libpuzzles_la_SOURCES = combi.c \
197 configuration.c \
198 drawing.c \
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
new file mode 100644
index 0000000000..5fcea24b37
--- /dev/null
+++ b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
@@ -0,0 +1,69 @@
1DESCRIPTION = "Portable Puzzle Collection"
2HOMEPAGE = "http://o-hand.com/"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
7 file://src/tree234.h;endline=28;md5=a188e6d250430ca094a54a82f48472a7 \
8 file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945"
9
10SECTION = "x11"
11DEPENDS = "gtk+ gconf intltool-native librsvg"
12DEPENDS_append_poky = " libowl"
13
14PV = "0.1+svnr${SRCREV}"
15PR = "r10"
16
17bindir = "/usr/games"
18
19inherit autotools pkgconfig
20
21SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
22SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;patch=1;pnum=0 "
23
24S = "${WORKDIR}/${PN}"
25
26EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
27
28do_install_append () {
29 install -d ${D}/${datadir}/applications/
30
31 cd ${D}/${prefix}/games
32 for prog in *; do
33 if [ -x $prog ]; then
34 # Convert prog to Title Case
35 title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
36 echo "making ${D}/${datadir}/applications/$prog.desktop"
37 cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
38[Desktop Entry]
39Name=$title
40Exec=${prefix}/games/$prog
41Icon=applications-games
42Terminal=false
43Type=Application
44Categories=Game;
45StartupNotify=true
46X-MB-SingleInstance=true
47Comment=Play $title.
48STOP
49 fi
50 done
51}
52
53PACKAGES += ${PN}-extra
54RDEPENDS_${PN}-extra += "oh-puzzles"
55
56FILES_${PN} = "/usr/share/pixmaps /usr/share/oh-puzzles/"
57FILES_${PN}-dbg += "/usr/games/.debug/*"
58FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas"
59
60python __anonymous () {
61 import bb
62 var = bb.data.expand("FILES_${PN}", d, 1)
63 data = bb.data.getVar(var, d, 1)
64 for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
65 data = data + " /usr/games/%s" % name
66 data = data + " /usr/share/applications/%s.desktop" % name
67 data = data + " /etc/gconf/schemas/%s.schemas" % name
68 bb.data.setVar(var, data, d)
69}
diff --git a/meta/recipes-sato/puzzles/puzzles_r7593.bb b/meta/recipes-sato/puzzles/puzzles_r7593.bb
new file mode 100644
index 0000000000..eb1e009353
--- /dev/null
+++ b/meta/recipes-sato/puzzles/puzzles_r7593.bb
@@ -0,0 +1,53 @@
1
2DEPENDS = "gtk+ libxt"
3PR = "r8"
4MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}"
5
6#SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
7SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV} \
8 file://makedist_hack.patch;patch=1"
9
10S = "${WORKDIR}/${PN}"
11
12do_configure () {
13 ./makedist.sh ${MOD_PV}
14}
15
16do_compile_prepend = " \
17 export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \
18 export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; "
19
20FILES_${PN} = "${prefix}/games/* ${datadir}/applications/*"
21FILES_${PN}-dbg += "${prefix}/games/.debug"
22
23do_install () {
24 rm -rf ${D}/*
25 export prefix=${D}
26 export DESTDIR=${D}
27 install -d ${D}/${prefix}/
28 install -d ${D}/${prefix}/games/
29 oe_runmake install
30
31 install -d ${D}/${datadir}/
32 install -d ${D}/${datadir}/applications/
33
34 cd ${D}/${prefix}/games
35 for prog in *; do
36 if [ -x $prog ]; then
37 # Convert prog to Title Case
38 title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
39 echo "making ${D}/${datadir}/applications/$prog.desktop"
40 cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
41[Desktop Entry]
42Name=$title
43Exec=${prefix}/games/$prog
44Icon=applications-games
45Terminal=false
46Type=Application
47Categories=Game;
48StartupNotify=true
49X-MB-SingleInstance=true
50STOP
51 fi
52 done
53}
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
new file mode 100644
index 0000000000..a1669c6f2e
--- /dev/null
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
@@ -0,0 +1,24 @@
1DESCRIPTION = "Sato Icon Theme"
2HOMEPAGE = "http://www.o-hand.com"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "CCPL"
6LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
7
8SECTION = "x11"
9DEPENDS = ""
10
11inherit autotools pkgconfig
12
13FILES_${PN} += "${datadir}"
14
15PACKAGE_ARCH = "all"
16
17EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
18
19pkg_postinst_${PN} () {
20 if [ "x$D" != "x" ]; then
21 exit 1
22 fi
23 gtk-update-icon-cache -q /usr/share/icons/Sato
24}
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
new file mode 100644
index 0000000000..cfa6a0dd18
--- /dev/null
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
@@ -0,0 +1,51 @@
1pkg-config will only search the target sysroot and we want the native script. This
2patch adds an option to allow the path to the tool to be specified.
3
4RP - 12/8/10
5
6Index: sato-icon-theme-0.4.1/configure.ac
7===================================================================
8--- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100
9+++ sato-icon-theme-0.4.1/configure.ac 2010-08-12 12:48:14.000000000 +0100
10@@ -11,20 +11,29 @@
11
12 UTILS_REQUIRED=0.8.2
13
14-AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
15-PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
16- have_utils=yes, have_utils=no)
17-if test "x$have_utils" = "xyes"; then
18- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
19- ICONMAP="$UTILS_PATH/icon-name-mapping"
20- AC_SUBST(ICONMAP)
21- AC_MSG_RESULT([yes])
22-else
23- AC_MSG_RESULT([no])
24- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
25- and install sato-icon-theme])
26+PKG_PROG_PKG_CONFIG()
27+
28+AC_ARG_WITH(iconmap,
29+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
30+ ICONMAP=$withval, ICONMAP="")
31+
32+if test "x$ICONMAP" = "x"; then
33+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
34+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
35+ have_utils=yes, have_utils=no)
36+ if test "x$have_utils" = "xyes"; then
37+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
38+ ICONMAP="$UTILS_PATH/icon-name-mapping"
39+
40+ AC_MSG_RESULT([yes])
41+ else
42+ AC_MSG_RESULT([no])
43+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
44+ and install sato-icon-theme])
45+ fi
46 fi
47
48+AC_SUBST(ICONMAP)
49
50 AC_CONFIG_FILES([
51 Makefile
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
new file mode 100644
index 0000000000..aa976b1022
--- /dev/null
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -0,0 +1,6 @@
1require sato-icon-theme.inc
2
3DEPENDS += "icon-naming-utils-native"
4
5SRC_URI = "http://pokylinux.org/releases/sato/${PN}-${PV}.tar.gz \
6 file://iconpath-option.patch"
diff --git a/meta/recipes-sato/screenshot/screenshot_svn.bb b/meta/recipes-sato/screenshot/screenshot_svn.bb
new file mode 100644
index 0000000000..a95ba2d54d
--- /dev/null
+++ b/meta/recipes-sato/screenshot/screenshot_svn.bb
@@ -0,0 +1,21 @@
1DESCRIPTION = "An ultra-simple screen capture utility, aimed at handheld devices"
2HOMEPAGE = "http://www.o-hand.com"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2 & GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \
8 file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
9
10PRIORITY = "optional"
11DEPENDS = "matchbox-panel-2"
12PV = "0.0+svnr${SRCREV}"
13
14SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
15
16S = ${WORKDIR}/${PN}
17
18inherit autotools pkgconfig
19
20FILES_${PN} += "${libdir}/matchbox-panel/*.so"
21FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
diff --git a/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh b/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
new file mode 100644
index 0000000000..95374135f2
--- /dev/null
+++ b/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
@@ -0,0 +1 @@
/usr/bin/settings-daemon &
diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
new file mode 100644
index 0000000000..e06f02917b
--- /dev/null
+++ b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
@@ -0,0 +1,47 @@
1Index: settings-daemon/settings-daemon.c
2===================================================================
3--- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100
4+++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100
5@@ -187,6 +187,10 @@
6 GCONF_VALUE_STRING, translate_string_string },
7 { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme",
8 GCONF_VALUE_STRING, translate_string_string },
9+ { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName",
10+ GCONF_VALUE_STRING, translate_string_string },
11+ { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" ,
12+ GCONF_VALUE_BOOL, translate_bool_int },
13 };
14
15 static const TranslationEntry*
16Index: settings-daemon/settings-daemon.schemas
17===================================================================
18--- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100
19+++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100
20@@ -196,6 +196,27 @@
21 </locale>
22 </schema>
23
24+ <schema>
25+ <key>/schemas/desktop/gnome/sound/theme_name</key>
26+ <applyto>/desktop/gnome/sound/theme_name</applyto>
27+ <owner>gnome</owner>
28+ <type>string</type>
29+ <default>freedesktop</default>
30+ <locale name="C">
31+ <short>Sound Theme Name</short>
32+ </locale>
33+ </schema>
34+
35+ <schema>
36+ <key>/schemas/desktop/gnome/sound/event_sounds</key>
37+ <applyto>/desktop/gnome/sound/event_sounds</applyto>
38+ <owner>gnome</owner>
39+ <type>bool</type>
40+ <default>true</default>
41+ <locale name="C">
42+ <short>Enable Sound Events</short>
43+ </locale>
44+ </schema>
45
46 </schemalist>
47 </gconfschemafile>
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb b/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb
new file mode 100644
index 0000000000..4d1d9baf40
--- /dev/null
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb
@@ -0,0 +1,26 @@
1DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
2HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4LICENSE = "MIT-style"
5LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
6 file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
7DEPENDS = "gconf glib-2.0 gtk+"
8SECTION = "x11"
9PV = "0.0+svnr${SRCREV}"
10
11PR = "r3"
12
13SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
14 file://addsoundkeys.patch;apply=yes \
15 file://70settings-daemon.sh"
16
17S = "${WORKDIR}/${PN}"
18
19inherit autotools pkgconfig gconf
20
21FILES_${PN} = "${bindir}/* ${sysconfdir}"
22
23do_install_append () {
24 install -d ${D}/${sysconfdir}/X11/Xsession.d
25 install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/
26}
diff --git a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb
new file mode 100644
index 0000000000..651d481893
--- /dev/null
+++ b/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb
@@ -0,0 +1,31 @@
1#
2# Copyright (C) 2007-2008 OpenedHand Ltd.
3#
4
5DESCRIPTION = "X11 Pimlico Appications List"
6LICENSE = "MIT"
7PR = "r27"
8
9PACKAGES = "\
10 task-poky-apps-x11-pimlico \
11 task-poky-apps-x11-pimlico-dbg \
12 task-poky-apps-x11-pimlico-dev \
13 "
14
15PACKAGE_ARCH = "${MACHINE_ARCH}"
16
17ALLOW_EMPTY = "1"
18
19WEB = "web-webkit"
20# WebKit takes too much space to fit on some devices
21# List here for now...
22WEB_c7x0 = ""
23WEB_mx31ads = ""
24
25RDEPENDS_task-poky-apps-x11-pimlico = "\
26 eds-dbus \
27 contacts \
28 dates \
29 tasks \
30 gaku \
31 ${WEB}"
diff --git a/meta/recipes-sato/tasks/task-poky-x11-sato.bb b/meta/recipes-sato/tasks/task-poky-x11-sato.bb
new file mode 100644
index 0000000000..1b344edb54
--- /dev/null
+++ b/meta/recipes-sato/tasks/task-poky-x11-sato.bb
@@ -0,0 +1,30 @@
1#
2# Copyright (C) 2007-2008 OpenedHand Ltd.
3#
4
5DESCRIPTION = "Sato Tasks for Poky"
6LICENSE = "MIT"
7PR = "r29"
8
9PACKAGES = "\
10 task-poky-x11-sato \
11 task-poky-x11-sato-dbg \
12 task-poky-x11-sato-dev \
13 "
14
15PACKAGE_ARCH = "${MACHINE_ARCH}"
16
17ALLOW_EMPTY = "1"
18
19NETWORK_MANAGER ?= "networkmanager-applet"
20RDEPENDS_task-poky-x11-sato = "\
21 matchbox-desktop \
22 matchbox-session-sato \
23 matchbox-keyboard \
24 matchbox-stroke \
25 matchbox-config-gtk \
26 xcursor-transparent-theme \
27 sato-icon-theme \
28 settings-daemon \
29 gtk-sato-engine \
30 ${NETWORK_MANAGER}"
diff --git a/meta/recipes-sato/web/web-webkit/link-with-g++.patch b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
new file mode 100644
index 0000000000..50d6e93792
--- /dev/null
+++ b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
@@ -0,0 +1,32 @@
1The main webkit library links against stdc++ so we need to use g++ for
2linking. The easiest way to achieve this is to add a dummy cpp file.
3This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset.
4
5RP - 14/4/08
6--- webkit.orig/src/Makefile.am
7+++ webkit/src/Makefile.am
8@@ -1,11 +1,11 @@
9 AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\"
10 AM_CFLAGS = -Wall -export-dynamic $(WEB_CFLAGS)
11
12 bin_PROGRAMS = web2
13
14-web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h
15+web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h dummy.cpp
16 web2_LDADD = $(WEB_LIBS)
17
18 MAINTAINERCLEANFILES = config.h.in Makefile.in
19
20 uidir = $(pkgdatadir)
21Index: webkit/configure.ac
22===================================================================
23--- webkit.orig/configure.ac 2008-04-14 22:15:25.000000000 +0100
24+++ webkit/configure.ac 2008-04-14 22:16:31.000000000 +0100
25@@ -7,6 +7,7 @@
26
27 AC_ISC_POSIX
28 AC_PROG_CC
29+AC_PROG_CXX
30 AC_STDC_HEADERS
31 AC_PROG_LIBTOOL
32
diff --git a/meta/recipes-sato/web/web-webkit_svn.bb b/meta/recipes-sato/web/web-webkit_svn.bb
new file mode 100644
index 0000000000..9cdf1f9da3
--- /dev/null
+++ b/meta/recipes-sato/web/web-webkit_svn.bb
@@ -0,0 +1,26 @@
1DESCRIPTION = "Multi-platform web browsing application."
2HOMEPAGE = "http://o-hand.com/"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "GPLv2"
6
7SECTION = "x11"
8DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl"
9
10PV = "0.0+svnr${SRCREV}"
11PR = "r2"
12
13SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \
14 file://link-with-g++.patch;patch=1"
15
16S = "${WORKDIR}/webkit"
17
18EXTRA_OECONF = "--enable-libowl"
19
20inherit autotools pkgconfig gconf
21
22do_configure_prepend() {
23 touch ${S}/src/dummy.cpp
24}
25
26FILES_${PN} += "${datadir}/web2"
diff --git a/meta/recipes-sato/web/web/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch
new file mode 100644
index 0000000000..6e60dd0893
--- /dev/null
+++ b/meta/recipes-sato/web/web/owl-window-menu.patch
@@ -0,0 +1,100 @@
1Index: trunk/src/web_main.c
2===================================================================
3--- trunk.orig/src/web_main.c 2007-04-19 15:41:44.000000000 +0100
4+++ trunk/src/web_main.c 2007-04-26 07:43:23.000000000 +0100
5@@ -20,6 +20,8 @@
6 #include "web_bookmarks.h"
7 #include "web_request.h"
8
9+#include <libowl/owlwindowmenu.h>
10+
11 static void
12 copy_cb (GtkWindow *main_window)
13 {
14@@ -833,10 +835,8 @@
15 main (int argc, char **argv)
16 {
17 GtkWidget *widget;
18-#ifdef WITH_HILDON
19 GList *children, *c;
20 GtkMenu *menu;
21-#endif
22 WebPages pages;
23 GConfClient *client;
24 GModule *module;
25@@ -889,33 +889,12 @@
26 WEB_API_VERSION, pages.backend->api_version);
27 pages.backend->init (&(pages.backend_data), &pages);
28
29-#ifdef WITH_HILDON
30- osso_initialize ("web", "0.0", FALSE, NULL);
31- pages.appview = hildon_appview_new ("");
32- pages.window = hildon_app_new_with_appview (pages.appview);
33- hildon_app_set_title (pages.window, "Web");
34- gtk_widget_show (pages.appview);
35-
36- /* Reparent widgets to hildon appview */
37- widget = glade_xml_get_widget (pages.xml, "main_vbox");
38- gtk_container_remove (
39- GTK_CONTAINER (gtk_widget_get_parent (widget)),
40- g_object_ref (widget));
41- gtk_container_add (GTK_CONTAINER (pages.appview), widget);
42-
43- widget = glade_xml_get_widget (pages.xml, "main_toolbar");
44- gtk_container_remove (
45- GTK_CONTAINER (gtk_widget_get_parent (widget)),
46- g_object_ref (widget));
47- gtk_box_pack_end (GTK_BOX (pages.appview->vbox),
48- widget, TRUE, TRUE, 0);
49- gtk_widget_show_all (GTK_WIDGET (pages.appview->vbox));
50-
51- gtk_widget_destroy (glade_xml_get_widget (pages.xml, "main_window"));
52+ pages.window = glade_xml_get_widget (pages.xml, "main_window");
53
54 /* Reparent menu items */
55 widget = glade_xml_get_widget (pages.xml, "main_menubar");
56- menu = hildon_appview_get_menu (pages.appview);
57+ menu = gtk_menu_new ();
58+
59 children = gtk_container_get_children (GTK_CONTAINER (widget));
60 for (c = children; c; c = c->next) {
61 GtkWidget *menuitem = GTK_WIDGET (c->data);
62@@ -926,12 +905,6 @@
63 gtk_widget_destroy (widget);
64 g_list_free (children);
65
66- g_signal_connect (G_OBJECT (pages.window),
67- "key_press_event", G_CALLBACK (web_key_press_cb), &pages);
68-#else
69- pages.window = glade_xml_get_widget (pages.xml, "main_window");
70-#endif
71-
72 web_bookmarks_init (&pages);
73
74 /* Set history menus */
75@@ -1064,6 +1037,8 @@
76
77 gtk_widget_show (pages.window);
78
79+ owl_set_window_menu (GTK_WINDOW(pages.window), GTK_MENU(menu));
80+
81 gtk_main ();
82
83 g_module_close (module);
84Index: trunk/configure.ac
85===================================================================
86--- trunk.orig/configure.ac 2007-04-19 15:41:44.000000000 +0100
87+++ trunk/configure.ac 2007-04-25 20:36:34.000000000 +0100
88@@ -14,6 +14,12 @@
89
90 PKG_CHECK_MODULES(WEB, libxml-2.0 glib-2.0 gthread-2.0 gtk+-2.0 libglade-2.0 gconf-2.0 gobject-2.0)
91
92+OWL_CFLAGS=""
93+OWL_LIBS="-lowl"
94+
95+WEB_CFLAGS="$WEB_CFLAGS $OWL_CFLAGS"
96+WEB_LIBS="$WEB_LIBS $OWL_LIBS"
97+
98 # -- Hildon stuff for Maemo
99 hildon=false
100 AC_ARG_ENABLE(hildon,AS_HELP_STRING([--enable-hildon],[Turn on hildon support]),[
diff --git a/meta/recipes-sato/web/web_svn.bb b/meta/recipes-sato/web/web_svn.bb
new file mode 100644
index 0000000000..583be4aa24
--- /dev/null
+++ b/meta/recipes-sato/web/web_svn.bb
@@ -0,0 +1,16 @@
1LICENSE = "GPL"
2SECTION = "x11"
3DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl"
4DESCRIPTION = "Web is a multi-platform web browsing application."
5PR = "r2"
6
7PV = "0.0+svnr${SRCREV}"
8
9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
10 file://owl-window-menu.patch;patch=1 \
11 "
12
13S = "${WORKDIR}/trunk"
14
15inherit autotools pkgconfig gconf
16