diff options
Diffstat (limited to 'meta/recipes-sato')
71 files changed, 2581 insertions, 0 deletions
diff --git a/meta/recipes-sato/gaku/gaku_git.bb b/meta/recipes-sato/gaku/gaku_git.bb new file mode 100644 index 0000000000..5e1cba55fa --- /dev/null +++ b/meta/recipes-sato/gaku/gaku_git.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | SUMMARY = "Simple music player using GTK+ and GStreamer" | ||
2 | LICENSE = "GPLv2+" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | ||
4 | file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a" | ||
5 | DEPENDS = "gtk+ gstreamer libowl-av" | ||
6 | |||
7 | RDEPENDS_${PN} = "gst-plugins-base-audioconvert \ | ||
8 | gst-plugins-base-audioresample \ | ||
9 | gst-plugins-base-typefindfunctions \ | ||
10 | gst-plugins-base-playbin" | ||
11 | |||
12 | RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ | ||
13 | gst-plugins-base-vorbis \ | ||
14 | gst-plugins-base-alsa \ | ||
15 | gst-plugins-base-ogg \ | ||
16 | ${COMMERCIAL_AUDIO_PLUGINS}" | ||
17 | |||
18 | SRCREV = "a0be2fe4b5f12b8b07f4e3bd624b3729657f0ac5" | ||
19 | PV = "0.1+git${SRCPV}" | ||
20 | |||
21 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
22 | |||
23 | S = "${WORKDIR}/git" | ||
24 | |||
25 | inherit 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..4e37ff2047 --- /dev/null +++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "Sato theme engine for GTK+" | ||
2 | HOMEPAGE = "http://www.o-hand.com" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "LGPLv2.1 & LGPLv2+" | ||
6 | |||
7 | SECTION = "x11/base" | ||
8 | DEPENDS = "gtk+" | ||
9 | RDEPENDS_gtk-theme-sato = "gtk-sato-engine" | ||
10 | |||
11 | PACKAGES += "gtk-theme-sato" | ||
12 | FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so " | ||
13 | FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*.la" | ||
14 | FILES_${PN}-dbg += " ${libdir}/gtk-2.0/*/engines/.debug" | ||
15 | FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes" | ||
16 | |||
17 | inherit autotools-brokensep pkgconfig | ||
18 | |||
19 | do_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_git.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb new file mode 100644 index 0000000000..da4d98ad48 --- /dev/null +++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require gtk-sato-engine.inc | ||
2 | |||
3 | LIC_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 | |||
7 | SRCREV = "4740ad8d53aba4368ce3e03b06cfdc69eb86dcdc" | ||
8 | PV = "0.3.3+git${SRCPV}" | ||
9 | |||
10 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" | ||
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb new file mode 100644 index 0000000000..7fa69d0997 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-dev.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require core-image-sato.bb | ||
2 | |||
3 | DESCRIPTION = "Image with Sato for development work. It includes everything \ | ||
4 | within core-image-sato plus a native toolchain, application development and \ | ||
5 | testing libraries, profiling and debug symbols." | ||
6 | |||
7 | IMAGE_FEATURES += "dev-pkgs" | ||
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb new file mode 100644 index 0000000000..5b02303f8e --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require core-image-sato.bb | ||
2 | |||
3 | DESCRIPTION = "Image with Sato support that includes everything within \ | ||
4 | core-image-sato plus meta-toolchain, development headers and libraries to \ | ||
5 | form a standalone SDK." | ||
6 | |||
7 | QT4PKG = "qt4-pkgs" | ||
8 | QT4PKG_mips64 = "" | ||
9 | QT4PKG_mips64n32 = "" | ||
10 | |||
11 | IMAGE_FEATURES += "dev-pkgs tools-sdk ${QT4PKG} \ | ||
12 | tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" | ||
13 | |||
14 | IMAGE_INSTALL += "kernel-dev" | ||
15 | |||
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb new file mode 100644 index 0000000000..e3246d2b67 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ | ||
2 | mobile devices. The image supports X11 with a Sato theme, Pimlico \ | ||
3 | applications, and contains terminal, editor, and file manager." | ||
4 | |||
5 | IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs" | ||
6 | |||
7 | LICENSE = "MIT" | ||
8 | |||
9 | inherit core-image | ||
10 | |||
11 | IMAGE_INSTALL += "packagegroup-core-x11-sato-games" | ||
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] | ||
2 | Name=Notes | ||
3 | Exec=/usr/bin/leafpad | ||
4 | Comment=Text Editor | ||
5 | Icon=accessories-text-editor | ||
6 | Terminal=false | ||
7 | Type=Application | ||
8 | Categories=GTK;Utility;TextEditor; | ||
9 | X-MB-SingleInstance=true | ||
10 | StartupNotify=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..2ebf74a6f7 --- /dev/null +++ b/meta/recipes-sato/leafpad/files/owl-menu.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | Upstream-Status: Inappropriate [enable feature] | ||
2 | |||
3 | --- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100 | ||
4 | +++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100 | ||
5 | @@ -152,7 +152,7 @@ | ||
6 | } | ||
7 | |||
8 | accel_group = gtk_accel_group_new(); | ||
9 | - ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group); | ||
10 | + ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group); | ||
11 | gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL); | ||
12 | gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL); | ||
13 | gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); | ||
14 | |||
15 | --- tmp/src/window.c.orig 2007-04-23 12:14:07.000000000 +0100 | ||
16 | +++ tmp/src/window.c 2007-04-23 12:14:07.000000000 +0100 | ||
17 | @@ -18,6 +18,8 @@ | ||
18 | */ | ||
19 | |||
20 | #include "leafpad.h" | ||
21 | +#include <libowl/owlwindowmenu.h> | ||
22 | + | ||
23 | /* | ||
24 | static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view) | ||
25 | { | ||
26 | @@ -52,7 +54,6 @@ | ||
27 | gtk_container_add(GTK_CONTAINER(window), vbox); | ||
28 | |||
29 | menubar = create_menu_bar(window); | ||
30 | - gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); | ||
31 | |||
32 | sw = gtk_scrolled_window_new(NULL, NULL); | ||
33 | gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), | ||
34 | |||
35 | --- tmp/src/main.c.orig 2007-04-23 12:15:03.000000000 +0100 | ||
36 | +++ tmp/src/main.c 2007-04-23 12:15:03.000000000 +0100 | ||
37 | @@ -244,6 +244,7 @@ | ||
38 | Conf *conf; | ||
39 | GtkItemFactory *ifactory; | ||
40 | gchar *stdin_data = NULL; | ||
41 | + GtkWidget *menu; | ||
42 | |||
43 | bindtextdomain(PACKAGE, LOCALEDIR); | ||
44 | bind_textdomain_codeset(PACKAGE, "UTF-8"); | ||
45 | @@ -293,7 +294,10 @@ | ||
46 | conf->autoindent); | ||
47 | |||
48 | gtk_widget_show_all(pub->mw->window); | ||
49 | + owl_set_window_menu (GTK_WINDOW(pub->mw->window), | ||
50 | + GTK_MENU(pub->mw->menubar)); | ||
51 | + | ||
52 | g_free(conf->fontname); | ||
53 | g_free(conf); | ||
54 | |||
55 | |||
56 | --- tmp/src/Makefile.am.orig 2007-04-23 12:17:54.000000000 +0100 | ||
57 | +++ tmp/src/Makefile.am 2007-04-23 12:17:54.000000000 +0100 | ||
58 | @@ -27,4 +27,4 @@ | ||
59 | i18n.h | ||
60 | |||
61 | leafpad_CFLAGS = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS) | ||
62 | -leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) | ||
63 | +leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -lowl | ||
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb new file mode 100644 index 0000000000..830c053b6b --- /dev/null +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "Simple GTK+ Text Editor" | ||
2 | HOMEPAGE = "http://tarot.freeshell.org/leafpad/" | ||
3 | |||
4 | LICENSE = "GPLv2 & GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
6 | file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \ | ||
7 | file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571" | ||
8 | |||
9 | DEPENDS = "gtk+ intltool-native" | ||
10 | DEPENDS_append_poky = " libowl" | ||
11 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ | ||
12 | file://leafpad.desktop" | ||
13 | |||
14 | SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97" | ||
15 | SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c" | ||
16 | PR = "r2" | ||
17 | |||
18 | SRC_URI_append_poky = " file://owl-menu.patch;apply=yes " | ||
19 | |||
20 | inherit autotools pkgconfig | ||
21 | |||
22 | EXTRA_OECONF = " --enable-chooser --disable-emacs --disable-print" | ||
23 | |||
24 | do_install_append () { | ||
25 | install -d ${D}/${datadir} | ||
26 | install -d ${D}/${datadir}/applications | ||
27 | install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications | ||
28 | } | ||
29 | |||
30 | FILES_${PN} += "${datadir}/applications/leafpad.desktop" | ||
31 | |||
32 | PACKAGES += "leafpad-stock-icons" | ||
33 | FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/" | ||
diff --git a/meta/recipes-sato/libowl/libowl_git.bb b/meta/recipes-sato/libowl/libowl_git.bb new file mode 100644 index 0000000000..3ccd3406bd --- /dev/null +++ b/meta/recipes-sato/libowl/libowl_git.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "OpenedHand Widget Library" | ||
2 | HOMEPAGE = "http://www.o-hand.com" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2 & LGPLv2+" | ||
6 | LIC_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 | |||
11 | SECTION = "libs" | ||
12 | DEPENDS = "gtk+" | ||
13 | SRCREV = "6ebc8ac8f8575278dd40a535cadefa26374e44b1" | ||
14 | PV = "0.1+git${SRCPV}" | ||
15 | |||
16 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit 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..825694962b --- /dev/null +++ b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: appearance/mb-appearance.c | ||
4 | =================================================================== | ||
5 | --- appearance/mb-appearance.c (revision 1614) | ||
6 | +++ appearance/mb-appearance.c (working copy) | ||
7 | @@ -300,11 +300,13 @@ | ||
8 | gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button), | ||
9 | gconf_value_get_string (value)); | ||
10 | } else if (strcmp (key, HANDED_KEY) == 0) { | ||
11 | +#if 0 | ||
12 | GEnumValue *e; | ||
13 | e = g_enum_get_value_by_name (g_type_class_ref (GTK_TYPE_CORNER_TYPE), | ||
14 | gconf_value_get_string (value)); | ||
15 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (handed_check), | ||
16 | e->value == GTK_CORNER_TOP_RIGHT); | ||
17 | +#endif | ||
18 | } | ||
19 | } | ||
20 | |||
21 | @@ -395,12 +397,13 @@ | ||
22 | gtk_container_add (GTK_CONTAINER (align), font_button); | ||
23 | |||
24 | /* Left/Right Handed */ | ||
25 | - | ||
26 | +#if 0 | ||
27 | frame = new_frame (_("Orientation"), &align); | ||
28 | gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0); | ||
29 | handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed")); | ||
30 | g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL); | ||
31 | gtk_container_add (GTK_CONTAINER (align), handed_check); | ||
32 | +#endif | ||
33 | |||
34 | gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); | ||
35 | 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_git.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb new file mode 100644 index 0000000000..f0119b7073 --- /dev/null +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "Matchbox GTK+ theme configuration application" | ||
2 | HOMEPAGE = "http://matchbox-project.org" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" | ||
8 | |||
9 | DEPENDS = "gconf gtk+" | ||
10 | RDEPENDS_${PN} = "settings-daemon" | ||
11 | |||
12 | SRCREV = "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" | ||
13 | PV = "0.0+git${SRCPV}" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | ||
18 | file://no-handed.patch;striplevel=0" | ||
19 | |||
20 | inherit autotools pkgconfig | ||
21 | |||
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb new file mode 100644 index 0000000000..1979cbb769 --- /dev/null +++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "Matchbox desktop folders for the Sato environment" | ||
2 | HOMEPAGE = "http://matchbox-project.org" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
7 | |||
8 | SECTION = "x11" | ||
9 | DEPENDS = "" | ||
10 | RCONFLICTS_${PN} = "matchbox-common" | ||
11 | |||
12 | SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07" | ||
13 | PV = "0.1+git${SRCPV}" | ||
14 | PR = "r1" | ||
15 | |||
16 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit autotools pkgconfig | ||
21 | |||
22 | FILES_${PN} += "${datadir}" | ||
diff --git a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch new file mode 100644 index 0000000000..388f51f07f --- /dev/null +++ b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | after gcc linking has changed, all the libraries must be explicitely specified to for linking. | ||
2 | This patch avoids this linking error: | ||
3 | |||
4 | | make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M | ||
5 | | ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-desktop main.o taku-category-bar.o desktop.o ../libtaku/libtaku.a -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -ldbus-1 -lpthread -lrt -lstartup-notification-1 ../libtaku/libinotify.a^M | ||
6 | | /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: F^A: invalid DSO for symbol `XFree' definition^M | ||
7 | | /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M | ||
8 | | collect2: ld returned 1 exit status^M | ||
9 | | make[2]: *** [matchbox-desktop] Error 1 | ||
10 | |||
11 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
12 | Date: 2011/01/11 | ||
13 | |||
14 | Upstream-Status: Accepted | ||
15 | |||
16 | Index: matchbox-desktop-2/configure.ac | ||
17 | =================================================================== | ||
18 | --- matchbox-desktop-2.orig/configure.ac | ||
19 | +++ matchbox-desktop-2/configure.ac | ||
20 | @@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then | ||
21 | AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled]) | ||
22 | fi | ||
23 | |||
24 | -PKG_CHECK_MODULES(GTK, gtk+-2.0) | ||
25 | +PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11]) | ||
26 | |||
27 | AC_ARG_ENABLE(startup_notification, | ||
28 | AC_HELP_STRING([--disable-startup-notification], [disable startup notification support]), | ||
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..120f086445 --- /dev/null +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "Matchbox Window Manager Desktop" | ||
2 | LICENSE = "GPLv2.0+" | ||
3 | DEPENDS = "libmatchbox startup-notification" | ||
4 | SECTION = "x11/wm" | ||
5 | |||
6 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2" | ||
7 | |||
8 | SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c" | ||
9 | SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793" | ||
10 | |||
11 | EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
14 | |||
15 | FILES_${PN} = "${bindir}/* \ | ||
16 | ${datadir}/applications \ | ||
17 | ${libdir}/matchbox/desktop/*.so \ | ||
18 | ${datadir}/matchbox-desktop \ | ||
19 | ${datadir}/pixmaps \ | ||
20 | ${sysconfdir}/matchbox" | ||
21 | |||
22 | FILES_${PN}-dev += "${libdir}/matchbox-desktop \ | ||
23 | ${includedir}/matchbox-desktop \ | ||
24 | ${libdir}/matchbox/desktop/*.*a \ | ||
25 | ${datadir}/matchbox/desktop/modules/*a" | ||
26 | |||
27 | FILES_${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..c52e7f2ca4 --- /dev/null +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | SUMMARY = "Matchbox Window Manager Desktop" | ||
2 | LICENSE = "GPLv2.0+" | ||
3 | DEPENDS = "gtk+ startup-notification" | ||
4 | SECTION = "x11/wm" | ||
5 | PR = "r2" | ||
6 | |||
7 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \ | ||
8 | file://dso_linking_change_build_fix.patch" | ||
9 | |||
10 | SRC_URI[md5sum] = "b0a4a47130272e2adab4e9feb43a6c9c" | ||
11 | SRC_URI[sha256sum] = "be33ff0bc8a9b1eee6af360a5118e470e69a6292ecc9e154ec6f349fce5c5f75" | ||
12 | |||
13 | EXTRA_OECONF = "--enable-startup-notification" | ||
14 | |||
15 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb new file mode 100644 index 0000000000..29b472a933 --- /dev/null +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "Matchbox Window Manager Desktop" | ||
2 | HOMEPAGE = "http://matchbox-project.org/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2+ & LGPLv2+" | ||
6 | LIC_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 | |||
11 | DEPENDS = "gtk+ startup-notification dbus" | ||
12 | SECTION = "x11/wm" | ||
13 | SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d" | ||
14 | PV = "2.0+git${SRCPV}" | ||
15 | |||
16 | SRC_URI = "git://git.yoctoproject.org/${BPN}-2" | ||
17 | |||
18 | EXTRA_OECONF = "--enable-startup-notification --with-dbus" | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
21 | |||
22 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh new file mode 100644 index 0000000000..6cf188b2d0 --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh | |||
@@ -0,0 +1,21 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . /etc/formfactor/config | ||
4 | |||
5 | CMD="" | ||
6 | |||
7 | if [ "$HAVE_KEYBOARD" = "0" ]; then | ||
8 | CMD="matchbox-keyboard -d" | ||
9 | elif [ "$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 | ||
15 | fi | ||
16 | |||
17 | if [ "$CMD" ]; then | ||
18 | # Delay to make sure the window manager is active | ||
19 | # by waiting for the desktop to say its finished loading | ||
20 | dbus-wait org.matchbox_project.desktop Loaded && $CMD & | ||
21 | fi | ||
diff --git a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch new file mode 100644 index 0000000000..18b6c41746 --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Multiple matchbox-keyboard instances would occupy whole screen and cause X | ||
2 | window segfault(Bug 509). Making matchbox-keyboard singleton is one work | ||
3 | around. | ||
4 | |||
5 | This patch allow only one instance of matchbox-keyboard based on some mechanism | ||
6 | in matchbox-desktop. In future, an applet and GTK-IM modules in | ||
7 | matchbox-keyboard can be used to automatically map/unmap the virtual keyboard | ||
8 | on demand. | ||
9 | |||
10 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
11 | |||
12 | Upstream-Status: Inappropriate [configuration] | ||
13 | |||
14 | Index: matchbox-keyboard/matchbox-keyboard.desktop | ||
15 | =================================================================== | ||
16 | --- matchbox-keyboard.orig/matchbox-keyboard.desktop 2010-12-22 20:41:40.000000000 +0800 | ||
17 | +++ matchbox-keyboard/matchbox-keyboard.desktop 2010-12-22 20:42:12.000000000 +0800 | ||
18 | @@ -6,3 +6,5 @@ | ||
19 | Icon=matchbox-keyboard.png | ||
20 | Categories=Panel;Utility;MB | ||
21 | X-MB-INPUT-MECHANSIM=True | ||
22 | +X-MB-SingleInstance=true | ||
23 | +StartupNotify=true | ||
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb new file mode 100644 index 0000000000..7a99a9c46a --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | |||
@@ -0,0 +1,53 @@ | |||
1 | SUMMARY = "Matchbox virtual keyboard for X11" | ||
2 | HOMEPAGE = "http://matchbox-project.org" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | SECTION = "x11" | ||
5 | |||
6 | LICENSE = "LGPLv2.1" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | ||
8 | file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \ | ||
9 | file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7" | ||
10 | |||
11 | DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" | ||
12 | |||
13 | SRCREV = "217f1bfe14c41cf7e291d04a63aa2d79cc13d063" | ||
14 | PV = "0.0+git${SRCPV}" | ||
15 | PR = "r4" | ||
16 | |||
17 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ | ||
18 | file://single-instance.patch \ | ||
19 | file://80matchboxkeyboard.sh" | ||
20 | |||
21 | S = "${WORKDIR}/git" | ||
22 | |||
23 | inherit autotools pkgconfig gettext gtk-immodules-cache | ||
24 | |||
25 | EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" | ||
26 | |||
27 | PACKAGES += "${PN}-im ${PN}-applet" | ||
28 | |||
29 | FILES_${PN} = "${bindir}/ \ | ||
30 | ${sysconfdir} \ | ||
31 | ${datadir}/applications \ | ||
32 | ${datadir}/pixmaps \ | ||
33 | ${datadir}/matchbox-keyboard" | ||
34 | |||
35 | FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug" | ||
36 | |||
37 | FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so" | ||
38 | |||
39 | FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" | ||
40 | |||
41 | |||
42 | do_install_append () { | ||
43 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ | ||
44 | install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ | ||
45 | |||
46 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la | ||
47 | rm -f ${D}${libdir}/matchbox-panel/*.la | ||
48 | } | ||
49 | |||
50 | GTKIMMODULES_PACKAGES = "${PN}-im" | ||
51 | |||
52 | RDEPENDS_${PN} = "formfactor dbus-wait" | ||
53 | RRECOMMENDS_${PN} = "${PN}-applet" | ||
diff --git a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch b/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch new file mode 100644 index 0000000000..45ba9a0318 --- /dev/null +++ b/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | Don't warn if the machine doesn't actually have a battery, or if the applets | ||
2 | string contains consecutive separators. | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c | ||
8 | index 6515cb0..c44dd12 100644 | ||
9 | --- a/applets/battery/battery-acpi.c | ||
10 | +++ b/applets/battery/battery-acpi.c | ||
11 | @@ -14,8 +14,6 @@ int batt_state, ac_state; | ||
12 | int pm_support(void) | ||
13 | { | ||
14 | if(check_acpi_support() == NOT_SUPPORTED){ | ||
15 | - g_warning("No ACPI support\n"); | ||
16 | - | ||
17 | return 0; | ||
18 | } | ||
19 | |||
20 | @@ -32,8 +30,9 @@ const char* pm_battery_icon(void) | ||
21 | const char *icon; | ||
22 | battery_t *binfo; | ||
23 | |||
24 | + /* No battery available (not present, disabled, or something | ||
25 | + else. Silently do nothing. */ | ||
26 | if (batt_state != SUCCESS) { | ||
27 | - g_warning("Couldnt initialize ACPI battery\n"); | ||
28 | return NULL; | ||
29 | } | ||
30 | |||
31 | diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c | ||
32 | index 5467438..2f39cb6 100644 | ||
33 | --- a/applets/battery/battery-apm.c | ||
34 | +++ b/applets/battery/battery-apm.c | ||
35 | @@ -10,8 +10,6 @@ | ||
36 | int pm_support(void) | ||
37 | { | ||
38 | if (1 == apm_exists ()) { | ||
39 | - g_warning ("No APM support"); | ||
40 | - | ||
41 | return 0; | ||
42 | } | ||
43 | |||
44 | diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c | ||
45 | index 2d8cafd..828a36d 100644 | ||
46 | --- a/matchbox-panel/mb-panel.c | ||
47 | +++ b/matchbox-panel/mb-panel.c | ||
48 | @@ -110,10 +110,15 @@ load_applets (const char *applets_desc, | ||
49 | applets = g_strsplit (applets_desc, ",", -1); | ||
50 | |||
51 | for (i = 0; applets[i]; i++) { | ||
52 | + char *s; | ||
53 | char **bits; | ||
54 | GtkWidget *applet; | ||
55 | |||
56 | - bits = g_strsplit (applets[i], ":", 2); | ||
57 | + s = applets[i]; | ||
58 | + if (s == NULL || s[0] == '\0') | ||
59 | + continue; | ||
60 | + | ||
61 | + bits = g_strsplit (s, ":", 2); | ||
62 | |||
63 | applet = load_applet (bits[0], | ||
64 | bits[1], | ||
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb new file mode 100644 index 0000000000..490e2bc86b --- /dev/null +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | |||
@@ -0,0 +1,36 @@ | |||
1 | SUMMARY = "Simple GTK+ based panel for handheld devices" | ||
2 | HOMEPAGE = "http://matchbox-project.org" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_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 | |||
10 | DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" | ||
11 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" | ||
12 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" | ||
13 | |||
14 | SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" | ||
15 | PV = "2.0+git${SRCPV}" | ||
16 | |||
17 | RPROVIDES_${PN} = "matchbox-panel" | ||
18 | RREPLACES_${PN} = "matchbox-panel" | ||
19 | RCONFLICTS_${PN} = "matchbox-panel" | ||
20 | |||
21 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | ||
22 | file://silence-warnings.patch" | ||
23 | |||
24 | EXTRA_OECONF = "--enable-startup-notification --enable-dbus" | ||
25 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" | ||
26 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" | ||
27 | |||
28 | S = "${WORKDIR}/git" | ||
29 | |||
30 | FILES_${PN} += "${libdir}/matchbox-panel/*.so \ | ||
31 | ${datadir}/matchbox-panel/brightness/*.png \ | ||
32 | ${datadir}/matchbox-panel/startup/*.png " | ||
33 | FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" | ||
34 | FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" | ||
35 | |||
36 | inherit autotools pkgconfig | ||
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..a3138b6961 --- /dev/null +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | |||
@@ -0,0 +1,29 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . /etc/formfactor/config | ||
4 | |||
5 | if [ "$HAVE_TOUCHSCREEN" = "1" ]; then | ||
6 | SHOWCURSOR="no" | ||
7 | else | ||
8 | SHOWCURSOR="yes" | ||
9 | fi | ||
10 | |||
11 | if [ "$HAVE_KEYBOARD" = "1" ]; then | ||
12 | KEYBOARD_APPLET="" | ||
13 | else | ||
14 | KEYBOARD_APPLET="keyboard" | ||
15 | fi | ||
16 | |||
17 | |||
18 | matchbox-desktop & | ||
19 | |||
20 | # Lines containing feature-[foo] are removed at build time if the machine | ||
21 | # doesn't have the feature "foo". | ||
22 | |||
23 | START_APPLETS=showdesktop,windowselector | ||
24 | END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify | ||
25 | END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone | ||
26 | |||
27 | matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS & | ||
28 | |||
29 | exec 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..fe84a0fc99 --- /dev/null +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb | |||
@@ -0,0 +1,46 @@ | |||
1 | SUMMARY = "Custom Matchbox session files for the Sato environment" | ||
2 | HOMEPAGE = "http://www.matchbox-project.org/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2.0+" | ||
6 | LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" | ||
7 | |||
8 | SECTION = "x11" | ||
9 | DEPENDS = "gconf-native" | ||
10 | RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf" | ||
11 | PR = "r30" | ||
12 | |||
13 | # This package is architecture specific because the session script is modified | ||
14 | # based on the machine architecture. | ||
15 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
16 | |||
17 | SRC_URI = "file://session" | ||
18 | S = "${WORKDIR}" | ||
19 | |||
20 | do_install() { | ||
21 | # This is the set of machine features that the script has markers for | ||
22 | FEATURES="phone" | ||
23 | SCRIPT="${S}/sedder" | ||
24 | rm -f $SCRIPT | ||
25 | touch $SCRIPT | ||
26 | for FEAT in $FEATURES; do | ||
27 | if echo ${MACHINE_FEATURES} | awk "/$FEAT/ {exit 1}"; then | ||
28 | echo "/feature-$FEAT/d" >> $SCRIPT | ||
29 | fi | ||
30 | done | ||
31 | |||
32 | install -d ${D}/${sysconfdir}/matchbox | ||
33 | sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session | ||
34 | chmod +x ${D}/${sysconfdir}/matchbox/session | ||
35 | } | ||
36 | |||
37 | pkg_postinst_${PN} () { | ||
38 | set_value() { | ||
39 | #type, name, value | ||
40 | gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3" | ||
41 | } | ||
42 | set_value string theme Sato | ||
43 | set_value string icon_theme Sato | ||
44 | set_value bool touchscreen true | ||
45 | set_value string font_name "Sans 9" | ||
46 | } | ||
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb new file mode 100644 index 0000000000..91fd150e3b --- /dev/null +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Lightweight GTK+ terminal application" | ||
2 | HOMEPAGE = "http://www.matchbox-project.org/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820" | ||
8 | |||
9 | DEPENDS = "gtk+ vte" | ||
10 | SECTION = "x11/utils" | ||
11 | SRCREV = "452bca253492a97a587f440289b9ab27d217353e" | ||
12 | PV = "0.0+git${SRCPV}" | ||
13 | |||
14 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | inherit autotools pkgconfig | ||
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..b0f8380f56 --- /dev/null +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc | |||
@@ -0,0 +1,13 @@ | |||
1 | SUMMARY = "Matchbox window manager Sato themes" | ||
2 | HOMEPAGE = "http://www.matchbox-project.org/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "CC-BY-SA-3.0" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=aae86bb34b0a83716ca09f4e783d6ba4" | ||
7 | |||
8 | DEPENDS = "matchbox-wm" | ||
9 | SECTION = "x11/wm" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
12 | |||
13 | FILES_${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..f6786dda5c --- /dev/null +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require matchbox-theme-sato.inc | ||
2 | |||
3 | PR = "r1" | ||
4 | |||
5 | SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz" | ||
6 | |||
7 | SRC_URI[md5sum] = "72ae272ef7803141a3dcb69e670cff97" | ||
8 | SRC_URI[sha256sum] = "5b59f9646edbfb907a309332db3bd6fa7080dc1fe24df549480cfae7d974a3fb" | ||
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb new file mode 100644 index 0000000000..0d3569de95 --- /dev/null +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require matchbox-theme-sato.inc | ||
2 | |||
3 | SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8" | ||
4 | PV = "0.2+git${SRCPV}" | ||
5 | |||
6 | DEFAULT_PREFERENCE = "-1" | ||
7 | |||
8 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato" | ||
9 | |||
10 | EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
diff --git a/meta/recipes-sato/midori/midori_0.5.5.bb b/meta/recipes-sato/midori/midori_0.5.5.bb new file mode 100644 index 0000000000..a9379e7fff --- /dev/null +++ b/meta/recipes-sato/midori/midori_0.5.5.bb | |||
@@ -0,0 +1,47 @@ | |||
1 | SUMMARY = "A lightweight web browser" | ||
2 | HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html" | ||
3 | LICENSE = "LGPLv2.1" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | ||
5 | DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libunique libxscrnsaver" | ||
6 | |||
7 | SRC_URI = "http://www.midori-browser.org/downloads/${BPN}_${PV}_all_.tar.bz2 \ | ||
8 | " | ||
9 | |||
10 | SRC_URI[md5sum] = "b99e87d4b73a4732ed1c1e591f0242ac" | ||
11 | SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62" | ||
12 | |||
13 | # midori depends on webkit-gtk, and webkit-gtk can NOT be built on | ||
14 | # MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. | ||
15 | COMPATIBLE_HOST_mips64 = "mips64.*-linux$" | ||
16 | |||
17 | inherit gtk-icon-cache pkgconfig vala pythonnative | ||
18 | |||
19 | do_configure() { | ||
20 | sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript | ||
21 | ./configure \ | ||
22 | --prefix=${prefix} \ | ||
23 | --bindir=${bindir} \ | ||
24 | --sbindir=${sbindir} \ | ||
25 | --libexecdir=${libexecdir} \ | ||
26 | --datadir=${datadir} \ | ||
27 | --sysconfdir=${sysconfdir} \ | ||
28 | --sharedstatedir=${sharedstatedir} \ | ||
29 | --localstatedir=${localstatedir} \ | ||
30 | --libdir=${libdir} \ | ||
31 | --includedir=${includedir} \ | ||
32 | --infodir=${infodir} \ | ||
33 | --mandir=${mandir} \ | ||
34 | --disable-gtk3 \ | ||
35 | --disable-zeitgeist \ | ||
36 | } | ||
37 | |||
38 | PARALLEL_MAKE = "" | ||
39 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
40 | |||
41 | do_install() { | ||
42 | oe_runmake DESTDIR=${D} install | ||
43 | } | ||
44 | |||
45 | RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" | ||
46 | |||
47 | FILES_${PN}-dev += "${datadir}/vala/vapi" | ||
diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb new file mode 100644 index 0000000000..3aabdd4385 --- /dev/null +++ b/meta/recipes-sato/midori/midori_0.5.8.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "A lightweight web browser" | ||
2 | HOMEPAGE = "http://midori-browser.org/" | ||
3 | LICENSE = "LGPLv2.1" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | ||
5 | DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver" | ||
6 | |||
7 | SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV}" | ||
8 | SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976" | ||
9 | SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381" | ||
10 | |||
11 | # midori depends on webkit-gtk, and webkit-gtk can NOT be built on | ||
12 | # MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. | ||
13 | COMPATIBLE_HOST_mips64n32 = "null" | ||
14 | |||
15 | inherit gtk-icon-cache pkgconfig vala pythonnative cmake | ||
16 | |||
17 | EXTRA_OECMAKE = " \ | ||
18 | -DCMAKE_INSTALL_PREFIX=${prefix} \ | ||
19 | -DUSE_ZEITGEIST=0 \ | ||
20 | " | ||
21 | |||
22 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
23 | |||
24 | RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" | ||
25 | |||
26 | FILES_${PN} += "${datadir}/appdata" | ||
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb new file mode 100644 index 0000000000..2b768d5916 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | SUMMARY = "OpenedHand Widget Library Audio/Video" | ||
2 | HOMEPAGE = "http://www.o-hand.com" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "LGPLv2+" | ||
6 | LIC_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 | |||
10 | SECTION = "x11" | ||
11 | DEPENDS = "gtk+ gstreamer gst-plugins-base" | ||
12 | RDEPENDS_${PN} = "gst-meta-base" | ||
13 | RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" | ||
14 | |||
15 | SRCREV = "03030c41ea578cfa74a2ffceb875675b248318ae" | ||
16 | PV = "0.1+git${SRCPV}" | ||
17 | PR = "r3" | ||
18 | |||
19 | |||
20 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
21 | |||
22 | S = "${WORKDIR}/git" | ||
23 | |||
24 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop b/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop new file mode 100644 index 0000000000..e7af07ee64 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop | |||
@@ -0,0 +1,10 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=Video | ||
3 | Exec=video | ||
4 | Icon=video-player | ||
5 | Terminal=false | ||
6 | Type=Application | ||
7 | Categories=AudioVideo;Video;Player; | ||
8 | X-MB-SingleInstance=true | ||
9 | StartupNotify=true | ||
10 | Comment=Video Player | ||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png b/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png new file mode 100644 index 0000000000..f463fe1864 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png | |||
Binary files differ | |||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png new file mode 100644 index 0000000000..c2b9c582a1 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png | |||
Binary files differ | |||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png new file mode 100644 index 0000000000..f3f57143d4 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png | |||
Binary files differ | |||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png new file mode 100644 index 0000000000..03f5a03b45 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png | |||
Binary files differ | |||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png new file mode 100644 index 0000000000..f774e42bb1 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png | |||
Binary files differ | |||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png new file mode 100644 index 0000000000..f3f57143d4 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png | |||
Binary files differ | |||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb new file mode 100644 index 0000000000..db83154846 --- /dev/null +++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb | |||
@@ -0,0 +1,41 @@ | |||
1 | SUMMARY = "OpenedHand Widget Library video widget" | ||
2 | HOMEPAGE = "http://o-hand.com/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | LICENSE = "LGPLv2.1 & GPLv2+" | ||
5 | LIC_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" | ||
8 | SECTION = "x11" | ||
9 | DEPENDS = "libowl-av" | ||
10 | |||
11 | SRCREV = "07ab48f331a5e6e0d169e4892c7eb1fc22dc0b9d" | ||
12 | PV = "0.1+git${SRCPV}" | ||
13 | PR = "r2" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | ||
18 | file://owl-video-widget.png \ | ||
19 | file://stock_media-play.png \ | ||
20 | file://stock_volume-0.png \ | ||
21 | file://stock_volume-min.png \ | ||
22 | file://stock_volume-med.png \ | ||
23 | file://stock_volume-max.png \ | ||
24 | file://owl-video-widget.desktop" | ||
25 | |||
26 | inherit autotools pkgconfig | ||
27 | |||
28 | do_install_append () { | ||
29 | install -d ${D}/${datadir}/pixmaps | ||
30 | install -m 0644 ${WORKDIR}/stock_media-play.png ${D}/${datadir}/pixmaps | ||
31 | install -m 0644 ${WORKDIR}/stock_volume-0.png ${D}/${datadir}/pixmaps | ||
32 | install -m 0644 ${WORKDIR}/stock_volume-min.png ${D}/${datadir}/pixmaps | ||
33 | install -m 0644 ${WORKDIR}/stock_volume-med.png ${D}/${datadir}/pixmaps | ||
34 | install -m 0644 ${WORKDIR}/stock_volume-max.png ${D}/${datadir}/pixmaps | ||
35 | install -m 0644 ${WORKDIR}/owl-video-widget.png ${D}/${datadir}/pixmaps | ||
36 | |||
37 | install -d ${D}/${datadir}/applications | ||
38 | install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications | ||
39 | } | ||
40 | |||
41 | FILES_${PN} += "${datadir}/video" | ||
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb new file mode 100644 index 0000000000..bc3e0fd260 --- /dev/null +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | |||
@@ -0,0 +1,63 @@ | |||
1 | # | ||
2 | # Copyright (C) 2007-2008 OpenedHand Ltd. | ||
3 | # | ||
4 | |||
5 | SUMMARY = "Sato desktop" | ||
6 | LICENSE = "MIT" | ||
7 | PR = "r33" | ||
8 | |||
9 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
10 | |||
11 | inherit packagegroup | ||
12 | |||
13 | PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" | ||
14 | |||
15 | RDEPENDS_${PN} = "\ | ||
16 | ${PN}-base \ | ||
17 | ${PN}-apps \ | ||
18 | ${PN}-games \ | ||
19 | " | ||
20 | |||
21 | NETWORK_MANAGER ?= "connman-gnome" | ||
22 | NETWORK_MANAGER_libc-uclibc = "" | ||
23 | |||
24 | SUMMARY_${PN}-base = "Sato desktop - base packages" | ||
25 | RDEPENDS_${PN}-base = "\ | ||
26 | matchbox-desktop \ | ||
27 | matchbox-session-sato \ | ||
28 | matchbox-keyboard \ | ||
29 | matchbox-keyboard-applet \ | ||
30 | matchbox-keyboard-im \ | ||
31 | matchbox-config-gtk \ | ||
32 | xcursor-transparent-theme \ | ||
33 | sato-icon-theme \ | ||
34 | settings-daemon \ | ||
35 | gtk-sato-engine \ | ||
36 | shutdown-desktop \ | ||
37 | libsdl \ | ||
38 | ${NETWORK_MANAGER} \ | ||
39 | udev-extraconf \ | ||
40 | " | ||
41 | |||
42 | # pcmanfm doesn't work on mips | ||
43 | FILEMANAGER ?= "pcmanfm" | ||
44 | FILEMANAGER_mips ?= "" | ||
45 | |||
46 | WEB ?= "" | ||
47 | #WEB = "midori" | ||
48 | |||
49 | SUMMARY_${PN}-apps = "Sato desktop - applications" | ||
50 | RDEPENDS_${PN}-apps = "\ | ||
51 | leafpad \ | ||
52 | gaku \ | ||
53 | x11vnc \ | ||
54 | matchbox-terminal \ | ||
55 | sato-screenshot \ | ||
56 | ${FILEMANAGER} \ | ||
57 | ${WEB} \ | ||
58 | " | ||
59 | |||
60 | SUMMARY_${PN}-games = "Sato desktop - games" | ||
61 | RDEPENDS_${PN}-games = "\ | ||
62 | oh-puzzles \ | ||
63 | " | ||
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/no-desktop.patch b/meta/recipes-sato/pcmanfm/files/no-desktop.patch new file mode 100644 index 0000000000..103d6d14a2 --- /dev/null +++ b/meta/recipes-sato/pcmanfm/files/no-desktop.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Disable the desktop preferences launcher as we don't use the pcmanfm desktop in | ||
2 | Sato. | ||
3 | |||
4 | Upstream-Status: Inappropriate | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/data/pcmanfm-desktop-pref.desktop b/data/pcmanfm-desktop-pref.desktop | ||
8 | index ccf8abb..3f6fc1c 100644 | ||
9 | --- a/data/pcmanfm-desktop-pref.desktop.in | ||
10 | +++ b/data/pcmanfm-desktop-pref.desktop.in | ||
11 | @@ -7,3 +7,4 @@ Exec=pcmanfm --desktop-pref | ||
12 | StartupNotify=true | ||
13 | Terminal=false | ||
14 | NotShowIn=GNOME;XFCE;KDE; | ||
15 | +NoDisplay=true | ||
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb new file mode 100644 index 0000000000..14c5cd5d63 --- /dev/null +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "Fast lightweight tabbed filemanager" | ||
2 | HOMEPAGE = "http://pcmanfm.sourceforge.net/" | ||
3 | |||
4 | LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | ||
6 | file://src/pcmanfm.h;endline=22;md5=417b3855771a3a87f8ad753d994491f0 \ | ||
7 | file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" | ||
8 | |||
9 | SECTION = "x11" | ||
10 | DEPENDS = "gtk+ startup-notification libfm intltool-native" | ||
11 | DEPENDS_append_poky = " libowl" | ||
12 | |||
13 | |||
14 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|aarch64.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)' | ||
15 | |||
16 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ | ||
17 | file://gnome-fs-directory.png \ | ||
18 | file://gnome-fs-regular.png \ | ||
19 | file://gnome-mime-text-plain.png \ | ||
20 | file://emblem-symbolic-link.png \ | ||
21 | file://no-desktop.patch" | ||
22 | |||
23 | SRC_URI[md5sum] = "41104699e653ff2b0a9a9e80a257d6a2" | ||
24 | SRC_URI[sha256sum] = "23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950" | ||
25 | |||
26 | inherit autotools pkgconfig | ||
27 | |||
28 | do_install_append () { | ||
29 | install -d ${D}/${datadir} | ||
30 | install -d ${D}/${datadir}/pixmaps/ | ||
31 | |||
32 | install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps | ||
33 | } | ||
diff --git a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch new file mode 100644 index 0000000000..d246feeb09 --- /dev/null +++ b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | gtk.c: fix compiling failure with option -g -O | ||
2 | |||
3 | There were compiling failure with option -g -O | ||
4 | ... | ||
5 | ././gtk.c: In function 'configure_area': | ||
6 | ././gtk.c:397:2: error: 'cr' may be used uninitialized in this function [-Werror=maybe-uninitialized] | ||
7 | cairo_set_source_rgb(cr, | ||
8 | ^ | ||
9 | ././gtk.c:384:14: note: 'cr' was declared here | ||
10 | cairo_t *cr; | ||
11 | ^ | ||
12 | ././gtk.c: In function 'main': | ||
13 | ././gtk.c:2911:6: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized] | ||
14 | fprintf(stderr, "%s: %s\n", pname, error); | ||
15 | ^ | ||
16 | cc1: all warnings being treated as errors | ||
17 | ... | ||
18 | |||
19 | Initialized pointer 'cr' and 'error' with NULL | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | |||
23 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
24 | --- | ||
25 | gtk.c | 4 ++-- | ||
26 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
27 | |||
28 | diff --git a/gtk.c b/gtk.c | ||
29 | index a2eba2c..c54bf63 100644 | ||
30 | --- a/gtk.c | ||
31 | +++ b/gtk.c | ||
32 | @@ -381,7 +381,7 @@ static void clear_backing_store(frontend *fe) | ||
33 | |||
34 | static void setup_backing_store(frontend *fe) | ||
35 | { | ||
36 | - cairo_t *cr; | ||
37 | + cairo_t *cr = NULL; | ||
38 | int i; | ||
39 | |||
40 | fe->pixmap = gdk_pixmap_new(fe->area->window, fe->pw, fe->ph, -1); | ||
41 | @@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp) | ||
42 | int main(int argc, char **argv) | ||
43 | { | ||
44 | char *pname = argv[0]; | ||
45 | - char *error; | ||
46 | + char *error = NULL; | ||
47 | int ngenerate = 0, print = FALSE, px = 1, py = 1; | ||
48 | int time_generation = FALSE, test_solve = FALSE, list_presets = FALSE; | ||
49 | int soln = FALSE, colour = FALSE; | ||
50 | -- | ||
51 | 1.9.1 | ||
52 | |||
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..7e2c3ab75d --- /dev/null +++ b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch | |||
@@ -0,0 +1,203 @@ | |||
1 | This patch enable owl menu, which is hidden in the title bar to save space on | ||
2 | small screen. It has not been used for a long time, rebase needed. | ||
3 | |||
4 | Upstream-Status: Inappropriate [enable feature] | ||
5 | |||
6 | Index: src/gtk.c | ||
7 | =================================================================== | ||
8 | --- src/gtk.c (revision 22) | ||
9 | +++ src/gtk.c (working copy) | ||
10 | @@ -28,6 +28,8 @@ | ||
11 | #include <gdk/gdkx.h> | ||
12 | #include <gdk-pixbuf/gdk-pixbuf.h> | ||
13 | |||
14 | +#include <libowl/owlwindowmenu.h> | ||
15 | + | ||
16 | #include <librsvg/rsvg.h> | ||
17 | |||
18 | #include <X11/Xlib.h> | ||
19 | @@ -1237,6 +1239,7 @@ | ||
20 | } | ||
21 | } | ||
22 | |||
23 | +#if 0 | ||
24 | static void | ||
25 | add_widget (GtkUIManager *merge, | ||
26 | GtkWidget *widget, | ||
27 | @@ -1247,10 +1250,11 @@ | ||
28 | gtk_box_pack_start (box, widget, FALSE, FALSE, 0); | ||
29 | |||
30 | toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box)); | ||
31 | - gtk_widget_show_all (toplevel); | ||
32 | } | ||
33 | +#endif | ||
34 | |||
35 | static GtkActionEntry toplevel_actions[] = { | ||
36 | + { "Top", NULL, "" }, | ||
37 | { "Game", NULL, N_("Game") }, | ||
38 | { "Settings", NULL, N_("Settings") }, | ||
39 | { "Help", NULL, N_("Help") }, | ||
40 | @@ -1303,11 +1307,13 @@ | ||
41 | frontend *fe) | ||
42 | { | ||
43 | GString *xml; | ||
44 | + GError *error = NULL; | ||
45 | gboolean presets = FALSE; | ||
46 | GSList *radio_group = NULL; | ||
47 | int i; | ||
48 | |||
49 | - xml = g_string_new ("<ui><menubar><placeholder name=\"TypePlaceholder\">" | ||
50 | + xml = g_string_new ("<ui><menubar><menu name=\"TopMenu\" action=\"Top\">" | ||
51 | + "<placeholder name=\"TypePlaceholder\">" | ||
52 | "<menu name=\"SettingsMenu\" action=\"Settings\">"); | ||
53 | |||
54 | for (i = 0; i < midend_num_presets(fe->me); i++) { | ||
55 | @@ -1359,8 +1365,14 @@ | ||
56 | "<menuitem name=\"CustomMenu\" action=\"Custom\"/>"); | ||
57 | } | ||
58 | |||
59 | - g_string_append (xml, "</menu></placeholder></menubar></ui>"); | ||
60 | - gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, NULL); | ||
61 | + g_string_append (xml, "</menu></placeholder></menu></menubar></ui>"); | ||
62 | + | ||
63 | + gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, &error); | ||
64 | + if (error != NULL) { | ||
65 | + g_warning ("Error adding custom: %s", error->message); | ||
66 | + g_error_free (error); | ||
67 | + } | ||
68 | + | ||
69 | g_string_free (xml, TRUE); | ||
70 | } | ||
71 | |||
72 | @@ -1434,6 +1446,7 @@ | ||
73 | new_window(char *arg, char **error) | ||
74 | { | ||
75 | frontend *fe; | ||
76 | + GError *err = NULL; | ||
77 | GtkBox *vbox; | ||
78 | GtkUIManager *merge; | ||
79 | GtkActionGroup *actions; | ||
80 | @@ -1496,8 +1509,6 @@ | ||
81 | gtk_window_add_accel_group(GTK_WINDOW(fe->window), fe->accelgroup); | ||
82 | |||
83 | merge = gtk_ui_manager_new (); | ||
84 | - g_signal_connect (G_OBJECT (merge), "add_widget", | ||
85 | - G_CALLBACK (add_widget), vbox); | ||
86 | |||
87 | actions = gtk_action_group_new ("PuzzleActions"); | ||
88 | gtk_action_group_add_actions (actions, toplevel_actions, | ||
89 | @@ -1509,22 +1520,39 @@ | ||
90 | |||
91 | gtk_ui_manager_insert_action_group (merge, actions, 0); | ||
92 | |||
93 | - gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml", NULL); | ||
94 | + gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml", | ||
95 | + &err); | ||
96 | + if (err != NULL) { | ||
97 | + g_warning ("Error making UI: %s", err->message); | ||
98 | + g_error_free (err); | ||
99 | + err = NULL; | ||
100 | + } | ||
101 | |||
102 | if (thegame.can_solve) { | ||
103 | - char *str = "<ui><menubar><menu name=\"GameMenu\" action=\"Game\">" | ||
104 | + char *str = "<ui><menubar><menu name=\"TopMenu\" action=\"Top\">" | ||
105 | + "<menu name=\"GameMenu\" action=\"Game\">" | ||
106 | "<placeholder name=\"SolvePlaceholder\">" | ||
107 | "<separator name=\"SolveSep\"/>" | ||
108 | "<menuitem name=\"SolveMenu\" action=\"Solve\"/>" | ||
109 | - "</placeholder></menu></menubar></ui>"; | ||
110 | + "</placeholder></menu></menu></menubar></ui>"; | ||
111 | |||
112 | - gtk_ui_manager_add_ui_from_string (merge, str, -1, NULL); | ||
113 | + gtk_ui_manager_add_ui_from_string (merge, str, -1, &err); | ||
114 | + if (err != NULL) { | ||
115 | + g_warning ("Error adding solve. %s", err->message); | ||
116 | + g_error_free (err); | ||
117 | + } | ||
118 | } | ||
119 | |||
120 | if ((n = midend_num_presets(fe->me)) > 0 || thegame.can_configure) { | ||
121 | generate_settings_menu (merge, actions, fe); | ||
122 | } | ||
123 | |||
124 | + /* Do this so that the menu is packed now instead of in the idle loop */ | ||
125 | + gtk_ui_manager_ensure_update (merge); | ||
126 | + | ||
127 | + owl_set_window_menu_item (GTK_WINDOW (fe->window), | ||
128 | + GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/TopMenu"))); | ||
129 | + | ||
130 | setup_colours (fe); | ||
131 | setup_pixbufs (fe); | ||
132 | |||
133 | @@ -1572,7 +1600,7 @@ | ||
134 | GDK_BUTTON_RELEASE_MASK | | ||
135 | GDK_BUTTON_MOTION_MASK); | ||
136 | |||
137 | - /* The window is shown once the menubar has been added */ | ||
138 | + gtk_widget_show_all (fe->window); | ||
139 | return fe; | ||
140 | } | ||
141 | |||
142 | Index: src/menu.xml | ||
143 | =================================================================== | ||
144 | --- src/menu.xml (revision 22) | ||
145 | +++ src/menu.xml (working copy) | ||
146 | @@ -1,26 +1,25 @@ | ||
147 | <ui> | ||
148 | <menubar> | ||
149 | -<menu name="GameMenu" action="Game"> | ||
150 | - <menuitem name="NewMenu" action="New"/> | ||
151 | - <menuitem name="RestartMenu" action="Restart"/> | ||
152 | -<!-- <menuitem name="SpecificMenu" action="Specific"/> --> | ||
153 | - <menuitem name="RandomMenu" action="Random"/> | ||
154 | - <separator name="GameSep1"/> | ||
155 | - <menuitem name="LoadMenu" action="Load"/> | ||
156 | - <menuitem name="SaveMenu" action="Save"/> | ||
157 | - <separator name="GameSep2"/> | ||
158 | - <menuitem name="UndoMenu" action="Undo"/> | ||
159 | - <menuitem name="RedoMenu" action="Redo"/> | ||
160 | - <placeholder name="CopyPlaceholder"/> | ||
161 | - <placeholder name="SolvePlaceholder"/> | ||
162 | - <separator name="GameSep3"/> | ||
163 | - <menuitem name="QuitMenu" action="Quit"/> | ||
164 | -</menu> | ||
165 | +<menu name="TopMenu" action="Top"> | ||
166 | + <menu name="GameMenu" action="Game"> | ||
167 | + <menuitem name="NewMenu" action="New"/> | ||
168 | + <menuitem name="RestartMenu" action="Restart"/> | ||
169 | + <!-- <menuitem name="SpecificMenu" action="Specific"/> --> | ||
170 | + <menuitem name="RandomMenu" action="Random"/> | ||
171 | + <separator name="GameSep1"/> | ||
172 | + <menuitem name="LoadMenu" action="Load"/> | ||
173 | + <menuitem name="SaveMenu" action="Save"/> | ||
174 | + <separator name="GameSep2"/> | ||
175 | + <menuitem name="UndoMenu" action="Undo"/> | ||
176 | + <menuitem name="RedoMenu" action="Redo"/> | ||
177 | + <placeholder name="CopyPlaceholder"/> | ||
178 | + <placeholder name="SolvePlaceholder"/> | ||
179 | + </menu> | ||
180 | |||
181 | -<placeholder name="TypePlaceholder"/> | ||
182 | - | ||
183 | -<menu name="HelpMenu" action="Help"> | ||
184 | + <placeholder name="TypePlaceholder"/> | ||
185 | <menuitem name="AboutMenu" action="About"/> | ||
186 | + <menuitem name="QuitMenu" action="Quit"/> | ||
187 | + | ||
188 | </menu> | ||
189 | </menubar> | ||
190 | </ui> | ||
191 | Index: src/Makefile.am | ||
192 | =================================================================== | ||
193 | --- src/Makefile.am (revision 22) | ||
194 | +++ src/Makefile.am (working copy) | ||
195 | @@ -10,7 +10,7 @@ | ||
196 | lightup loopy map mines net netslide pattern pegs rect samegame \ | ||
197 | sixteen slant solo tents twiddle untangle | ||
198 | |||
199 | -libpuzzles_la_LIBADD = $(PUZZLES_LIBS) | ||
200 | +libpuzzles_la_LIBADD = $(PUZZLES_LIBS) -lowl | ||
201 | libpuzzles_la_SOURCES = combi.c \ | ||
202 | configuration.c \ | ||
203 | drawing.c \ | ||
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb new file mode 100644 index 0000000000..bd762e9315 --- /dev/null +++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb | |||
@@ -0,0 +1,69 @@ | |||
1 | SUMMARY = "Portable Puzzle Collection" | ||
2 | HOMEPAGE = "http://o-hand.com/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "MIT" | ||
6 | LIC_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 | |||
10 | SECTION = "x11" | ||
11 | DEPENDS = "gtk+ gconf intltool-native librsvg" | ||
12 | DEPENDS_append_poky = " libowl" | ||
13 | |||
14 | SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b" | ||
15 | PV = "0.2+git${SRCPV}" | ||
16 | PR = "r10" | ||
17 | |||
18 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
19 | SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 " | ||
20 | |||
21 | S = "${WORKDIR}/git" | ||
22 | |||
23 | inherit autotools pkgconfig | ||
24 | |||
25 | bindir = "/usr/games" | ||
26 | |||
27 | EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" | ||
28 | |||
29 | do_install_append () { | ||
30 | install -d ${D}/${datadir}/applications/ | ||
31 | |||
32 | cd ${D}/${prefix}/games | ||
33 | for prog in *; do | ||
34 | if [ -x $prog ]; then | ||
35 | # Convert prog to Title Case | ||
36 | title=$(echo $prog | sed 's/\(^\| \)./\U&/g') | ||
37 | echo "making ${D}/${datadir}/applications/$prog.desktop" | ||
38 | cat <<STOP > ${D}/${datadir}/applications/$prog.desktop | ||
39 | [Desktop Entry] | ||
40 | Name=$title | ||
41 | Exec=${prefix}/games/$prog | ||
42 | Icon=applications-games | ||
43 | Terminal=false | ||
44 | Type=Application | ||
45 | Categories=Game; | ||
46 | StartupNotify=true | ||
47 | X-MB-SingleInstance=true | ||
48 | Comment=Play $title. | ||
49 | STOP | ||
50 | fi | ||
51 | done | ||
52 | } | ||
53 | |||
54 | PACKAGES += "${PN}-extra" | ||
55 | RDEPENDS_${PN}-extra += "oh-puzzles" | ||
56 | |||
57 | FILES_${PN} = "/usr/share/pixmaps /usr/share/oh-puzzles/" | ||
58 | FILES_${PN}-dbg += "/usr/games/.debug/*" | ||
59 | FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas" | ||
60 | |||
61 | python __anonymous () { | ||
62 | var = bb.data.expand("FILES_${PN}", d, 1) | ||
63 | data = d.getVar(var, True) | ||
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 | d.setVar(var, data) | ||
69 | } | ||
diff --git a/meta/recipes-sato/puzzles/puzzles_r10116.bb b/meta/recipes-sato/puzzles/puzzles_r10116.bb new file mode 100644 index 0000000000..6ee4d962b2 --- /dev/null +++ b/meta/recipes-sato/puzzles/puzzles_r10116.bb | |||
@@ -0,0 +1,55 @@ | |||
1 | SUMMARY = "Simon Tatham's Portable Puzzle Collection" | ||
2 | HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" | ||
3 | |||
4 | DEPENDS = "gtk+ libxt" | ||
5 | MOD_PV = "${@d.getVar('PV',1)[1:]}" | ||
6 | |||
7 | LICENSE = "MIT" | ||
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" | ||
9 | |||
10 | SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \ | ||
11 | file://fix-compiling-failure-with-option-g-O.patch \ | ||
12 | " | ||
13 | |||
14 | S = "${WORKDIR}/${BPN}" | ||
15 | |||
16 | inherit autotools-brokensep | ||
17 | |||
18 | do_configure_prepend () { | ||
19 | ./mkfiles.pl | ||
20 | } | ||
21 | |||
22 | FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*" | ||
23 | FILES_${PN}-dbg += "${prefix}/bin/.debug" | ||
24 | |||
25 | do_install () { | ||
26 | rm -rf ${D}/* | ||
27 | export prefix=${D} | ||
28 | export DESTDIR=${D} | ||
29 | install -d ${D}/${prefix}/bin/ | ||
30 | oe_runmake install | ||
31 | |||
32 | |||
33 | install -d ${D}/${datadir}/applications/ | ||
34 | |||
35 | # Create desktop shortcuts | ||
36 | cd ${D}/${prefix}/bin | ||
37 | for prog in *; do | ||
38 | if [ -x $prog ]; then | ||
39 | # Convert prog to Title Case | ||
40 | title=$(echo $prog | sed 's/\(^\| \)./\U&/g') | ||
41 | echo "making ${D}/${datadir}/applications/$prog.desktop" | ||
42 | cat <<STOP > ${D}/${datadir}/applications/$prog.desktop | ||
43 | [Desktop Entry] | ||
44 | Name=$title | ||
45 | Exec=${prefix}/bin/$prog | ||
46 | Icon=applications-games | ||
47 | Terminal=false | ||
48 | Type=Application | ||
49 | Categories=Game; | ||
50 | StartupNotify=true | ||
51 | X-MB-SingleInstance=true | ||
52 | STOP | ||
53 | fi | ||
54 | done | ||
55 | } | ||
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop new file mode 100644 index 0000000000..882ea41136 --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop | |||
@@ -0,0 +1,9 @@ | |||
1 | [Desktop Entry] | ||
2 | Version=1.0 | ||
3 | Name=Terminal | ||
4 | Comment=A unicode capable rxvt clone | ||
5 | Exec=rxvt | ||
6 | Icon=terminal | ||
7 | Terminal=false | ||
8 | Type=Application | ||
9 | Categories=Utility;TerminalEmulator; | ||
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png new file mode 100644 index 0000000000..e56fa2e9cd --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png | |||
Binary files differ | |||
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch new file mode 100644 index 0000000000..16efeef49f --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | diff -ruN rxvt-unicode-9.10-orig//src/screen.C rxvt-unicode-9.10/src/screen.C | ||
4 | --- rxvt-unicode-9.10-orig//src/screen.C 2011-04-19 13:34:01.327664984 +0800 | ||
5 | +++ rxvt-unicode-9.10/src/screen.C 2011-04-19 13:34:47.037665001 +0800 | ||
6 | @@ -3152,7 +3152,7 @@ | ||
7 | return false; | ||
8 | } | ||
9 | |||
10 | -#if 0 | ||
11 | +#if HAVE_XWC | ||
12 | XTextProperty ct; | ||
13 | |||
14 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) | ||
15 | @@ -3734,9 +3734,11 @@ | ||
16 | } | ||
17 | else | ||
18 | #endif | ||
19 | +#ifdef HAVE_XWC | ||
20 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) | ||
21 | freect = 1; | ||
22 | else | ||
23 | +#endif | ||
24 | { | ||
25 | /* if we failed to convert then send it raw */ | ||
26 | ct.value = (unsigned char *)cl; | ||
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb new file mode 100644 index 0000000000..3a1ea6633b --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb | |||
@@ -0,0 +1,65 @@ | |||
1 | SECTION = "x11/utils" | ||
2 | SUMMARY = "rxvt terminal clone supporting unicode" | ||
3 | DESCRIPTION = "rxvt-unicode is a clone of the well known \ | ||
4 | terminal emulator rxvt, modified to store text in Unicode \ | ||
5 | (either UCS-2 or UCS-4) and to use locale-correct input and \ | ||
6 | output. It also supports mixing multiple fonts at the \ | ||
7 | same time, including Xft fonts." | ||
8 | LICENSE = "GPLv2+" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
10 | file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432" | ||
11 | |||
12 | DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf" | ||
13 | |||
14 | SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ | ||
15 | file://xwc.patch \ | ||
16 | file://rxvt.desktop \ | ||
17 | file://rxvt.png" | ||
18 | |||
19 | SRC_URI[md5sum] = "4a5b823f08d21036f94a6c51e94d025b" | ||
20 | SRC_URI[sha256sum] = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e" | ||
21 | |||
22 | inherit autotools update-alternatives | ||
23 | |||
24 | PROVIDES = "virtual/x-terminal-emulator" | ||
25 | ALTERNATIVE_${PN} = "x-terminal-emulator" | ||
26 | ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" | ||
27 | |||
28 | CFLAGS_append = " -fpermissive" | ||
29 | |||
30 | EXTRA_OECONF = "--enable-menubar --enable-xim \ | ||
31 | --enable-utmp --enable-wtmp --enable-lastlog \ | ||
32 | --disable-strings --with-term=rxvt --enable-keepscrolling \ | ||
33 | --enable-xft --with-name=rxvt --enable-frills \ | ||
34 | --enable-swapscreen --enable-transparency \ | ||
35 | --with-codesets=eu \ | ||
36 | --enable-cursor-blink --enable-pointer-blank \ | ||
37 | --enable-text-blink --enable-rxvt-scroll \ | ||
38 | --enable-combining --enable-shared \ | ||
39 | --enable-xgetdefault \ | ||
40 | --disable-perl \ | ||
41 | --with-x=${STAGING_DIR_HOST}${prefix}" | ||
42 | |||
43 | do_configure_prepend () { | ||
44 | if [ ! -e ${S}/acinclude.m4 ]; then | ||
45 | cp ${S}/aclocal.m4 ${S}/acinclude.m4 | ||
46 | fi | ||
47 | } | ||
48 | |||
49 | do_compile_prepend () { | ||
50 | echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h | ||
51 | echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h | ||
52 | echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h | ||
53 | echo '#define HAVE_XLOCALE 1' >> config.h | ||
54 | } | ||
55 | |||
56 | do_install_append () { | ||
57 | install -d ${D}/${datadir} | ||
58 | install -d ${D}/${datadir}/applications | ||
59 | install -d ${D}/${datadir}/pixmaps/ | ||
60 | |||
61 | install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps | ||
62 | install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications | ||
63 | } | ||
64 | |||
65 | FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" | ||
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch new file mode 100644 index 0000000000..fa595dc230 --- /dev/null +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From b9f02989310a3c920589f1aa646bcbf16b2572a0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Wed, 13 Jun 2012 11:07:33 +0100 | ||
4 | Subject: [PATCH] Inherit the GNOME icon theme | ||
5 | |||
6 | If the GNOME icon theme isn't installed this is a no-op, but if it is then | ||
7 | you'll get fallback from Sato to GNOME for icons that are not in Sato. | ||
8 | |||
9 | As applications that use the full GNOME icon theme depend on gnome-icon-theme, | ||
10 | this just works. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | --- | ||
14 | index.theme | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/index.theme b/index.theme | ||
18 | index c4b03a7..688fbbf 100644 | ||
19 | --- a/index.theme | ||
20 | +++ b/index.theme | ||
21 | @@ -1,6 +1,7 @@ | ||
22 | [Icon Theme] | ||
23 | Name=Sato | ||
24 | Comment=Sato icon theme | ||
25 | +Inherits=gnome | ||
26 | |||
27 | Directories=16x16/apps,16x16/status,16x16/stock,16x16/places,16x16/mimetypes,16x16/devices,16x16/actions,22x22/apps,22x22/status,22x22/stock,22x22/places,22x22/mimetypes,22x22/devices,22x22/actions,32x32/apps,32x32/status,32x32/stock,32x32/places,32x32/mimetypes,32x32/devices,32x32/actions,48x48/apps,48x48/status,48x48/stock,48x48/places,48x48/mimetypes,48x48/devices,48x48/actions,64x64/apps,64x64/status,64x64/stock,64x64/places,64x64/mimetypes,64x64/devices,64x64/actions, | ||
28 | |||
29 | -- | ||
30 | 1.7.10 | ||
31 | |||
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..ced735f001 --- /dev/null +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb | |||
@@ -0,0 +1,40 @@ | |||
1 | SUMMARY = "Sato icon theme" | ||
2 | HOMEPAGE = "http://www.o-hand.com" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "CC-BY-SA-3.0" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2" | ||
7 | SECTION = "x11" | ||
8 | |||
9 | PR = "r6" | ||
10 | |||
11 | DEPENDS = "icon-naming-utils-native libxml-simple-perl-native" | ||
12 | |||
13 | SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ | ||
14 | file://0001-Inherit-the-GNOME-icon-theme.patch" | ||
15 | |||
16 | SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50" | ||
17 | SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732" | ||
18 | |||
19 | inherit autotools pkgconfig allarch gtk-icon-cache perlnative | ||
20 | |||
21 | # The configure script uses pkg-config to find native binaries to execute, so | ||
22 | # tell it to use our pkg-config-native wrapper. | ||
23 | export PKG_CONFIG = "pkg-config-native" | ||
24 | |||
25 | FILES_${PN} += "${datadir}/icons/Sato" | ||
26 | |||
27 | do_install_append() { | ||
28 | find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \; | ||
29 | find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \; | ||
30 | find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \; | ||
31 | } | ||
32 | |||
33 | # Explictly setting "Sato" as the default icon theme to avoid flickering from | ||
34 | # the desktop and settings daemon racing. This shouldn't be done here but in the sato image | ||
35 | pkg_postinst_${PN} () { | ||
36 | mkdir -p $D/etc/gtk-2.0 | ||
37 | |||
38 | grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \ | ||
39 | echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc | ||
40 | } | ||
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb new file mode 100644 index 0000000000..a079e03d97 --- /dev/null +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "Ultra-simple screen capture utility, aimed at handheld devices" | ||
2 | HOMEPAGE = "http://www.o-hand.com" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2 & GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \ | ||
8 | file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" | ||
9 | |||
10 | DEPENDS = "matchbox-panel-2" | ||
11 | SRCREV = "3a9688e8a01b63a78f402b4e7c0b8b005fcdfa29" | ||
12 | PV = "0.1+git${SRCPV}" | ||
13 | PR = "r2" | ||
14 | |||
15 | SRC_URI = "git://git.yoctoproject.org/screenshot" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
21 | FILES_${PN} += "${libdir}/matchbox-panel/*.so" | ||
22 | FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" | ||
23 | |||
24 | do_install_append () { | ||
25 | rm ${D}${libdir}/matchbox-panel/*.la | ||
26 | } | ||
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..baf06d6b84 --- /dev/null +++ b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: settings-daemon/settings-daemon.c | ||
4 | =================================================================== | ||
5 | --- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 | ||
6 | +++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100 | ||
7 | @@ -187,6 +187,10 @@ | ||
8 | GCONF_VALUE_STRING, translate_string_string }, | ||
9 | { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme", | ||
10 | GCONF_VALUE_STRING, translate_string_string }, | ||
11 | + { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName", | ||
12 | + GCONF_VALUE_STRING, translate_string_string }, | ||
13 | + { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" , | ||
14 | + GCONF_VALUE_BOOL, translate_bool_int }, | ||
15 | }; | ||
16 | |||
17 | static const TranslationEntry* | ||
18 | Index: settings-daemon/settings-daemon.schemas | ||
19 | =================================================================== | ||
20 | --- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100 | ||
21 | +++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100 | ||
22 | @@ -196,6 +196,27 @@ | ||
23 | </locale> | ||
24 | </schema> | ||
25 | |||
26 | + <schema> | ||
27 | + <key>/schemas/desktop/gnome/sound/theme_name</key> | ||
28 | + <applyto>/desktop/gnome/sound/theme_name</applyto> | ||
29 | + <owner>gnome</owner> | ||
30 | + <type>string</type> | ||
31 | + <default>freedesktop</default> | ||
32 | + <locale name="C"> | ||
33 | + <short>Sound Theme Name</short> | ||
34 | + </locale> | ||
35 | + </schema> | ||
36 | + | ||
37 | + <schema> | ||
38 | + <key>/schemas/desktop/gnome/sound/event_sounds</key> | ||
39 | + <applyto>/desktop/gnome/sound/event_sounds</applyto> | ||
40 | + <owner>gnome</owner> | ||
41 | + <type>bool</type> | ||
42 | + <default>true</default> | ||
43 | + <locale name="C"> | ||
44 | + <short>Enable Sound Events</short> | ||
45 | + </locale> | ||
46 | + </schema> | ||
47 | |||
48 | </schemalist> | ||
49 | </gconfschemafile> | ||
diff --git a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch new file mode 100644 index 0000000000..594374467a --- /dev/null +++ b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | after gcc linking has changed, all the libraries must be explicitely specified to for linking. | ||
4 | This patch avoids this linking error: | ||
5 | |||
6 | | make all-am^M | ||
7 | | make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M | ||
8 | | ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o settings-daemon settings_daemon-xsettings-common.o settings_daemon-xsettings-manager.o settings_daemon-settings-daemon.o -pthread -lgconf-2 -ldbus-glib-1 -ldbus-1 -lpthread -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0^M | ||
9 | | /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: *^A: invalid DSO for symbol `XCreateSimpleWindow' definition^M | ||
10 | | /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M | ||
11 | | collect2: ld returned 1 exit status^M | ||
12 | | make[1]: *** [settings-daemon] Error 1^M | ||
13 | | make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M | ||
14 | | make: *** [all] Error 2^M | ||
15 | |||
16 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
17 | Date: 2011/01/11 | ||
18 | |||
19 | Index: settings-daemon/configure.ac | ||
20 | =================================================================== | ||
21 | --- settings-daemon.orig/configure.ac | ||
22 | +++ settings-daemon/configure.ac | ||
23 | @@ -14,7 +14,7 @@ AC_PROG_CC | ||
24 | |||
25 | |||
26 | dnl TODO: make gconf optional | ||
27 | -PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0]) | ||
28 | +PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11]) | ||
29 | |||
30 | |||
31 | AC_SUBST(APP_CFLAGS) | ||
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb new file mode 100644 index 0000000000..ba48d90773 --- /dev/null +++ b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "Provides a bridge between gconf and xsettings" | ||
2 | HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | LICENSE = "MIT-style" | ||
5 | LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
6 | file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" | ||
7 | DEPENDS = "gconf glib-2.0 gtk+" | ||
8 | SECTION = "x11" | ||
9 | SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1" | ||
10 | PV = "0.0+git${SRCPV}" | ||
11 | |||
12 | |||
13 | SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ | ||
14 | file://addsoundkeys.patch;apply=yes \ | ||
15 | file://70settings-daemon.sh \ | ||
16 | file://dso_linking_change_build_fix.patch" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit autotools pkgconfig gconf | ||
21 | |||
22 | FILES_${PN} = "${bindir}/* ${sysconfdir}" | ||
23 | |||
24 | do_install_append () { | ||
25 | install -d ${D}/${sysconfdir}/X11/Xsession.d | ||
26 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ | ||
27 | } | ||
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb new file mode 100644 index 0000000000..ebdd6d123a --- /dev/null +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | SUMMARY = "Provides an icon to shut down the system cleanly" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | |||
6 | SRC_URI = "file://shutdown.desktop" | ||
7 | |||
8 | PR = "r1" | ||
9 | |||
10 | S = "${WORKDIR}" | ||
11 | |||
12 | do_install() { | ||
13 | install -d ${D}${datadir}/applications | ||
14 | install -m 0644 shutdown.desktop ${D}${datadir}/applications/ | ||
15 | |||
16 | sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' | ||
17 | } | ||
18 | |||
19 | pkg_postinst_${PN} () { | ||
20 | grep -q qemuarm $D${sysconfdir}/hostname && \ | ||
21 | sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \ | ||
22 | || true | ||
23 | } | ||
24 | |||
25 | inherit allarch | ||
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop new file mode 100644 index 0000000000..662659afc2 --- /dev/null +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop | |||
@@ -0,0 +1,10 @@ | |||
1 | [Desktop Entry] | ||
2 | Encoding=UTF-8 | ||
3 | Type=Application | ||
4 | Name=Shutdown | ||
5 | Comment=Close down the machine safely | ||
6 | Exec=poweroff | ||
7 | Icon=system-shutdown | ||
8 | Terminal=false | ||
9 | Categories=Utility; | ||
10 | StartupNotify=true | ||
diff --git a/meta/recipes-sato/webkit/files/bison-2.6.patch b/meta/recipes-sato/webkit/files/bison-2.6.patch new file mode 100644 index 0000000000..d4aa674217 --- /dev/null +++ b/meta/recipes-sato/webkit/files/bison-2.6.patch | |||
@@ -0,0 +1,558 @@ | |||
1 | Upstream-Status: Backport | ||
2 | http://trac.webkit.org/changeset/124099 | ||
3 | |||
4 | Subversion Revision: 123651 | ||
5 | diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y | ||
6 | index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 | ||
7 | --- a/Source/WebCore/css/CSSGrammar.y | ||
8 | +++ b/Source/WebCore/css/CSSGrammar.y | ||
9 | @@ -53,14 +53,13 @@ using namespace HTMLNames; | ||
10 | #define YYMAXDEPTH 10000 | ||
11 | #define YYDEBUG 0 | ||
12 | |||
13 | -// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x | ||
14 | -#define YYPARSE_PARAM parser | ||
15 | -#define YYLEX_PARAM parser | ||
16 | - | ||
17 | %} | ||
18 | |||
19 | %pure_parser | ||
20 | |||
21 | +%parse-param { CSSParser* parser } | ||
22 | +%lex-param { CSSParser* parser } | ||
23 | + | ||
24 | %union { | ||
25 | bool boolean; | ||
26 | char character; | ||
27 | @@ -89,7 +88,7 @@ using namespace HTMLNames; | ||
28 | |||
29 | %{ | ||
30 | |||
31 | -static inline int cssyyerror(const char*) | ||
32 | +static inline int cssyyerror(void*, const char*) | ||
33 | { | ||
34 | return 1; | ||
35 | } | ||
36 | diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp | ||
37 | index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 | ||
38 | --- a/Source/WebCore/css/CSSParser.cpp | ||
39 | +++ b/Source/WebCore/css/CSSParser.cpp | ||
40 | @@ -114,7 +114,7 @@ | ||
41 | extern int cssyydebug; | ||
42 | #endif | ||
43 | |||
44 | -extern int cssyyparse(void* parser); | ||
45 | +extern int cssyyparse(WebCore::CSSParser*); | ||
46 | |||
47 | using namespace std; | ||
48 | using namespace WTF; | ||
49 | diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y | ||
50 | index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 | ||
51 | --- a/Source/WebCore/xml/XPathGrammar.y | ||
52 | +++ b/Source/WebCore/xml/XPathGrammar.y | ||
53 | @@ -34,6 +34,7 @@ | ||
54 | #include "XPathParser.h" | ||
55 | #include "XPathPath.h" | ||
56 | #include "XPathPredicate.h" | ||
57 | +#include "XPathStep.h" | ||
58 | #include "XPathVariableReference.h" | ||
59 | #include <wtf/FastMalloc.h> | ||
60 | |||
61 | @@ -44,8 +45,6 @@ | ||
62 | #define YYLTYPE_IS_TRIVIAL 1 | ||
63 | #define YYDEBUG 0 | ||
64 | #define YYMAXDEPTH 10000 | ||
65 | -#define YYPARSE_PARAM parserParameter | ||
66 | -#define PARSER static_cast<Parser*>(parserParameter) | ||
67 | |||
68 | using namespace WebCore; | ||
69 | using namespace XPath; | ||
70 | @@ -53,6 +52,7 @@ using namespace XPath; | ||
71 | %} | ||
72 | |||
73 | %pure_parser | ||
74 | +%parse-param { WebCore::XPath::Parser* parser } | ||
75 | |||
76 | %union | ||
77 | { | ||
78 | @@ -71,7 +71,7 @@ using namespace XPath; | ||
79 | %{ | ||
80 | |||
81 | static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } | ||
82 | -static void xpathyyerror(const char*) { } | ||
83 | +static void xpathyyerror(void*, const char*) { } | ||
84 | |||
85 | %} | ||
86 | |||
87 | @@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { } | ||
88 | Expr: | ||
89 | OrExpr | ||
90 | { | ||
91 | - PARSER->m_topExpr = $1; | ||
92 | + parser->m_topExpr = $1; | ||
93 | } | ||
94 | ; | ||
95 | |||
96 | @@ -138,7 +138,7 @@ AbsoluteLocationPath: | ||
97 | '/' | ||
98 | { | ||
99 | $$ = new LocationPath; | ||
100 | - PARSER->registerParseNode($$); | ||
101 | + parser->registerParseNode($$); | ||
102 | } | ||
103 | | | ||
104 | '/' RelativeLocationPath | ||
105 | @@ -150,7 +150,7 @@ AbsoluteLocationPath: | ||
106 | { | ||
107 | $$ = $2; | ||
108 | $$->insertFirstStep($1); | ||
109 | - PARSER->unregisterParseNode($1); | ||
110 | + parser->unregisterParseNode($1); | ||
111 | } | ||
112 | ; | ||
113 | |||
114 | @@ -159,22 +159,22 @@ RelativeLocationPath: | ||
115 | { | ||
116 | $$ = new LocationPath; | ||
117 | $$->appendStep($1); | ||
118 | - PARSER->unregisterParseNode($1); | ||
119 | - PARSER->registerParseNode($$); | ||
120 | + parser->unregisterParseNode($1); | ||
121 | + parser->registerParseNode($$); | ||
122 | } | ||
123 | | | ||
124 | RelativeLocationPath '/' Step | ||
125 | { | ||
126 | $$->appendStep($3); | ||
127 | - PARSER->unregisterParseNode($3); | ||
128 | + parser->unregisterParseNode($3); | ||
129 | } | ||
130 | | | ||
131 | RelativeLocationPath DescendantOrSelf Step | ||
132 | { | ||
133 | $$->appendStep($2); | ||
134 | $$->appendStep($3); | ||
135 | - PARSER->unregisterParseNode($2); | ||
136 | - PARSER->unregisterParseNode($3); | ||
137 | + parser->unregisterParseNode($2); | ||
138 | + parser->unregisterParseNode($3); | ||
139 | } | ||
140 | ; | ||
141 | |||
142 | @@ -183,58 +183,58 @@ Step: | ||
143 | { | ||
144 | if ($2) { | ||
145 | $$ = new Step(Step::ChildAxis, *$1, *$2); | ||
146 | - PARSER->deletePredicateVector($2); | ||
147 | + parser->deletePredicateVector($2); | ||
148 | } else | ||
149 | $$ = new Step(Step::ChildAxis, *$1); | ||
150 | - PARSER->deleteNodeTest($1); | ||
151 | - PARSER->registerParseNode($$); | ||
152 | + parser->deleteNodeTest($1); | ||
153 | + parser->registerParseNode($$); | ||
154 | } | ||
155 | | | ||
156 | NAMETEST OptionalPredicateList | ||
157 | { | ||
158 | String localName; | ||
159 | String namespaceURI; | ||
160 | - if (!PARSER->expandQName(*$1, localName, namespaceURI)) { | ||
161 | - PARSER->m_gotNamespaceError = true; | ||
162 | + if (!parser->expandQName(*$1, localName, namespaceURI)) { | ||
163 | + parser->m_gotNamespaceError = true; | ||
164 | YYABORT; | ||
165 | } | ||
166 | |||
167 | if ($2) { | ||
168 | $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); | ||
169 | - PARSER->deletePredicateVector($2); | ||
170 | + parser->deletePredicateVector($2); | ||
171 | } else | ||
172 | $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); | ||
173 | - PARSER->deleteString($1); | ||
174 | - PARSER->registerParseNode($$); | ||
175 | + parser->deleteString($1); | ||
176 | + parser->registerParseNode($$); | ||
177 | } | ||
178 | | | ||
179 | AxisSpecifier NodeTest OptionalPredicateList | ||
180 | { | ||
181 | if ($3) { | ||
182 | $$ = new Step($1, *$2, *$3); | ||
183 | - PARSER->deletePredicateVector($3); | ||
184 | + parser->deletePredicateVector($3); | ||
185 | } else | ||
186 | $$ = new Step($1, *$2); | ||
187 | - PARSER->deleteNodeTest($2); | ||
188 | - PARSER->registerParseNode($$); | ||
189 | + parser->deleteNodeTest($2); | ||
190 | + parser->registerParseNode($$); | ||
191 | } | ||
192 | | | ||
193 | AxisSpecifier NAMETEST OptionalPredicateList | ||
194 | { | ||
195 | String localName; | ||
196 | String namespaceURI; | ||
197 | - if (!PARSER->expandQName(*$2, localName, namespaceURI)) { | ||
198 | - PARSER->m_gotNamespaceError = true; | ||
199 | + if (!parser->expandQName(*$2, localName, namespaceURI)) { | ||
200 | + parser->m_gotNamespaceError = true; | ||
201 | YYABORT; | ||
202 | } | ||
203 | |||
204 | if ($3) { | ||
205 | $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); | ||
206 | - PARSER->deletePredicateVector($3); | ||
207 | + parser->deletePredicateVector($3); | ||
208 | } else | ||
209 | $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); | ||
210 | - PARSER->deleteString($2); | ||
211 | - PARSER->registerParseNode($$); | ||
212 | + parser->deleteString($2); | ||
213 | + parser->registerParseNode($$); | ||
214 | } | ||
215 | | | ||
216 | AbbreviatedStep | ||
217 | @@ -259,23 +259,23 @@ NodeTest: | ||
218 | else if (*$1 == "comment") | ||
219 | $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); | ||
220 | |||
221 | - PARSER->deleteString($1); | ||
222 | - PARSER->registerNodeTest($$); | ||
223 | + parser->deleteString($1); | ||
224 | + parser->registerNodeTest($$); | ||
225 | } | ||
226 | | | ||
227 | PI '(' ')' | ||
228 | { | ||
229 | $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); | ||
230 | - PARSER->deleteString($1); | ||
231 | - PARSER->registerNodeTest($$); | ||
232 | + parser->deleteString($1); | ||
233 | + parser->registerNodeTest($$); | ||
234 | } | ||
235 | | | ||
236 | PI '(' LITERAL ')' | ||
237 | { | ||
238 | $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); | ||
239 | - PARSER->deleteString($1); | ||
240 | - PARSER->deleteString($3); | ||
241 | - PARSER->registerNodeTest($$); | ||
242 | + parser->deleteString($1); | ||
243 | + parser->deleteString($3); | ||
244 | + parser->registerNodeTest($$); | ||
245 | } | ||
246 | ; | ||
247 | |||
248 | @@ -293,14 +293,14 @@ PredicateList: | ||
249 | { | ||
250 | $$ = new Vector<Predicate*>; | ||
251 | $$->append(new Predicate($1)); | ||
252 | - PARSER->unregisterParseNode($1); | ||
253 | - PARSER->registerPredicateVector($$); | ||
254 | + parser->unregisterParseNode($1); | ||
255 | + parser->registerPredicateVector($$); | ||
256 | } | ||
257 | | | ||
258 | PredicateList Predicate | ||
259 | { | ||
260 | $$->append(new Predicate($2)); | ||
261 | - PARSER->unregisterParseNode($2); | ||
262 | + parser->unregisterParseNode($2); | ||
263 | } | ||
264 | ; | ||
265 | |||
266 | @@ -315,7 +315,7 @@ DescendantOrSelf: | ||
267 | SLASHSLASH | ||
268 | { | ||
269 | $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); | ||
270 | - PARSER->registerParseNode($$); | ||
271 | + parser->registerParseNode($$); | ||
272 | } | ||
273 | ; | ||
274 | |||
275 | @@ -323,13 +323,13 @@ AbbreviatedStep: | ||
276 | '.' | ||
277 | { | ||
278 | $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); | ||
279 | - PARSER->registerParseNode($$); | ||
280 | + parser->registerParseNode($$); | ||
281 | } | ||
282 | | | ||
283 | DOTDOT | ||
284 | { | ||
285 | $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); | ||
286 | - PARSER->registerParseNode($$); | ||
287 | + parser->registerParseNode($$); | ||
288 | } | ||
289 | ; | ||
290 | |||
291 | @@ -337,8 +337,8 @@ PrimaryExpr: | ||
292 | VARIABLEREFERENCE | ||
293 | { | ||
294 | $$ = new VariableReference(*$1); | ||
295 | - PARSER->deleteString($1); | ||
296 | - PARSER->registerParseNode($$); | ||
297 | + parser->deleteString($1); | ||
298 | + parser->registerParseNode($$); | ||
299 | } | ||
300 | | | ||
301 | '(' Expr ')' | ||
302 | @@ -349,15 +349,15 @@ PrimaryExpr: | ||
303 | LITERAL | ||
304 | { | ||
305 | $$ = new StringExpression(*$1); | ||
306 | - PARSER->deleteString($1); | ||
307 | - PARSER->registerParseNode($$); | ||
308 | + parser->deleteString($1); | ||
309 | + parser->registerParseNode($$); | ||
310 | } | ||
311 | | | ||
312 | NUMBER | ||
313 | { | ||
314 | $$ = new Number($1->toDouble()); | ||
315 | - PARSER->deleteString($1); | ||
316 | - PARSER->registerParseNode($$); | ||
317 | + parser->deleteString($1); | ||
318 | + parser->registerParseNode($$); | ||
319 | } | ||
320 | | | ||
321 | FunctionCall | ||
322 | @@ -369,8 +369,8 @@ FunctionCall: | ||
323 | $$ = createFunction(*$1); | ||
324 | if (!$$) | ||
325 | YYABORT; | ||
326 | - PARSER->deleteString($1); | ||
327 | - PARSER->registerParseNode($$); | ||
328 | + parser->deleteString($1); | ||
329 | + parser->registerParseNode($$); | ||
330 | } | ||
331 | | | ||
332 | FUNCTIONNAME '(' ArgumentList ')' | ||
333 | @@ -378,9 +378,9 @@ FunctionCall: | ||
334 | $$ = createFunction(*$1, *$3); | ||
335 | if (!$$) | ||
336 | YYABORT; | ||
337 | - PARSER->deleteString($1); | ||
338 | - PARSER->deleteExpressionVector($3); | ||
339 | - PARSER->registerParseNode($$); | ||
340 | + parser->deleteString($1); | ||
341 | + parser->deleteExpressionVector($3); | ||
342 | + parser->registerParseNode($$); | ||
343 | } | ||
344 | ; | ||
345 | |||
346 | @@ -389,14 +389,14 @@ ArgumentList: | ||
347 | { | ||
348 | $$ = new Vector<Expression*>; | ||
349 | $$->append($1); | ||
350 | - PARSER->unregisterParseNode($1); | ||
351 | - PARSER->registerExpressionVector($$); | ||
352 | + parser->unregisterParseNode($1); | ||
353 | + parser->registerExpressionVector($$); | ||
354 | } | ||
355 | | | ||
356 | ArgumentList ',' Argument | ||
357 | { | ||
358 | $$->append($3); | ||
359 | - PARSER->unregisterParseNode($3); | ||
360 | + parser->unregisterParseNode($3); | ||
361 | } | ||
362 | ; | ||
363 | |||
364 | @@ -412,9 +412,9 @@ UnionExpr: | ||
365 | $$ = new Union; | ||
366 | $$->addSubExpression($1); | ||
367 | $$->addSubExpression($3); | ||
368 | - PARSER->unregisterParseNode($1); | ||
369 | - PARSER->unregisterParseNode($3); | ||
370 | - PARSER->registerParseNode($$); | ||
371 | + parser->unregisterParseNode($1); | ||
372 | + parser->unregisterParseNode($3); | ||
373 | + parser->registerParseNode($$); | ||
374 | } | ||
375 | ; | ||
376 | |||
377 | @@ -430,9 +430,9 @@ PathExpr: | ||
378 | { | ||
379 | $3->setAbsolute(true); | ||
380 | $$ = new Path(static_cast<Filter*>($1), $3); | ||
381 | - PARSER->unregisterParseNode($1); | ||
382 | - PARSER->unregisterParseNode($3); | ||
383 | - PARSER->registerParseNode($$); | ||
384 | + parser->unregisterParseNode($1); | ||
385 | + parser->unregisterParseNode($3); | ||
386 | + parser->registerParseNode($$); | ||
387 | } | ||
388 | | | ||
389 | FilterExpr DescendantOrSelf RelativeLocationPath | ||
390 | @@ -440,10 +440,10 @@ PathExpr: | ||
391 | $3->insertFirstStep($2); | ||
392 | $3->setAbsolute(true); | ||
393 | $$ = new Path(static_cast<Filter*>($1), $3); | ||
394 | - PARSER->unregisterParseNode($1); | ||
395 | - PARSER->unregisterParseNode($2); | ||
396 | - PARSER->unregisterParseNode($3); | ||
397 | - PARSER->registerParseNode($$); | ||
398 | + parser->unregisterParseNode($1); | ||
399 | + parser->unregisterParseNode($2); | ||
400 | + parser->unregisterParseNode($3); | ||
401 | + parser->registerParseNode($$); | ||
402 | } | ||
403 | ; | ||
404 | |||
405 | @@ -453,9 +453,9 @@ FilterExpr: | ||
406 | PrimaryExpr PredicateList | ||
407 | { | ||
408 | $$ = new Filter($1, *$2); | ||
409 | - PARSER->unregisterParseNode($1); | ||
410 | - PARSER->deletePredicateVector($2); | ||
411 | - PARSER->registerParseNode($$); | ||
412 | + parser->unregisterParseNode($1); | ||
413 | + parser->deletePredicateVector($2); | ||
414 | + parser->registerParseNode($$); | ||
415 | } | ||
416 | ; | ||
417 | |||
418 | @@ -465,9 +465,9 @@ OrExpr: | ||
419 | OrExpr OR AndExpr | ||
420 | { | ||
421 | $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); | ||
422 | - PARSER->unregisterParseNode($1); | ||
423 | - PARSER->unregisterParseNode($3); | ||
424 | - PARSER->registerParseNode($$); | ||
425 | + parser->unregisterParseNode($1); | ||
426 | + parser->unregisterParseNode($3); | ||
427 | + parser->registerParseNode($$); | ||
428 | } | ||
429 | ; | ||
430 | |||
431 | @@ -477,9 +477,9 @@ AndExpr: | ||
432 | AndExpr AND EqualityExpr | ||
433 | { | ||
434 | $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); | ||
435 | - PARSER->unregisterParseNode($1); | ||
436 | - PARSER->unregisterParseNode($3); | ||
437 | - PARSER->registerParseNode($$); | ||
438 | + parser->unregisterParseNode($1); | ||
439 | + parser->unregisterParseNode($3); | ||
440 | + parser->registerParseNode($$); | ||
441 | } | ||
442 | ; | ||
443 | |||
444 | @@ -489,9 +489,9 @@ EqualityExpr: | ||
445 | EqualityExpr EQOP RelationalExpr | ||
446 | { | ||
447 | $$ = new EqTestOp($2, $1, $3); | ||
448 | - PARSER->unregisterParseNode($1); | ||
449 | - PARSER->unregisterParseNode($3); | ||
450 | - PARSER->registerParseNode($$); | ||
451 | + parser->unregisterParseNode($1); | ||
452 | + parser->unregisterParseNode($3); | ||
453 | + parser->registerParseNode($$); | ||
454 | } | ||
455 | ; | ||
456 | |||
457 | @@ -501,9 +501,9 @@ RelationalExpr: | ||
458 | RelationalExpr RELOP AdditiveExpr | ||
459 | { | ||
460 | $$ = new EqTestOp($2, $1, $3); | ||
461 | - PARSER->unregisterParseNode($1); | ||
462 | - PARSER->unregisterParseNode($3); | ||
463 | - PARSER->registerParseNode($$); | ||
464 | + parser->unregisterParseNode($1); | ||
465 | + parser->unregisterParseNode($3); | ||
466 | + parser->registerParseNode($$); | ||
467 | } | ||
468 | ; | ||
469 | |||
470 | @@ -513,17 +513,17 @@ AdditiveExpr: | ||
471 | AdditiveExpr PLUS MultiplicativeExpr | ||
472 | { | ||
473 | $$ = new NumericOp(NumericOp::OP_Add, $1, $3); | ||
474 | - PARSER->unregisterParseNode($1); | ||
475 | - PARSER->unregisterParseNode($3); | ||
476 | - PARSER->registerParseNode($$); | ||
477 | + parser->unregisterParseNode($1); | ||
478 | + parser->unregisterParseNode($3); | ||
479 | + parser->registerParseNode($$); | ||
480 | } | ||
481 | | | ||
482 | AdditiveExpr MINUS MultiplicativeExpr | ||
483 | { | ||
484 | $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); | ||
485 | - PARSER->unregisterParseNode($1); | ||
486 | - PARSER->unregisterParseNode($3); | ||
487 | - PARSER->registerParseNode($$); | ||
488 | + parser->unregisterParseNode($1); | ||
489 | + parser->unregisterParseNode($3); | ||
490 | + parser->registerParseNode($$); | ||
491 | } | ||
492 | ; | ||
493 | |||
494 | @@ -533,9 +533,9 @@ MultiplicativeExpr: | ||
495 | MultiplicativeExpr MULOP UnaryExpr | ||
496 | { | ||
497 | $$ = new NumericOp($2, $1, $3); | ||
498 | - PARSER->unregisterParseNode($1); | ||
499 | - PARSER->unregisterParseNode($3); | ||
500 | - PARSER->registerParseNode($$); | ||
501 | + parser->unregisterParseNode($1); | ||
502 | + parser->unregisterParseNode($3); | ||
503 | + parser->registerParseNode($$); | ||
504 | } | ||
505 | ; | ||
506 | |||
507 | @@ -546,8 +546,8 @@ UnaryExpr: | ||
508 | { | ||
509 | $$ = new Negative; | ||
510 | $$->addSubExpression($2); | ||
511 | - PARSER->unregisterParseNode($2); | ||
512 | - PARSER->registerParseNode($$); | ||
513 | + parser->unregisterParseNode($2); | ||
514 | + parser->registerParseNode($$); | ||
515 | } | ||
516 | ; | ||
517 | |||
518 | diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp | ||
519 | index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644 | ||
520 | --- a/Source/WebCore/xml/XPathParser.cpp | ||
521 | +++ b/Source/WebCore/xml/XPathParser.cpp | ||
522 | @@ -32,24 +32,21 @@ | ||
523 | #include "XPathEvaluator.h" | ||
524 | #include "XPathException.h" | ||
525 | #include "XPathNSResolver.h" | ||
526 | +#include "XPathPath.h" | ||
527 | #include "XPathStep.h" | ||
528 | #include <wtf/StdLibExtras.h> | ||
529 | #include <wtf/text/StringHash.h> | ||
530 | |||
531 | -int xpathyyparse(void*); | ||
532 | - | ||
533 | +using namespace WebCore; | ||
534 | using namespace WTF; | ||
535 | using namespace Unicode; | ||
536 | +using namespace XPath; | ||
537 | |||
538 | -namespace WebCore { | ||
539 | -namespace XPath { | ||
540 | - | ||
541 | -class LocationPath; | ||
542 | - | ||
543 | -#include "XPathGrammar.h" | ||
544 | +extern int xpathyyparse(WebCore::XPath::Parser*); | ||
545 | +#include "XPathGrammar.h" | ||
546 | |||
547 | Parser* Parser::currentParser = 0; | ||
548 | - | ||
549 | + | ||
550 | enum XMLCat { NameStart, NameCont, NotPartOfName }; | ||
551 | |||
552 | typedef HashMap<String, Step::Axis> AxisNamesMap; | ||
553 | @@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t) | ||
554 | delete t; | ||
555 | } | ||
556 | |||
557 | -} | ||
558 | -} | ||
diff --git a/meta/recipes-sato/webkit/files/no-gtkdoc.patch b/meta/recipes-sato/webkit/files/no-gtkdoc.patch new file mode 100644 index 0000000000..4eb09dc0e2 --- /dev/null +++ b/meta/recipes-sato/webkit/files/no-gtkdoc.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | make install invokes a gtk-doc tool without checking that we have gtk-doc. | ||
2 | |||
3 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
4 | |||
5 | Upstream-Status: Pending (https://bugs.webkit.org/show_bug.cgi?id=91239) | ||
6 | |||
7 | Index: webkit-1.8.1/Tools/GNUmakefile.am | ||
8 | =================================================================== | ||
9 | --- webkit-1.8.1.orig/Tools/GNUmakefile.am | ||
10 | +++ webkit-1.8.1/Tools/GNUmakefile.am | ||
11 | @@ -330,7 +330,9 @@ if ENABLE_WEBKIT2 | ||
12 | fi; \ | ||
13 | fi | ||
14 | endif | ||
15 | +if ENABLE_GTK_DOC | ||
16 | @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR} | ||
17 | +endif | ||
18 | |||
19 | uninstall-local: | ||
20 | @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \ | ||
diff --git a/meta/recipes-sato/webkit/files/nodolt.patch b/meta/recipes-sato/webkit/files/nodolt.patch new file mode 100644 index 0000000000..e713e8b5ec --- /dev/null +++ b/meta/recipes-sato/webkit/files/nodolt.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Dolt cause build error on some platform, so disable it. | ||
2 | |||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac | ||
8 | =================================================================== | ||
9 | --- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800 | ||
10 | +++ webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac 2011-01-21 11:11:15.000000000 +0800 | ||
11 | @@ -82,8 +82,6 @@ | ||
12 | AC_DISABLE_STATIC | ||
13 | AC_LIBTOOL_WIN32_DLL | ||
14 | AC_PROG_LIBTOOL | ||
15 | -# use dolt to speedup the build | ||
16 | -DOLT | ||
17 | |||
18 | AC_PATH_PROG(FLEX, flex) | ||
19 | if test -z "$FLEX"; then | ||
diff --git a/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch b/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch new file mode 100644 index 0000000000..ad7c55f264 --- /dev/null +++ b/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake 1.12 has deprecated use of mkdir_p, and it recommends | ||
4 | use of MKDIR_P instead. Changed the code to avoid these kind | ||
5 | of warning-errors. | ||
6 | |||
7 | ./.deps/DerivedSources | ||
8 | make[1]: ./.deps/DerivedSources: Command not found | ||
9 | make[1]: *** [all-local] Error 127 | ||
10 | |||
11 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
12 | 2012/07/10 | ||
13 | |||
14 | Index: webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am | ||
15 | =================================================================== | ||
16 | --- webkit-gtk-1.7.2+svnr101488-r6.orig/GNUmakefile.am | ||
17 | +++ webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am | ||
18 | @@ -255,7 +255,7 @@ MAINTAINERCLEANFILES += \ | ||
19 | # Older automake versions (1.7) place Plo files in a different place so we need | ||
20 | # to create the output directory manually. | ||
21 | all-local: stamp-po | ||
22 | - $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources | ||
23 | + $(MKDIR_P) $(top_builddir)/$(DEPDIR)/DerivedSources | ||
24 | |||
25 | # remove built sources and program directories | ||
26 | clean-local: | ||
27 | Index: webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am | ||
28 | =================================================================== | ||
29 | --- webkit-gtk-1.7.2+svnr101488-r6.orig/Source/WebKit/gtk/po/GNUmakefile.am | ||
30 | +++ webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am | ||
31 | @@ -132,13 +132,13 @@ DISTCLEANFILES += \ | ||
32 | $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot | ||
33 | |||
34 | po-install-data-local: all | ||
35 | - $(mkdir_p) $(DESTDIR)$(datadir) | ||
36 | + $(MKDIR_P) $(DESTDIR)$(datadir) | ||
37 | @catalogs='$(MOFILES)'; \ | ||
38 | for cat in $$catalogs; do \ | ||
39 | cat=`basename $$cat`; \ | ||
40 | lang=`echo $$cat | sed -e 's/\.mo$$//'`; \ | ||
41 | dir=$(localedir)/$$lang/LC_MESSAGES; \ | ||
42 | - $(mkdir_p) $(DESTDIR)$$dir; \ | ||
43 | + $(MKDIR_P) $(DESTDIR)$$dir; \ | ||
44 | if test -r Source/WebKit/gtk/po/$$cat; then realcat=Source/WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \ | ||
45 | $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ | ||
46 | echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ | ||
47 | @@ -173,13 +173,13 @@ po-install-data-local: all | ||
48 | done | ||
49 | |||
50 | po-installdirs-data-local: | ||
51 | - $(mkdir_p) $(DESTDIR)$(datadir) | ||
52 | + $(MKDIR_P) $(DESTDIR)$(datadir) | ||
53 | @catalogs='$(MOFILES)'; \ | ||
54 | for cat in $$catalogs; do \ | ||
55 | cat=`basename $$cat`; \ | ||
56 | lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ | ||
57 | dir=$(localedir)/$$lang/LC_MESSAGES; \ | ||
58 | - $(mkdir_p) $(DESTDIR)$$dir; \ | ||
59 | + $(MKDIR_P) $(DESTDIR)$$dir; \ | ||
60 | for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ | ||
61 | if test -n "$$lc"; then \ | ||
62 | if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ | ||
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch new file mode 100644 index 0000000000..5a42cd7c41 --- /dev/null +++ b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From 4084d31d5b1fe3bf041881ad124873dbf3cd1868 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 17 May 2013 19:51:11 -0700 | ||
4 | Subject: [PATCH] Enable mips64 build | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Upstream-Status: Pending | ||
8 | --- | ||
9 | Source/JavaScriptCore/wtf/Platform.h | 2 +- | ||
10 | Source/JavaScriptCore/wtf/dtoa/utils.h | 2 +- | ||
11 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h | ||
14 | =================================================================== | ||
15 | --- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2012-08-20 09:30:25.000000000 -0700 | ||
16 | +++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.624055787 -0700 | ||
17 | @@ -76,14 +76,19 @@ | ||
18 | |||
19 | /* CPU(MIPS) - MIPS 32-bit */ | ||
20 | /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */ | ||
21 | -#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \ | ||
22 | - && defined(_ABIO32) | ||
23 | +#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \ | ||
24 | + || defined(__mips64)) | ||
25 | +#if defined(__mips64) | ||
26 | +#define WTF_CPU_MIPS64 1 | ||
27 | +#define WTF_MIPS_ARCH __mips64 | ||
28 | +#else | ||
29 | #define WTF_CPU_MIPS 1 | ||
30 | +#define WTF_MIPS_ARCH __mips | ||
31 | +#endif | ||
32 | #if defined(__MIPSEB__) | ||
33 | #define WTF_CPU_BIG_ENDIAN 1 | ||
34 | #endif | ||
35 | #define WTF_MIPS_PIC (defined __PIC__) | ||
36 | -#define WTF_MIPS_ARCH __mips | ||
37 | #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v) | ||
38 | #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v) | ||
39 | #define WTF_MIPS_ARCH_REV __mips_isa_rev | ||
40 | @@ -295,7 +300,7 @@ | ||
41 | |||
42 | #endif /* ARM */ | ||
43 | |||
44 | -#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) | ||
45 | +#if CPU(ARM) || CPU(MIPS) || CPU(MIPS64) || CPU(SH4) || CPU(SPARC) | ||
46 | #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 | ||
47 | #endif | ||
48 | |||
49 | @@ -899,6 +904,7 @@ | ||
50 | || CPU(ALPHA) \ | ||
51 | || CPU(SPARC64) \ | ||
52 | || CPU(S390X) \ | ||
53 | + || CPU(MIPS64) \ | ||
54 | || CPU(PPC64) | ||
55 | #define WTF_USE_JSVALUE64 1 | ||
56 | #else | ||
57 | Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h | ||
58 | =================================================================== | ||
59 | --- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2012-08-20 09:26:05.000000000 -0700 | ||
60 | +++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.424054793 -0700 | ||
61 | @@ -49,7 +49,7 @@ | ||
62 | defined(__ARMEL__) || \ | ||
63 | defined(_MIPS_ARCH_MIPS32R2) | ||
64 | #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 | ||
65 | -#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) | ||
66 | +#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) | ||
67 | #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 | ||
68 | #elif defined(_M_IX86) || defined(__i386__) | ||
69 | #if defined(_WIN32) | ||
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch new file mode 100644 index 0000000000..a76b0ba2b6 --- /dev/null +++ b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | Upstream-Status: Pending | ||
2 | Signed-off-by: Riku Voipio <riku.voipio@linaro.org> | ||
3 | Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h | ||
4 | =================================================================== | ||
5 | --- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.000000000 -0700 | ||
6 | +++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:59:18.764056782 -0700 | ||
7 | @@ -304,6 +304,11 @@ | ||
8 | #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 | ||
9 | #endif | ||
10 | |||
11 | +/* CPU(AARCH64) - Aarch64 */ | ||
12 | +#if defined(__aarch64__) | ||
13 | +#define WTF_CPU_AARCH64 1 | ||
14 | +#endif | ||
15 | + | ||
16 | /* ==== OS() - underlying operating system; only to be used for mandated low-level services like | ||
17 | virtual memory, not to choose a GUI toolkit ==== */ | ||
18 | |||
19 | @@ -905,7 +910,8 @@ | ||
20 | || CPU(SPARC64) \ | ||
21 | || CPU(S390X) \ | ||
22 | || CPU(MIPS64) \ | ||
23 | - || CPU(PPC64) | ||
24 | + || CPU(PPC64) \ | ||
25 | + || CPU(AARCH64) | ||
26 | #define WTF_USE_JSVALUE64 1 | ||
27 | #else | ||
28 | #define WTF_USE_JSVALUE32_64 1 | ||
29 | Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h | ||
30 | =================================================================== | ||
31 | --- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.000000000 -0700 | ||
32 | +++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:58:28.340056029 -0700 | ||
33 | @@ -49,7 +49,7 @@ | ||
34 | defined(__ARMEL__) || \ | ||
35 | defined(_MIPS_ARCH_MIPS32R2) | ||
36 | #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 | ||
37 | -#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) | ||
38 | +#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64) | ||
39 | #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 | ||
40 | #elif defined(_M_IX86) || defined(__i386__) | ||
41 | #if defined(_WIN32) | ||
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch new file mode 100644 index 0000000000..d9e8444815 --- /dev/null +++ b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd webkit-1.8.3/configure.ac webkit-1.8.3/configure.ac | ||
5 | --- webkit-1.8.3/configure.ac 2012-08-20 19:35:38.000000000 +0300 | ||
6 | +++ webkit-1.8.3/configure.ac 2013-02-08 11:55:28.403397789 +0200 | ||
7 | @@ -111,7 +111,6 @@ | ||
8 | |||
9 | AC_PROG_CC | ||
10 | AC_PROG_CXX | ||
11 | -AM_PROG_CC_STDC | ||
12 | AM_PROG_CC_C_O | ||
13 | AC_PROG_INSTALL | ||
14 | AC_SYS_LARGEFILE | ||
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb new file mode 100644 index 0000000000..920e1a0a76 --- /dev/null +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | |||
@@ -0,0 +1,106 @@ | |||
1 | SUMMARY = "WebKit web rendering engine for the GTK+ platform" | ||
2 | HOMEPAGE = "http://www.webkitgtk.org/" | ||
3 | BUGTRACKER = "http://bugs.webkit.org/" | ||
4 | |||
5 | LICENSE = "BSD & LGPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ | ||
7 | file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ | ||
8 | file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" | ||
9 | |||
10 | PR = "r1" | ||
11 | |||
12 | # Choice of language backends - icu has issues on Big Endian machines so use pango | ||
13 | ICU_LIB = "icu" | ||
14 | ICU_LIB_powerpc = "pango" | ||
15 | |||
16 | DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ | ||
17 | gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" | ||
18 | DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" | ||
19 | |||
20 | SRC_URI = "\ | ||
21 | http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ | ||
22 | file://nodolt.patch \ | ||
23 | file://no-gtkdoc.patch \ | ||
24 | file://webgit-gtk_fix_build_with_automake_1.12.patch \ | ||
25 | file://bison-2.6.patch \ | ||
26 | file://obsolete_automake_macros.patch \ | ||
27 | file://0001-Enable-mips64-build.patch \ | ||
28 | file://aarch64.patch \ | ||
29 | " | ||
30 | |||
31 | SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6" | ||
32 | SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7" | ||
33 | |||
34 | # webkit-gtk can NOT be built on MIPS64 with n32 ABI | ||
35 | COMPATIBLE_HOST_mips64n32 = "null" | ||
36 | |||
37 | inherit autotools lib_package gtk-doc pkgconfig | ||
38 | |||
39 | S = "${WORKDIR}/webkit-${PV}/" | ||
40 | |||
41 | EXTRA_OECONF = "\ | ||
42 | --enable-debug=no \ | ||
43 | --enable-svg \ | ||
44 | --enable-icon-database=yes \ | ||
45 | --enable-fullscreen-api \ | ||
46 | --enable-image-resizer \ | ||
47 | --enable-link-prefetch \ | ||
48 | --with-gtk=2.0 \ | ||
49 | --disable-geolocation \ | ||
50 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ | ||
51 | UNICODE_CFLAGS=-D_REENTRANT \ | ||
52 | " | ||
53 | |||
54 | #default unicode backend icu breaks in cross-compile when target and host are different endian type | ||
55 | EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib" | ||
56 | |||
57 | CPPFLAGS_append_powerpc = " -I${STAGING_INCDIR}/pango-1.0 \ | ||
58 | -I${STAGING_LIBDIR}/glib-2.0/include \ | ||
59 | -I${STAGING_INCDIR}/glib-2.0" | ||
60 | |||
61 | # ld can run out of memory linking libwebkitgtk! | ||
62 | # | ||
63 | LDFLAGS += "-Wl,--no-keep-memory" | ||
64 | |||
65 | EXTRA_AUTORECONF = " -I Source/autotools " | ||
66 | |||
67 | |||
68 | #| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]': | ||
69 | #| ./Source/JavaScriptCore/heap/Handle.h:141:79: instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]' | ||
70 | #| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here | ||
71 | #| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align] | ||
72 | #| {standard input}: Assembler messages: | ||
73 | #| {standard input}:28873: Error: invalid immediate: 983040 is out of range | ||
74 | #| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110 | ||
75 | #| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819 | ||
76 | #| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as) | ||
77 | #| Please submit a full bug report, | ||
78 | #| with preprocessed source if appropriate. | ||
79 | #| See <http://gcc.gnu.org/bugs.html> for instructions. | ||
80 | #| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1 | ||
81 | #| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0' | ||
82 | ARM_INSTRUCTION_SET = "arm" | ||
83 | |||
84 | CONFIGUREOPT_DEPTRACK = "" | ||
85 | |||
86 | do_configure_append() { | ||
87 | # somethings wrong with icu, fix it up manually | ||
88 | for makefile in $(find ${B} -name "GNUmakefile") ; do | ||
89 | sed -i s:-I/usr/include::g $makefile | ||
90 | done | ||
91 | } | ||
92 | |||
93 | do_install_append() { | ||
94 | rmdir ${D}${libexecdir} | ||
95 | } | ||
96 | |||
97 | PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" | ||
98 | FILES_${PN}launcher = "${bindir}/GtkLauncher" | ||
99 | FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" | ||
100 | FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*" | ||
101 | FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/" | ||
102 | FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \ | ||
103 | ${datadir}/webkitgtk-*/images \ | ||
104 | ${datadir}/glib-2.0/schemas" | ||
105 | |||
106 | |||