diff options
Diffstat (limited to 'meta/recipes-sato')
69 files changed, 0 insertions, 2505 deletions
diff --git a/meta/recipes-sato/gaku/gaku_git.bb b/meta/recipes-sato/gaku/gaku_git.bb deleted file mode 100644 index 5e1cba55fa..0000000000 --- a/meta/recipes-sato/gaku/gaku_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Simple music player using GTK+ and GStreamer" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a" -DEPENDS = "gtk+ gstreamer libowl-av" - -RDEPENDS_${PN} = "gst-plugins-base-audioconvert \ - gst-plugins-base-audioresample \ - gst-plugins-base-typefindfunctions \ - gst-plugins-base-playbin" - -RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ - gst-plugins-base-vorbis \ - gst-plugins-base-alsa \ - gst-plugins-base-ogg \ - ${COMMERCIAL_AUDIO_PLUGINS}" - -SRCREV = "a0be2fe4b5f12b8b07f4e3bd624b3729657f0ac5" -PV = "0.1+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -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 deleted file mode 100644 index 4e37ff2047..0000000000 --- a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Sato theme engine for GTK+" -HOMEPAGE = "http://www.o-hand.com" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "LGPLv2.1 & LGPLv2+" - -SECTION = "x11/base" -DEPENDS = "gtk+" -RDEPENDS_gtk-theme-sato = "gtk-sato-engine" - -PACKAGES += "gtk-theme-sato" -FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so " -FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*.la" -FILES_${PN}-dbg += " ${libdir}/gtk-2.0/*/engines/.debug" -FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes" - -inherit autotools-brokensep pkgconfig - -do_configure_prepend() { - for i in `ls gtk-common`; do - ln -sf ../gtk-common/$i gtk2-engine/$i - done -} diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb deleted file mode 100644 index 8d4378536a..0000000000 --- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb +++ /dev/null @@ -1,14 +0,0 @@ -require gtk-sato-engine.inc - -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \ - file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a" - -SRCREV = "4740ad8d53aba4368ce3e03b06cfdc69eb86dcdc" -PV = "0.3.3+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -EXTRA_OECONF += "${@base_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 deleted file mode 100644 index 7fa69d0997..0000000000 --- a/meta/recipes-sato/images/core-image-sato-dev.bb +++ /dev/null @@ -1,7 +0,0 @@ -require core-image-sato.bb - -DESCRIPTION = "Image with Sato for development work. It includes everything \ -within core-image-sato plus a native toolchain, application development and \ -testing libraries, profiling and debug symbols." - -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 deleted file mode 100644 index 6d4b96a1f9..0000000000 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ /dev/null @@ -1,14 +0,0 @@ -require core-image-sato.bb - -DESCRIPTION = "Image with Sato support that includes everything within \ -core-image-sato plus meta-toolchain, development headers and libraries to \ -form a standalone SDK." - -QT4PKG = "qt4-pkgs" -QT4PKG_mips64 = "" - -IMAGE_FEATURES += "dev-pkgs tools-sdk ${QT4PKG} \ - tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" - -IMAGE_INSTALL += "kernel-dev" - diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb deleted file mode 100644 index e3246d2b67..0000000000 --- a/meta/recipes-sato/images/core-image-sato.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ -mobile devices. The image supports X11 with a Sato theme, Pimlico \ -applications, and contains terminal, editor, and file manager." - -IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs" - -LICENSE = "MIT" - -inherit core-image - -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 deleted file mode 100644 index c7e2d5bb58..0000000000 --- a/meta/recipes-sato/leafpad/files/leafpad.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Notes -Exec=/usr/bin/leafpad -Comment=Text Editor -Icon=accessories-text-editor -Terminal=false -Type=Application -Categories=GTK;Utility;TextEditor; -X-MB-SingleInstance=true -StartupNotify=true diff --git a/meta/recipes-sato/leafpad/files/owl-menu.patch b/meta/recipes-sato/leafpad/files/owl-menu.patch deleted file mode 100644 index 2ebf74a6f7..0000000000 --- a/meta/recipes-sato/leafpad/files/owl-menu.patch +++ /dev/null @@ -1,63 +0,0 @@ -Upstream-Status: Inappropriate [enable feature] - ---- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100 -+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100 -@@ -152,7 +152,7 @@ - } - - accel_group = gtk_accel_group_new(); -- ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group); -+ ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group); - gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL); - gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL); - gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); - ---- tmp/src/window.c.orig 2007-04-23 12:14:07.000000000 +0100 -+++ tmp/src/window.c 2007-04-23 12:14:07.000000000 +0100 -@@ -18,6 +18,8 @@ - */ - - #include "leafpad.h" -+#include <libowl/owlwindowmenu.h> -+ - /* - static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view) - { -@@ -52,7 +54,6 @@ - gtk_container_add(GTK_CONTAINER(window), vbox); - - menubar = create_menu_bar(window); -- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); - - sw = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), - ---- tmp/src/main.c.orig 2007-04-23 12:15:03.000000000 +0100 -+++ tmp/src/main.c 2007-04-23 12:15:03.000000000 +0100 -@@ -244,6 +244,7 @@ - Conf *conf; - GtkItemFactory *ifactory; - gchar *stdin_data = NULL; -+ GtkWidget *menu; - - bindtextdomain(PACKAGE, LOCALEDIR); - bind_textdomain_codeset(PACKAGE, "UTF-8"); -@@ -293,7 +294,10 @@ - conf->autoindent); - - gtk_widget_show_all(pub->mw->window); -+ owl_set_window_menu (GTK_WINDOW(pub->mw->window), -+ GTK_MENU(pub->mw->menubar)); -+ - g_free(conf->fontname); - g_free(conf); - - ---- tmp/src/Makefile.am.orig 2007-04-23 12:17:54.000000000 +0100 -+++ tmp/src/Makefile.am 2007-04-23 12:17:54.000000000 +0100 -@@ -27,4 +27,4 @@ - i18n.h - - leafpad_CFLAGS = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS) --leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -+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 deleted file mode 100644 index f124be9a54..0000000000 --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Simple GTK+ Text Editor" -HOMEPAGE = "http://tarot.freeshell.org/leafpad/" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \ - file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571" - -DEPENDS = "gtk+ intltool-native" -DEPENDS_append_poky = " libowl" -SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \ - file://leafpad.desktop" - -SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97" -SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c" -PR = "r2" - -SRC_URI_append_poky = " file://owl-menu.patch;apply=yes " - -inherit autotools pkgconfig - -EXTRA_OECONF = " --enable-chooser --disable-emacs --disable-print" - -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications -} - -FILES_${PN} += "${datadir}/applications/leafpad.desktop" - -PACKAGES += "leafpad-stock-icons" -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 deleted file mode 100644 index 3ccd3406bd..0000000000 --- a/meta/recipes-sato/libowl/libowl_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "OpenedHand Widget Library" -HOMEPAGE = "http://www.o-hand.com" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2 & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libowl/owlpaned.h;endline=20;md5=7fef844c4cc01b10541a7ab6ab5971af \ - file://libowl/owltreemodelslice.h;endline=20;md5=a5421f2cdae8debe5e4c48c09a02beb9 \ - file://libowl/owlcolourswatch.h;endline=24;md5=063c415c58719d536990ca8f606b5730" - -SECTION = "libs" -DEPENDS = "gtk+" -SRCREV = "6ebc8ac8f8575278dd40a535cadefa26374e44b1" -PV = "0.1+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -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 deleted file mode 100644 index 825694962b..0000000000 --- a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: appearance/mb-appearance.c -=================================================================== ---- appearance/mb-appearance.c (revision 1614) -+++ appearance/mb-appearance.c (working copy) -@@ -300,11 +300,13 @@ - gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button), - gconf_value_get_string (value)); - } else if (strcmp (key, HANDED_KEY) == 0) { -+#if 0 - GEnumValue *e; - e = g_enum_get_value_by_name (g_type_class_ref (GTK_TYPE_CORNER_TYPE), - gconf_value_get_string (value)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (handed_check), - e->value == GTK_CORNER_TOP_RIGHT); -+#endif - } - } - -@@ -395,12 +397,13 @@ - gtk_container_add (GTK_CONTAINER (align), font_button); - - /* Left/Right Handed */ -- -+#if 0 - frame = new_frame (_("Orientation"), &align); - gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0); - handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed")); - g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL); - gtk_container_add (GTK_CONTAINER (align), handed_check); -+#endif - - gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - 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 deleted file mode 100644 index f0119b7073..0000000000 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Matchbox GTK+ theme configuration application" -HOMEPAGE = "http://matchbox-project.org" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" - -DEPENDS = "gconf gtk+" -RDEPENDS_${PN} = "settings-daemon" - -SRCREV = "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" -PV = "0.0+git${SRCPV}" - -S = "${WORKDIR}/git" - -SRC_URI = "git://git.yoctoproject.org/${BPN} \ - file://no-handed.patch;striplevel=0" - -inherit autotools pkgconfig - 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 deleted file mode 100644 index 1979cbb769..0000000000 --- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Matchbox desktop folders for the Sato environment" -HOMEPAGE = "http://matchbox-project.org" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -SECTION = "x11" -DEPENDS = "" -RCONFLICTS_${PN} = "matchbox-common" - -SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07" -PV = "0.1+git${SRCPV}" -PR = "r1" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -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 deleted file mode 100644 index 388f51f07f..0000000000 --- a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -after gcc linking has changed, all the libraries must be explicitely specified to for linking. -This patch avoids this linking error: - -| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M -| 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 -| /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 -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make[2]: *** [matchbox-desktop] Error 1 - -Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2011/01/11 - -Upstream-Status: Accepted - -Index: matchbox-desktop-2/configure.ac -=================================================================== ---- matchbox-desktop-2.orig/configure.ac -+++ matchbox-desktop-2/configure.ac -@@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then - AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled]) - fi - --PKG_CHECK_MODULES(GTK, gtk+-2.0) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11]) - - AC_ARG_ENABLE(startup_notification, - 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 deleted file mode 100644 index 120f086445..0000000000 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Matchbox Window Manager Desktop" -LICENSE = "GPLv2.0+" -DEPENDS = "libmatchbox startup-notification" -SECTION = "x11/wm" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2" - -SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c" -SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793" - -EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir}/* \ - ${datadir}/applications \ - ${libdir}/matchbox/desktop/*.so \ - ${datadir}/matchbox-desktop \ - ${datadir}/pixmaps \ - ${sysconfdir}/matchbox" - -FILES_${PN}-dev += "${libdir}/matchbox-desktop \ - ${includedir}/matchbox-desktop \ - ${libdir}/matchbox/desktop/*.*a \ - ${datadir}/matchbox/desktop/modules/*a" - -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 deleted file mode 100644 index c52e7f2ca4..0000000000 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Matchbox Window Manager Desktop" -LICENSE = "GPLv2.0+" -DEPENDS = "gtk+ startup-notification" -SECTION = "x11/wm" -PR = "r2" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \ - file://dso_linking_change_build_fix.patch" - -SRC_URI[md5sum] = "b0a4a47130272e2adab4e9feb43a6c9c" -SRC_URI[sha256sum] = "be33ff0bc8a9b1eee6af360a5118e470e69a6292ecc9e154ec6f349fce5c5f75" - -EXTRA_OECONF = "--enable-startup-notification" - -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 deleted file mode 100644 index 29b472a933..0000000000 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Matchbox Window Manager Desktop" -HOMEPAGE = "http://matchbox-project.org/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libtaku/eggsequence.h;endline=20;md5=b91f68f7642a1459fa1f4c9df94a8f15 \ - file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \ - file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00" - -DEPENDS = "gtk+ startup-notification dbus" -SECTION = "x11/wm" -SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d" -PV = "2.0+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN}-2" - -EXTRA_OECONF = "--enable-startup-notification --with-dbus" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh deleted file mode 100644 index 6cf188b2d0..0000000000 --- a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -CMD="" - -if [ "$HAVE_KEYBOARD" = "0" ]; then - CMD="matchbox-keyboard -d" -elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then - if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then - CMD="matchbox-keyboard -d -o landscape" - elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then - CMD="matchbox-keyboard -d -o portrait" - fi -fi - -if [ "$CMD" ]; then - # Delay to make sure the window manager is active - # by waiting for the desktop to say its finished loading - dbus-wait org.matchbox_project.desktop Loaded && $CMD & -fi diff --git a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch deleted file mode 100644 index 18b6c41746..0000000000 --- a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch +++ /dev/null @@ -1,23 +0,0 @@ -Multiple matchbox-keyboard instances would occupy whole screen and cause X -window segfault(Bug 509). Making matchbox-keyboard singleton is one work -around. - -This patch allow only one instance of matchbox-keyboard based on some mechanism -in matchbox-desktop. In future, an applet and GTK-IM modules in -matchbox-keyboard can be used to automatically map/unmap the virtual keyboard -on demand. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [configuration] - -Index: matchbox-keyboard/matchbox-keyboard.desktop -=================================================================== ---- matchbox-keyboard.orig/matchbox-keyboard.desktop 2010-12-22 20:41:40.000000000 +0800 -+++ matchbox-keyboard/matchbox-keyboard.desktop 2010-12-22 20:42:12.000000000 +0800 -@@ -6,3 +6,5 @@ - Icon=matchbox-keyboard.png - Categories=Panel;Utility;MB - X-MB-INPUT-MECHANSIM=True -+X-MB-SingleInstance=true -+StartupNotify=true diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb deleted file mode 100644 index 7a99a9c46a..0000000000 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Matchbox virtual keyboard for X11" -HOMEPAGE = "http://matchbox-project.org" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" -SECTION = "x11" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \ - file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7" - -DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" - -SRCREV = "217f1bfe14c41cf7e291d04a63aa2d79cc13d063" -PV = "0.0+git${SRCPV}" -PR = "r4" - -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ - file://single-instance.patch \ - file://80matchboxkeyboard.sh" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig gettext gtk-immodules-cache - -EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" - -PACKAGES += "${PN}-im ${PN}-applet" - -FILES_${PN} = "${bindir}/ \ - ${sysconfdir} \ - ${datadir}/applications \ - ${datadir}/pixmaps \ - ${datadir}/matchbox-keyboard" - -FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug" - -FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so" - -FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" - - -do_install_append () { - install -d ${D}/${sysconfdir}/X11/Xsession.d/ - install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ - - rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la - rm -f ${D}${libdir}/matchbox-panel/*.la -} - -GTKIMMODULES_PACKAGES = "${PN}-im" - -RDEPENDS_${PN} = "formfactor dbus-wait" -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 deleted file mode 100644 index 45ba9a0318..0000000000 --- a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch +++ /dev/null @@ -1,64 +0,0 @@ -Don't warn if the machine doesn't actually have a battery, or if the applets -string contains consecutive separators. - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c -index 6515cb0..c44dd12 100644 ---- a/applets/battery/battery-acpi.c -+++ b/applets/battery/battery-acpi.c -@@ -14,8 +14,6 @@ int batt_state, ac_state; - int pm_support(void) - { - if(check_acpi_support() == NOT_SUPPORTED){ -- g_warning("No ACPI support\n"); -- - return 0; - } - -@@ -32,8 +30,9 @@ const char* pm_battery_icon(void) - const char *icon; - battery_t *binfo; - -+ /* No battery available (not present, disabled, or something -+ else. Silently do nothing. */ - if (batt_state != SUCCESS) { -- g_warning("Couldnt initialize ACPI battery\n"); - return NULL; - } - -diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c -index 5467438..2f39cb6 100644 ---- a/applets/battery/battery-apm.c -+++ b/applets/battery/battery-apm.c -@@ -10,8 +10,6 @@ - int pm_support(void) - { - if (1 == apm_exists ()) { -- g_warning ("No APM support"); -- - return 0; - } - -diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c -index 2d8cafd..828a36d 100644 ---- a/matchbox-panel/mb-panel.c -+++ b/matchbox-panel/mb-panel.c -@@ -110,10 +110,15 @@ load_applets (const char *applets_desc, - applets = g_strsplit (applets_desc, ",", -1); - - for (i = 0; applets[i]; i++) { -+ char *s; - char **bits; - GtkWidget *applet; - -- bits = g_strsplit (applets[i], ":", 2); -+ s = applets[i]; -+ if (s == NULL || s[0] == '\0') -+ continue; -+ -+ bits = g_strsplit (s, ":", 2); - - applet = load_applet (bits[0], - 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 deleted file mode 100644 index 31d32c6ec8..0000000000 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Simple GTK+ based panel for handheld devices" -HOMEPAGE = "http://matchbox-project.org" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \ - file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03" - -DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" -DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" -DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" - -SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" -PV = "2.0+git${SRCPV}" - -RPROVIDES_${PN} = "matchbox-panel" -RREPLACES_${PN} = "matchbox-panel" -RCONFLICTS_${PN} = "matchbox-panel" - -SRC_URI = "git://git.yoctoproject.org/${BPN} \ - file://silence-warnings.patch" - -EXTRA_OECONF = "--enable-startup-notification --enable-dbus" -EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" -EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" - -S = "${WORKDIR}/git" - -FILES_${PN} += "${libdir}/matchbox-panel/*.so \ - ${datadir}/matchbox-panel/brightness/*.png \ - ${datadir}/matchbox-panel/startup/*.png " -FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" -FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" - -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 deleted file mode 100644 index a3138b6961..0000000000 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -if [ "$HAVE_TOUCHSCREEN" = "1" ]; then - SHOWCURSOR="no" -else - SHOWCURSOR="yes" -fi - -if [ "$HAVE_KEYBOARD" = "1" ]; then - KEYBOARD_APPLET="" -else - KEYBOARD_APPLET="keyboard" -fi - - -matchbox-desktop & - -# Lines containing feature-[foo] are removed at build time if the machine -# doesn't have the feature "foo". - -START_APPLETS=showdesktop,windowselector -END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify -END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone - -matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS & - -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 deleted file mode 100644 index fe84a0fc99..0000000000 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Custom Matchbox session files for the Sato environment" -HOMEPAGE = "http://www.matchbox-project.org/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2.0+" -LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" - -SECTION = "x11" -DEPENDS = "gconf-native" -RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf" -PR = "r30" - -# This package is architecture specific because the session script is modified -# based on the machine architecture. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "file://session" -S = "${WORKDIR}" - -do_install() { - # This is the set of machine features that the script has markers for - FEATURES="phone" - SCRIPT="${S}/sedder" - rm -f $SCRIPT - touch $SCRIPT - for FEAT in $FEATURES; do - if echo ${MACHINE_FEATURES} | awk "/$FEAT/ {exit 1}"; then - echo "/feature-$FEAT/d" >> $SCRIPT - fi - done - - install -d ${D}/${sysconfdir}/matchbox - sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session - chmod +x ${D}/${sysconfdir}/matchbox/session -} - -pkg_postinst_${PN} () { - set_value() { - #type, name, value - gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3" - } - set_value string theme Sato - set_value string icon_theme Sato - set_value bool touchscreen true - set_value string font_name "Sans 9" -} diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb deleted file mode 100644 index 91fd150e3b..0000000000 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Lightweight GTK+ terminal application" -HOMEPAGE = "http://www.matchbox-project.org/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820" - -DEPENDS = "gtk+ vte" -SECTION = "x11/utils" -SRCREV = "452bca253492a97a587f440289b9ab27d217353e" -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -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 deleted file mode 100644 index b0f8380f56..0000000000 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Matchbox window manager Sato themes" -HOMEPAGE = "http://www.matchbox-project.org/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "CC-BY-SA-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=aae86bb34b0a83716ca09f4e783d6ba4" - -DEPENDS = "matchbox-wm" -SECTION = "x11/wm" - -inherit autotools pkgconfig - -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 deleted file mode 100644 index f6786dda5c..0000000000 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require matchbox-theme-sato.inc - -PR = "r1" - -SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz" - -SRC_URI[md5sum] = "72ae272ef7803141a3dcb69e670cff97" -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 deleted file mode 100644 index 23dc043b0b..0000000000 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -require matchbox-theme-sato.inc - -SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8" -PV = "0.2+git${SRCPV}" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "git://git.yoctoproject.org/matchbox-sato" - -EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" - -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 deleted file mode 100644 index b359037e22..0000000000 --- a/meta/recipes-sato/midori/midori_0.5.5.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "A lightweight web browser" -HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libunique" - -SRC_URI = "http://www.midori-browser.org/downloads/${BPN}_${PV}_all_.tar.bz2 \ -" - -SRC_URI[md5sum] = "b99e87d4b73a4732ed1c1e591f0242ac" -SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62" - -# midori depends on webkit-gtk, and webkit-gtk can NOT be built on -# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. -COMPATIBLE_HOST_mips64 = "mips64.*-linux$" - -inherit gtk-icon-cache pkgconfig vala pythonnative - -do_configure() { - sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript - ./configure \ - --prefix=${prefix} \ - --bindir=${bindir} \ - --sbindir=${sbindir} \ - --libexecdir=${libexecdir} \ - --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - --sharedstatedir=${sharedstatedir} \ - --localstatedir=${localstatedir} \ - --libdir=${libdir} \ - --includedir=${includedir} \ - --infodir=${infodir} \ - --mandir=${mandir} \ - --disable-gtk3 \ - --disable-zeitgeist \ -} - -PARALLEL_MAKE = "" -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" - -FILES_${PN}-dev += "${datadir}/vala/vapi" diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb deleted file mode 100644 index 2b768d5916..0000000000 --- a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "OpenedHand Widget Library Audio/Video" -HOMEPAGE = "http://www.o-hand.com" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ - file://libowl-av/owl-video-widget.h;endline=22;md5=0d4caab10952acdf470086c25c7f70c8 \ - file://libowl-av/owl-audio-player.h;endline=22;md5=4af2d44f206a086f9f03881236f7390b" - -SECTION = "x11" -DEPENDS = "gtk+ gstreamer gst-plugins-base" -RDEPENDS_${PN} = "gst-meta-base" -RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" - -SRCREV = "03030c41ea578cfa74a2ffceb875675b248318ae" -PV = "0.1+git${SRCPV}" -PR = "r3" - - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -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 deleted file mode 100644 index e7af07ee64..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Video -Exec=video -Icon=video-player -Terminal=false -Type=Application -Categories=AudioVideo;Video;Player; -X-MB-SingleInstance=true -StartupNotify=true -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 Binary files differdeleted file mode 100644 index f463fe1864..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c2b9c582a1..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index f3f57143d4..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 03f5a03b45..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index f774e42bb1..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index f3f57143d4..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png +++ /dev/null diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb deleted file mode 100644 index db83154846..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "OpenedHand Widget Library video widget" -HOMEPAGE = "http://o-hand.com/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" -LICENSE = "LGPLv2.1 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ - file://src/video.c;endline=22;md5=e8e9f23c3691c11af7d8fc03264ca9da \ - file://src/bacon-volume.c;endline=20;md5=798804562b24e30bac482ba91c45e46d" -SECTION = "x11" -DEPENDS = "libowl-av" - -SRCREV = "07ab48f331a5e6e0d169e4892c7eb1fc22dc0b9d" -PV = "0.1+git${SRCPV}" -PR = "r2" - -S = "${WORKDIR}/git" - -SRC_URI = "git://git.yoctoproject.org/${BPN} \ - file://owl-video-widget.png \ - file://stock_media-play.png \ - file://stock_volume-0.png \ - file://stock_volume-min.png \ - file://stock_volume-med.png \ - file://stock_volume-max.png \ - file://owl-video-widget.desktop" - -inherit autotools pkgconfig - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_media-play.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_volume-0.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_volume-min.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_volume-med.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_volume-max.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/owl-video-widget.png ${D}/${datadir}/pixmaps - - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications -} - -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 deleted file mode 100644 index 4ec5e8961c..0000000000 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -SUMMARY = "Sato desktop" -LICENSE = "MIT" -PR = "r33" - -inherit packagegroup - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" - -# For backwards compatibility after rename -RPROVIDES_${PN} = "task-core-x11-sato" -RREPLACES_${PN} = "task-core-x11-sato" -RCONFLICTS_${PN} = "task-core-x11-sato" - -RDEPENDS_${PN} = "\ - ${PN}-base \ - ${PN}-apps \ - ${PN}-games \ - " - -NETWORK_MANAGER ?= "connman-gnome" -NETWORK_MANAGER_libc-uclibc = "" - -SUMMARY_${PN}-base = "Sato desktop - base packages" -RDEPENDS_${PN}-base = "\ - matchbox-desktop \ - matchbox-session-sato \ - matchbox-keyboard \ - matchbox-keyboard-applet \ - matchbox-keyboard-im \ - matchbox-config-gtk \ - xcursor-transparent-theme \ - sato-icon-theme \ - settings-daemon \ - gtk-sato-engine \ - shutdown-desktop \ - libsdl \ - ${NETWORK_MANAGER} \ - udev-extraconf \ - " - -# pcmanfm doesn't work on mips -FILEMANAGER ?= "pcmanfm" -FILEMANAGER_mips ?= "" - -WEB ?= "" -#WEB = "midori" - -SUMMARY_${PN}-apps = "Sato desktop - applications" -RDEPENDS_${PN}-apps = "\ - leafpad \ - gaku \ - x11vnc \ - matchbox-terminal \ - sato-screenshot \ - ${FILEMANAGER} \ - ${WEB} \ - " - -SUMMARY_${PN}-games = "Sato desktop - games" -RDEPENDS_${PN}-games = "\ - oh-puzzles \ - " diff --git a/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png b/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png Binary files differdeleted file mode 100644 index b8e559456e..0000000000 --- a/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png +++ /dev/null diff --git a/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png b/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png Binary files differdeleted file mode 100644 index 05921a6689..0000000000 --- a/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png +++ /dev/null diff --git a/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png b/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png Binary files differdeleted file mode 100644 index ce77a8e62d..0000000000 --- a/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png +++ /dev/null diff --git a/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png b/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png Binary files differdeleted file mode 100644 index bfe4bad56c..0000000000 --- a/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png +++ /dev/null diff --git a/meta/recipes-sato/pcmanfm/files/no-desktop.patch b/meta/recipes-sato/pcmanfm/files/no-desktop.patch deleted file mode 100644 index 103d6d14a2..0000000000 --- a/meta/recipes-sato/pcmanfm/files/no-desktop.patch +++ /dev/null @@ -1,15 +0,0 @@ -Disable the desktop preferences launcher as we don't use the pcmanfm desktop in -Sato. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/data/pcmanfm-desktop-pref.desktop b/data/pcmanfm-desktop-pref.desktop -index ccf8abb..3f6fc1c 100644 ---- a/data/pcmanfm-desktop-pref.desktop.in -+++ b/data/pcmanfm-desktop-pref.desktop.in -@@ -7,3 +7,4 @@ Exec=pcmanfm --desktop-pref - StartupNotify=true - Terminal=false - NotShowIn=GNOME;XFCE;KDE; -+NoDisplay=true diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb deleted file mode 100644 index fe25682783..0000000000 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Fast lightweight tabbed filemanager" -HOMEPAGE = "http://pcmanfm.sourceforge.net/" - -LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://src/pcmanfm.h;endline=22;md5=417b3855771a3a87f8ad753d994491f0 \ - file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" - -SECTION = "x11" -DEPENDS = "gtk+ startup-notification libfm" -DEPENDS_append_poky = " libowl" - - -COMPATIBLE_HOST = '(x86_64.*|i.86.*|aarch64.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)' - -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ - file://gnome-fs-directory.png \ - file://gnome-fs-regular.png \ - file://gnome-mime-text-plain.png \ - file://emblem-symbolic-link.png \ - file://no-desktop.patch" - -SRC_URI[md5sum] = "41104699e653ff2b0a9a9e80a257d6a2" -SRC_URI[sha256sum] = "23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950" - -inherit autotools pkgconfig - -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/pixmaps/ - - install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps -} diff --git a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch deleted file mode 100644 index 7e2c3ab75d..0000000000 --- a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch +++ /dev/null @@ -1,203 +0,0 @@ -This patch enable owl menu, which is hidden in the title bar to save space on -small screen. It has not been used for a long time, rebase needed. - -Upstream-Status: Inappropriate [enable feature] - -Index: src/gtk.c -=================================================================== ---- src/gtk.c (revision 22) -+++ src/gtk.c (working copy) -@@ -28,6 +28,8 @@ - #include <gdk/gdkx.h> - #include <gdk-pixbuf/gdk-pixbuf.h> - -+#include <libowl/owlwindowmenu.h> -+ - #include <librsvg/rsvg.h> - - #include <X11/Xlib.h> -@@ -1237,6 +1239,7 @@ - } - } - -+#if 0 - static void - add_widget (GtkUIManager *merge, - GtkWidget *widget, -@@ -1247,10 +1250,11 @@ - gtk_box_pack_start (box, widget, FALSE, FALSE, 0); - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box)); -- gtk_widget_show_all (toplevel); - } -+#endif - - static GtkActionEntry toplevel_actions[] = { -+ { "Top", NULL, "" }, - { "Game", NULL, N_("Game") }, - { "Settings", NULL, N_("Settings") }, - { "Help", NULL, N_("Help") }, -@@ -1303,11 +1307,13 @@ - frontend *fe) - { - GString *xml; -+ GError *error = NULL; - gboolean presets = FALSE; - GSList *radio_group = NULL; - int i; - -- xml = g_string_new ("<ui><menubar><placeholder name=\"TypePlaceholder\">" -+ xml = g_string_new ("<ui><menubar><menu name=\"TopMenu\" action=\"Top\">" -+ "<placeholder name=\"TypePlaceholder\">" - "<menu name=\"SettingsMenu\" action=\"Settings\">"); - - for (i = 0; i < midend_num_presets(fe->me); i++) { -@@ -1359,8 +1365,14 @@ - "<menuitem name=\"CustomMenu\" action=\"Custom\"/>"); - } - -- g_string_append (xml, "</menu></placeholder></menubar></ui>"); -- gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, NULL); -+ g_string_append (xml, "</menu></placeholder></menu></menubar></ui>"); -+ -+ gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, &error); -+ if (error != NULL) { -+ g_warning ("Error adding custom: %s", error->message); -+ g_error_free (error); -+ } -+ - g_string_free (xml, TRUE); - } - -@@ -1434,6 +1446,7 @@ - new_window(char *arg, char **error) - { - frontend *fe; -+ GError *err = NULL; - GtkBox *vbox; - GtkUIManager *merge; - GtkActionGroup *actions; -@@ -1496,8 +1509,6 @@ - gtk_window_add_accel_group(GTK_WINDOW(fe->window), fe->accelgroup); - - merge = gtk_ui_manager_new (); -- g_signal_connect (G_OBJECT (merge), "add_widget", -- G_CALLBACK (add_widget), vbox); - - actions = gtk_action_group_new ("PuzzleActions"); - gtk_action_group_add_actions (actions, toplevel_actions, -@@ -1509,22 +1520,39 @@ - - gtk_ui_manager_insert_action_group (merge, actions, 0); - -- gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml", NULL); -+ gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml", -+ &err); -+ if (err != NULL) { -+ g_warning ("Error making UI: %s", err->message); -+ g_error_free (err); -+ err = NULL; -+ } - - if (thegame.can_solve) { -- char *str = "<ui><menubar><menu name=\"GameMenu\" action=\"Game\">" -+ char *str = "<ui><menubar><menu name=\"TopMenu\" action=\"Top\">" -+ "<menu name=\"GameMenu\" action=\"Game\">" - "<placeholder name=\"SolvePlaceholder\">" - "<separator name=\"SolveSep\"/>" - "<menuitem name=\"SolveMenu\" action=\"Solve\"/>" -- "</placeholder></menu></menubar></ui>"; -+ "</placeholder></menu></menu></menubar></ui>"; - -- gtk_ui_manager_add_ui_from_string (merge, str, -1, NULL); -+ gtk_ui_manager_add_ui_from_string (merge, str, -1, &err); -+ if (err != NULL) { -+ g_warning ("Error adding solve. %s", err->message); -+ g_error_free (err); -+ } - } - - if ((n = midend_num_presets(fe->me)) > 0 || thegame.can_configure) { - generate_settings_menu (merge, actions, fe); - } - -+ /* Do this so that the menu is packed now instead of in the idle loop */ -+ gtk_ui_manager_ensure_update (merge); -+ -+ owl_set_window_menu_item (GTK_WINDOW (fe->window), -+ GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/TopMenu"))); -+ - setup_colours (fe); - setup_pixbufs (fe); - -@@ -1572,7 +1600,7 @@ - GDK_BUTTON_RELEASE_MASK | - GDK_BUTTON_MOTION_MASK); - -- /* The window is shown once the menubar has been added */ -+ gtk_widget_show_all (fe->window); - return fe; - } - -Index: src/menu.xml -=================================================================== ---- src/menu.xml (revision 22) -+++ src/menu.xml (working copy) -@@ -1,26 +1,25 @@ - <ui> - <menubar> --<menu name="GameMenu" action="Game"> -- <menuitem name="NewMenu" action="New"/> -- <menuitem name="RestartMenu" action="Restart"/> --<!-- <menuitem name="SpecificMenu" action="Specific"/> --> -- <menuitem name="RandomMenu" action="Random"/> -- <separator name="GameSep1"/> -- <menuitem name="LoadMenu" action="Load"/> -- <menuitem name="SaveMenu" action="Save"/> -- <separator name="GameSep2"/> -- <menuitem name="UndoMenu" action="Undo"/> -- <menuitem name="RedoMenu" action="Redo"/> -- <placeholder name="CopyPlaceholder"/> -- <placeholder name="SolvePlaceholder"/> -- <separator name="GameSep3"/> -- <menuitem name="QuitMenu" action="Quit"/> --</menu> -+<menu name="TopMenu" action="Top"> -+ <menu name="GameMenu" action="Game"> -+ <menuitem name="NewMenu" action="New"/> -+ <menuitem name="RestartMenu" action="Restart"/> -+ <!-- <menuitem name="SpecificMenu" action="Specific"/> --> -+ <menuitem name="RandomMenu" action="Random"/> -+ <separator name="GameSep1"/> -+ <menuitem name="LoadMenu" action="Load"/> -+ <menuitem name="SaveMenu" action="Save"/> -+ <separator name="GameSep2"/> -+ <menuitem name="UndoMenu" action="Undo"/> -+ <menuitem name="RedoMenu" action="Redo"/> -+ <placeholder name="CopyPlaceholder"/> -+ <placeholder name="SolvePlaceholder"/> -+ </menu> - --<placeholder name="TypePlaceholder"/> -- --<menu name="HelpMenu" action="Help"> -+ <placeholder name="TypePlaceholder"/> - <menuitem name="AboutMenu" action="About"/> -+ <menuitem name="QuitMenu" action="Quit"/> -+ - </menu> - </menubar> - </ui> -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am (revision 22) -+++ src/Makefile.am (working copy) -@@ -10,7 +10,7 @@ - lightup loopy map mines net netslide pattern pegs rect samegame \ - sixteen slant solo tents twiddle untangle - --libpuzzles_la_LIBADD = $(PUZZLES_LIBS) -+libpuzzles_la_LIBADD = $(PUZZLES_LIBS) -lowl - libpuzzles_la_SOURCES = combi.c \ - configuration.c \ - drawing.c \ diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb deleted file mode 100644 index bd762e9315..0000000000 --- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Portable Puzzle Collection" -HOMEPAGE = "http://o-hand.com/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \ - file://src/tree234.h;endline=28;md5=a188e6d250430ca094a54a82f48472a7 \ - file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945" - -SECTION = "x11" -DEPENDS = "gtk+ gconf intltool-native librsvg" -DEPENDS_append_poky = " libowl" - -SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b" -PV = "0.2+git${SRCPV}" -PR = "r10" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" -SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 " - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -bindir = "/usr/games" - -EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" - -do_install_append () { - install -d ${D}/${datadir}/applications/ - - cd ${D}/${prefix}/games - for prog in *; do - if [ -x $prog ]; then - # Convert prog to Title Case - title=$(echo $prog | sed 's/\(^\| \)./\U&/g') - echo "making ${D}/${datadir}/applications/$prog.desktop" - cat <<STOP > ${D}/${datadir}/applications/$prog.desktop -[Desktop Entry] -Name=$title -Exec=${prefix}/games/$prog -Icon=applications-games -Terminal=false -Type=Application -Categories=Game; -StartupNotify=true -X-MB-SingleInstance=true -Comment=Play $title. -STOP - fi - done -} - -PACKAGES += "${PN}-extra" -RDEPENDS_${PN}-extra += "oh-puzzles" - -FILES_${PN} = "/usr/share/pixmaps /usr/share/oh-puzzles/" -FILES_${PN}-dbg += "/usr/games/.debug/*" -FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas" - -python __anonymous () { - var = bb.data.expand("FILES_${PN}", d, 1) - data = d.getVar(var, True) - for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"): - data = data + " /usr/games/%s" % name - data = data + " /usr/share/applications/%s.desktop" % name - data = data + " /etc/gconf/schemas/%s.schemas" % name - d.setVar(var, data) -} diff --git a/meta/recipes-sato/puzzles/puzzles_r10116.bb b/meta/recipes-sato/puzzles/puzzles_r10116.bb deleted file mode 100644 index ef5392b68f..0000000000 --- a/meta/recipes-sato/puzzles/puzzles_r10116.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Simon Tatham's Portable Puzzle Collection" -HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" - -DEPENDS = "gtk+ libxt" -MOD_PV = "${@d.getVar('PV',1)[1:]}" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" - -SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV}" - -S = "${WORKDIR}/${BPN}" - -inherit autotools-brokensep - -do_configure_prepend () { - ./mkfiles.pl -} - -FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*" -FILES_${PN}-dbg += "${prefix}/bin/.debug" - -do_install () { - rm -rf ${D}/* - export prefix=${D} - export DESTDIR=${D} - install -d ${D}/${prefix}/bin/ - oe_runmake install - - - install -d ${D}/${datadir}/applications/ - - # Create desktop shortcuts - cd ${D}/${prefix}/bin - for prog in *; do - if [ -x $prog ]; then - # Convert prog to Title Case - title=$(echo $prog | sed 's/\(^\| \)./\U&/g') - echo "making ${D}/${datadir}/applications/$prog.desktop" - cat <<STOP > ${D}/${datadir}/applications/$prog.desktop -[Desktop Entry] -Name=$title -Exec=${prefix}/bin/$prog -Icon=applications-games -Terminal=false -Type=Application -Categories=Game; -StartupNotify=true -X-MB-SingleInstance=true -STOP - fi - done -} diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.desktop deleted file mode 100644 index 882ea41136..0000000000 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Terminal -Comment=A unicode capable rxvt clone -Exec=rxvt -Icon=terminal -Terminal=false -Type=Application -Categories=Utility;TerminalEmulator; diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.png b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.png Binary files differdeleted file mode 100644 index e56fa2e9cd..0000000000 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.png +++ /dev/null diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/xwc.patch deleted file mode 100644 index 16efeef49f..0000000000 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/xwc.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Pending - -diff -ruN rxvt-unicode-9.10-orig//src/screen.C rxvt-unicode-9.10/src/screen.C ---- rxvt-unicode-9.10-orig//src/screen.C 2011-04-19 13:34:01.327664984 +0800 -+++ rxvt-unicode-9.10/src/screen.C 2011-04-19 13:34:47.037665001 +0800 -@@ -3152,7 +3152,7 @@ - return false; - } - --#if 0 -+#if HAVE_XWC - XTextProperty ct; - - if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) -@@ -3734,9 +3734,11 @@ - } - else - #endif -+#ifdef HAVE_XWC - if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) - freect = 1; - else -+#endif - { - /* if we failed to convert then send it raw */ - ct.value = (unsigned char *)cl; diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.19.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.19.bb deleted file mode 100644 index 72eca6dab3..0000000000 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.19.bb +++ /dev/null @@ -1,65 +0,0 @@ -SECTION = "x11/utils" -SUMMARY = "rxvt terminal clone supporting unicode" -DESCRIPTION = "rxvt-unicode is a clone of the well known \ -terminal emulator rxvt, modified to store text in Unicode \ -(either UCS-2 or UCS-4) and to use locale-correct input and \ -output. It also supports mixing multiple fonts at the \ -same time, including Xft fonts." -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432" - -DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf" - -SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ - file://xwc.patch \ - file://rxvt.desktop \ - file://rxvt.png" - -SRC_URI[md5sum] = "45ad197eb9b5a840c0f65e3a8131921c" -SRC_URI[sha256sum] = "d9237cf1973af461ecbeeb708e4d00893294771558e8338b4f33418ed52d3241" - -inherit autotools update-alternatives - -PROVIDES = "virtual/x-terminal-emulator" -ALTERNATIVE_${PN} = "x-terminal-emulator" -ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" - -CFLAGS_append = " -fpermissive" - -EXTRA_OECONF = "--enable-menubar --enable-xim \ - --enable-utmp --enable-wtmp --enable-lastlog \ - --disable-strings --with-term=rxvt --enable-keepscrolling \ - --enable-xft --with-name=rxvt --enable-frills \ - --enable-swapscreen --enable-transparency \ - --with-codesets=eu \ - --enable-cursor-blink --enable-pointer-blank \ - --enable-text-blink --enable-rxvt-scroll \ - --enable-combining --enable-shared \ - --enable-xgetdefault \ - --disable-perl \ - --with-x=${STAGING_DIR_HOST}${prefix}" - -do_configure_prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cp ${S}/aclocal.m4 ${S}/acinclude.m4 - fi -} - -do_compile_prepend () { - echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h - echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h - echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h - echo '#define HAVE_XLOCALE 1' >> config.h -} - -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps/ - - install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications -} - -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 deleted file mode 100644 index fa595dc230..0000000000 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b9f02989310a3c920589f1aa646bcbf16b2572a0 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 13 Jun 2012 11:07:33 +0100 -Subject: [PATCH] Inherit the GNOME icon theme - -If the GNOME icon theme isn't installed this is a no-op, but if it is then -you'll get fallback from Sato to GNOME for icons that are not in Sato. - -As applications that use the full GNOME icon theme depend on gnome-icon-theme, -this just works. - -Upstream-Status: Backport ---- - index.theme | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/index.theme b/index.theme -index c4b03a7..688fbbf 100644 ---- a/index.theme -+++ b/index.theme -@@ -1,6 +1,7 @@ - [Icon Theme] - Name=Sato - Comment=Sato icon theme -+Inherits=gnome - - 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, - --- -1.7.10 - 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 deleted file mode 100644 index ced735f001..0000000000 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Sato icon theme" -HOMEPAGE = "http://www.o-hand.com" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "CC-BY-SA-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2" -SECTION = "x11" - -PR = "r6" - -DEPENDS = "icon-naming-utils-native libxml-simple-perl-native" - -SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ - file://0001-Inherit-the-GNOME-icon-theme.patch" - -SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50" -SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732" - -inherit autotools pkgconfig allarch gtk-icon-cache perlnative - -# The configure script uses pkg-config to find native binaries to execute, so -# tell it to use our pkg-config-native wrapper. -export PKG_CONFIG = "pkg-config-native" - -FILES_${PN} += "${datadir}/icons/Sato" - -do_install_append() { - find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \; - find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \; - find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \; -} - -# Explictly setting "Sato" as the default icon theme to avoid flickering from -# the desktop and settings daemon racing. This shouldn't be done here but in the sato image -pkg_postinst_${PN} () { - mkdir -p $D/etc/gtk-2.0 - - grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \ - echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc -} diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb deleted file mode 100644 index a079e03d97..0000000000 --- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Ultra-simple screen capture utility, aimed at handheld devices" -HOMEPAGE = "http://www.o-hand.com" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \ - file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" - -DEPENDS = "matchbox-panel-2" -SRCREV = "3a9688e8a01b63a78f402b4e7c0b8b005fcdfa29" -PV = "0.1+git${SRCPV}" -PR = "r2" - -SRC_URI = "git://git.yoctoproject.org/screenshot" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/matchbox-panel/*.so" -FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" - -do_install_append () { - rm ${D}${libdir}/matchbox-panel/*.la -} diff --git a/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh b/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh deleted file mode 100644 index 95374135f2..0000000000 --- a/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/settings-daemon & diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch deleted file mode 100644 index baf06d6b84..0000000000 --- a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch +++ /dev/null @@ -1,49 +0,0 @@ -Upstream-Status: Pending - -Index: settings-daemon/settings-daemon.c -=================================================================== ---- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 -+++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100 -@@ -187,6 +187,10 @@ - GCONF_VALUE_STRING, translate_string_string }, - { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme", - GCONF_VALUE_STRING, translate_string_string }, -+ { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName", -+ GCONF_VALUE_STRING, translate_string_string }, -+ { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" , -+ GCONF_VALUE_BOOL, translate_bool_int }, - }; - - static const TranslationEntry* -Index: settings-daemon/settings-daemon.schemas -=================================================================== ---- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100 -+++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100 -@@ -196,6 +196,27 @@ - </locale> - </schema> - -+ <schema> -+ <key>/schemas/desktop/gnome/sound/theme_name</key> -+ <applyto>/desktop/gnome/sound/theme_name</applyto> -+ <owner>gnome</owner> -+ <type>string</type> -+ <default>freedesktop</default> -+ <locale name="C"> -+ <short>Sound Theme Name</short> -+ </locale> -+ </schema> -+ -+ <schema> -+ <key>/schemas/desktop/gnome/sound/event_sounds</key> -+ <applyto>/desktop/gnome/sound/event_sounds</applyto> -+ <owner>gnome</owner> -+ <type>bool</type> -+ <default>true</default> -+ <locale name="C"> -+ <short>Enable Sound Events</short> -+ </locale> -+ </schema> - - </schemalist> - </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 deleted file mode 100644 index 594374467a..0000000000 --- a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -after gcc linking has changed, all the libraries must be explicitely specified to for linking. -This patch avoids this linking error: - -| make all-am^M -| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M -| 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 -| /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 -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make[1]: *** [settings-daemon] Error 1^M -| make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M -| make: *** [all] Error 2^M - -Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2011/01/11 - -Index: settings-daemon/configure.ac -=================================================================== ---- settings-daemon.orig/configure.ac -+++ settings-daemon/configure.ac -@@ -14,7 +14,7 @@ AC_PROG_CC - - - dnl TODO: make gconf optional --PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0]) -+PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11]) - - - 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 deleted file mode 100644 index ba48d90773..0000000000 --- a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Provides a bridge between gconf and xsettings" -HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ - file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" -DEPENDS = "gconf glib-2.0 gtk+" -SECTION = "x11" -SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1" -PV = "0.0+git${SRCPV}" - - -SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ - file://addsoundkeys.patch;apply=yes \ - file://70settings-daemon.sh \ - file://dso_linking_change_build_fix.patch" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig gconf - -FILES_${PN} = "${bindir}/* ${sysconfdir}" - -do_install_append () { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ -} diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb deleted file mode 100644 index ebdd6d123a..0000000000 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Provides an icon to shut down the system cleanly" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "file://shutdown.desktop" - -PR = "r1" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}${datadir}/applications - install -m 0644 shutdown.desktop ${D}${datadir}/applications/ - - sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' -} - -pkg_postinst_${PN} () { - grep -q qemuarm $D${sysconfdir}/hostname && \ - sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \ - || true -} - -inherit allarch diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop deleted file mode 100644 index 99bee4c241..0000000000 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Shutdown -Comment=Close down the machine safely -Exec=poweroff -Icon=system-shutdown -Terminal=false -Categories=Utility; -StartupNotify=true
\ No newline at end of file diff --git a/meta/recipes-sato/webkit/files/bison-2.6.patch b/meta/recipes-sato/webkit/files/bison-2.6.patch deleted file mode 100644 index d4aa674217..0000000000 --- a/meta/recipes-sato/webkit/files/bison-2.6.patch +++ /dev/null @@ -1,558 +0,0 @@ -Upstream-Status: Backport -http://trac.webkit.org/changeset/124099 - -Subversion Revision: 123651 -diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y -index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 ---- a/Source/WebCore/css/CSSGrammar.y -+++ b/Source/WebCore/css/CSSGrammar.y -@@ -53,14 +53,13 @@ using namespace HTMLNames; - #define YYMAXDEPTH 10000 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -89,7 +88,7 @@ using namespace HTMLNames; - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp -index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 ---- a/Source/WebCore/css/CSSParser.cpp -+++ b/Source/WebCore/css/CSSParser.cpp -@@ -114,7 +114,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y -index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 ---- a/Source/WebCore/xml/XPathGrammar.y -+++ b/Source/WebCore/xml/XPathGrammar.y -@@ -34,6 +34,7 @@ - #include "XPathParser.h" - #include "XPathPath.h" - #include "XPathPredicate.h" -+#include "XPathStep.h" - #include "XPathVariableReference.h" - #include <wtf/FastMalloc.h> - -@@ -44,8 +45,6 @@ - #define YYLTYPE_IS_TRIVIAL 1 - #define YYDEBUG 0 - #define YYMAXDEPTH 10000 --#define YYPARSE_PARAM parserParameter --#define PARSER static_cast<Parser*>(parserParameter) - - using namespace WebCore; - using namespace XPath; -@@ -53,6 +52,7 @@ using namespace XPath; - %} - - %pure_parser -+%parse-param { WebCore::XPath::Parser* parser } - - %union - { -@@ -71,7 +71,7 @@ using namespace XPath; - %{ - - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } --static void xpathyyerror(const char*) { } -+static void xpathyyerror(void*, const char*) { } - - %} - -@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { } - Expr: - OrExpr - { -- PARSER->m_topExpr = $1; -+ parser->m_topExpr = $1; - } - ; - -@@ -138,7 +138,7 @@ AbsoluteLocationPath: - '/' - { - $$ = new LocationPath; -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - '/' RelativeLocationPath -@@ -150,7 +150,7 @@ AbsoluteLocationPath: - { - $$ = $2; - $$->insertFirstStep($1); -- PARSER->unregisterParseNode($1); -+ parser->unregisterParseNode($1); - } - ; - -@@ -159,22 +159,22 @@ RelativeLocationPath: - { - $$ = new LocationPath; - $$->appendStep($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->registerParseNode($$); - } - | - RelativeLocationPath '/' Step - { - $$->appendStep($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - | - RelativeLocationPath DescendantOrSelf Step - { - $$->appendStep($2); - $$->appendStep($3); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); - } - ; - -@@ -183,58 +183,58 @@ Step: - { - if ($2) { - $$ = new Step(Step::ChildAxis, *$1, *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, *$1); -- PARSER->deleteNodeTest($1); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($1); -+ parser->registerParseNode($$); - } - | - NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($2) { - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NodeTest OptionalPredicateList - { - if ($3) { - $$ = new Step($1, *$2, *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, *$2); -- PARSER->deleteNodeTest($2); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($2); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($3) { - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($2); -- PARSER->registerParseNode($$); -+ parser->deleteString($2); -+ parser->registerParseNode($$); - } - | - AbbreviatedStep -@@ -259,23 +259,23 @@ NodeTest: - else if (*$1 == "comment") - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); - -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' LITERAL ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); -- PARSER->deleteString($1); -- PARSER->deleteString($3); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->deleteString($3); -+ parser->registerNodeTest($$); - } - ; - -@@ -293,14 +293,14 @@ PredicateList: - { - $$ = new Vector<Predicate*>; - $$->append(new Predicate($1)); -- PARSER->unregisterParseNode($1); -- PARSER->registerPredicateVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerPredicateVector($$); - } - | - PredicateList Predicate - { - $$->append(new Predicate($2)); -- PARSER->unregisterParseNode($2); -+ parser->unregisterParseNode($2); - } - ; - -@@ -315,7 +315,7 @@ DescendantOrSelf: - SLASHSLASH - { - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -323,13 +323,13 @@ AbbreviatedStep: - '.' - { - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - DOTDOT - { - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -337,8 +337,8 @@ PrimaryExpr: - VARIABLEREFERENCE - { - $$ = new VariableReference(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - '(' Expr ')' -@@ -349,15 +349,15 @@ PrimaryExpr: - LITERAL - { - $$ = new StringExpression(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - NUMBER - { - $$ = new Number($1->toDouble()); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FunctionCall -@@ -369,8 +369,8 @@ FunctionCall: - $$ = createFunction(*$1); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FUNCTIONNAME '(' ArgumentList ')' -@@ -378,9 +378,9 @@ FunctionCall: - $$ = createFunction(*$1, *$3); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->deleteExpressionVector($3); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->deleteExpressionVector($3); -+ parser->registerParseNode($$); - } - ; - -@@ -389,14 +389,14 @@ ArgumentList: - { - $$ = new Vector<Expression*>; - $$->append($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerExpressionVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerExpressionVector($$); - } - | - ArgumentList ',' Argument - { - $$->append($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - ; - -@@ -412,9 +412,9 @@ UnionExpr: - $$ = new Union; - $$->addSubExpression($1); - $$->addSubExpression($3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -430,9 +430,9 @@ PathExpr: - { - $3->setAbsolute(true); - $$ = new Path(static_cast<Filter*>($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - FilterExpr DescendantOrSelf RelativeLocationPath -@@ -440,10 +440,10 @@ PathExpr: - $3->insertFirstStep($2); - $3->setAbsolute(true); - $$ = new Path(static_cast<Filter*>($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -453,9 +453,9 @@ FilterExpr: - PrimaryExpr PredicateList - { - $$ = new Filter($1, *$2); -- PARSER->unregisterParseNode($1); -- PARSER->deletePredicateVector($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->deletePredicateVector($2); -+ parser->registerParseNode($$); - } - ; - -@@ -465,9 +465,9 @@ OrExpr: - OrExpr OR AndExpr - { - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -477,9 +477,9 @@ AndExpr: - AndExpr AND EqualityExpr - { - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -489,9 +489,9 @@ EqualityExpr: - EqualityExpr EQOP RelationalExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -501,9 +501,9 @@ RelationalExpr: - RelationalExpr RELOP AdditiveExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -513,17 +513,17 @@ AdditiveExpr: - AdditiveExpr PLUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - AdditiveExpr MINUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -533,9 +533,9 @@ MultiplicativeExpr: - MultiplicativeExpr MULOP UnaryExpr - { - $$ = new NumericOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -546,8 +546,8 @@ UnaryExpr: - { - $$ = new Negative; - $$->addSubExpression($2); -- PARSER->unregisterParseNode($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($2); -+ parser->registerParseNode($$); - } - ; - -diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp -index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644 ---- a/Source/WebCore/xml/XPathParser.cpp -+++ b/Source/WebCore/xml/XPathParser.cpp -@@ -32,24 +32,21 @@ - #include "XPathEvaluator.h" - #include "XPathException.h" - #include "XPathNSResolver.h" -+#include "XPathPath.h" - #include "XPathStep.h" - #include <wtf/StdLibExtras.h> - #include <wtf/text/StringHash.h> - --int xpathyyparse(void*); -- -+using namespace WebCore; - using namespace WTF; - using namespace Unicode; -+using namespace XPath; - --namespace WebCore { --namespace XPath { -- --class LocationPath; -- --#include "XPathGrammar.h" -+extern int xpathyyparse(WebCore::XPath::Parser*); -+#include "XPathGrammar.h" - - Parser* Parser::currentParser = 0; -- -+ - enum XMLCat { NameStart, NameCont, NotPartOfName }; - - typedef HashMap<String, Step::Axis> AxisNamesMap; -@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t) - delete t; - } - --} --} diff --git a/meta/recipes-sato/webkit/files/no-gtkdoc.patch b/meta/recipes-sato/webkit/files/no-gtkdoc.patch deleted file mode 100644 index 4eb09dc0e2..0000000000 --- a/meta/recipes-sato/webkit/files/no-gtkdoc.patch +++ /dev/null @@ -1,20 +0,0 @@ -make install invokes a gtk-doc tool without checking that we have gtk-doc. - -Signed-off-by: Ross Burton <ross.burton@intel.com> - -Upstream-Status: Pending (https://bugs.webkit.org/show_bug.cgi?id=91239) - -Index: webkit-1.8.1/Tools/GNUmakefile.am -=================================================================== ---- webkit-1.8.1.orig/Tools/GNUmakefile.am -+++ webkit-1.8.1/Tools/GNUmakefile.am -@@ -330,7 +330,9 @@ if ENABLE_WEBKIT2 - fi; \ - fi - endif -+if ENABLE_GTK_DOC - @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR} -+endif - - uninstall-local: - @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 deleted file mode 100644 index e713e8b5ec..0000000000 --- a/meta/recipes-sato/webkit/files/nodolt.patch +++ /dev/null @@ -1,19 +0,0 @@ -Dolt cause build error on some platform, so disable it. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [configuration] - -Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac -=================================================================== ---- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800 -+++ webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac 2011-01-21 11:11:15.000000000 +0800 -@@ -82,8 +82,6 @@ - AC_DISABLE_STATIC - AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL --# use dolt to speedup the build --DOLT - - AC_PATH_PROG(FLEX, flex) - 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 deleted file mode 100644 index ad7c55f264..0000000000 --- a/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch +++ /dev/null @@ -1,62 +0,0 @@ -Upstream-Status: Pending - -automake 1.12 has deprecated use of mkdir_p, and it recommends -use of MKDIR_P instead. Changed the code to avoid these kind -of warning-errors. - -./.deps/DerivedSources -make[1]: ./.deps/DerivedSources: Command not found -make[1]: *** [all-local] Error 127 - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2012/07/10 - -Index: webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am -=================================================================== ---- webkit-gtk-1.7.2+svnr101488-r6.orig/GNUmakefile.am -+++ webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am -@@ -255,7 +255,7 @@ MAINTAINERCLEANFILES += \ - # Older automake versions (1.7) place Plo files in a different place so we need - # to create the output directory manually. - all-local: stamp-po -- $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources -+ $(MKDIR_P) $(top_builddir)/$(DEPDIR)/DerivedSources - - # remove built sources and program directories - clean-local: -Index: webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am -=================================================================== ---- webkit-gtk-1.7.2+svnr101488-r6.orig/Source/WebKit/gtk/po/GNUmakefile.am -+++ webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am -@@ -132,13 +132,13 @@ DISTCLEANFILES += \ - $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot - - po-install-data-local: all -- $(mkdir_p) $(DESTDIR)$(datadir) -+ $(MKDIR_P) $(DESTDIR)$(datadir) - @catalogs='$(MOFILES)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.mo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ -- $(mkdir_p) $(DESTDIR)$$dir; \ -+ $(MKDIR_P) $(DESTDIR)$$dir; \ - if test -r Source/WebKit/gtk/po/$$cat; then realcat=Source/WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \ - $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ - echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ -@@ -173,13 +173,13 @@ po-install-data-local: all - done - - po-installdirs-data-local: -- $(mkdir_p) $(DESTDIR)$(datadir) -+ $(MKDIR_P) $(DESTDIR)$(datadir) - @catalogs='$(MOFILES)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ -- $(mkdir_p) $(DESTDIR)$$dir; \ -+ $(MKDIR_P) $(DESTDIR)$$dir; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - 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 deleted file mode 100644 index 5a42cd7c41..0000000000 --- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 4084d31d5b1fe3bf041881ad124873dbf3cd1868 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 17 May 2013 19:51:11 -0700 -Subject: [PATCH] Enable mips64 build - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending ---- - Source/JavaScriptCore/wtf/Platform.h | 2 +- - Source/JavaScriptCore/wtf/dtoa/utils.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h -=================================================================== ---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2012-08-20 09:30:25.000000000 -0700 -+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.624055787 -0700 -@@ -76,14 +76,19 @@ - - /* CPU(MIPS) - MIPS 32-bit */ - /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */ --#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \ -- && defined(_ABIO32) -+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \ -+ || defined(__mips64)) -+#if defined(__mips64) -+#define WTF_CPU_MIPS64 1 -+#define WTF_MIPS_ARCH __mips64 -+#else - #define WTF_CPU_MIPS 1 -+#define WTF_MIPS_ARCH __mips -+#endif - #if defined(__MIPSEB__) - #define WTF_CPU_BIG_ENDIAN 1 - #endif - #define WTF_MIPS_PIC (defined __PIC__) --#define WTF_MIPS_ARCH __mips - #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v) - #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v) - #define WTF_MIPS_ARCH_REV __mips_isa_rev -@@ -295,7 +300,7 @@ - - #endif /* ARM */ - --#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) -+#if CPU(ARM) || CPU(MIPS) || CPU(MIPS64) || CPU(SH4) || CPU(SPARC) - #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 - #endif - -@@ -899,6 +904,7 @@ - || CPU(ALPHA) \ - || CPU(SPARC64) \ - || CPU(S390X) \ -+ || CPU(MIPS64) \ - || CPU(PPC64) - #define WTF_USE_JSVALUE64 1 - #else -Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h -=================================================================== ---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2012-08-20 09:26:05.000000000 -0700 -+++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.424054793 -0700 -@@ -49,7 +49,7 @@ - defined(__ARMEL__) || \ - defined(_MIPS_ARCH_MIPS32R2) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 --#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) -+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) - #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 deleted file mode 100644 index a76b0ba2b6..0000000000 --- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Riku Voipio <riku.voipio@linaro.org> -Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h -=================================================================== ---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.000000000 -0700 -+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:59:18.764056782 -0700 -@@ -304,6 +304,11 @@ - #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 - #endif - -+/* CPU(AARCH64) - Aarch64 */ -+#if defined(__aarch64__) -+#define WTF_CPU_AARCH64 1 -+#endif -+ - /* ==== OS() - underlying operating system; only to be used for mandated low-level services like - virtual memory, not to choose a GUI toolkit ==== */ - -@@ -905,7 +910,8 @@ - || CPU(SPARC64) \ - || CPU(S390X) \ - || CPU(MIPS64) \ -- || CPU(PPC64) -+ || CPU(PPC64) \ -+ || CPU(AARCH64) - #define WTF_USE_JSVALUE64 1 - #else - #define WTF_USE_JSVALUE32_64 1 -Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h -=================================================================== ---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.000000000 -0700 -+++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:58:28.340056029 -0700 -@@ -49,7 +49,7 @@ - defined(__ARMEL__) || \ - defined(_MIPS_ARCH_MIPS32R2) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 --#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) -+#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) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) - #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 deleted file mode 100644 index d9e8444815..0000000000 --- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd webkit-1.8.3/configure.ac webkit-1.8.3/configure.ac ---- webkit-1.8.3/configure.ac 2012-08-20 19:35:38.000000000 +0300 -+++ webkit-1.8.3/configure.ac 2013-02-08 11:55:28.403397789 +0200 -@@ -111,7 +111,6 @@ - - AC_PROG_CC - AC_PROG_CXX --AM_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_INSTALL - 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 deleted file mode 100644 index 3db8e6d713..0000000000 --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb +++ /dev/null @@ -1,106 +0,0 @@ -SUMMARY = "WebKit web rendering engine for the GTK+ platform" -HOMEPAGE = "http://www.webkitgtk.org/" -BUGTRACKER = "http://bugs.webkit.org/" - -LICENSE = "BSD & LGPLv2+" -LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ - file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ - file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" - -PR = "r1" - -# Choice of language backends - icu has issues on Big Endian machines so use pango -ICU_LIB = "icu" -ICU_LIB_powerpc = "pango" - -DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ - gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" -DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" - -SRC_URI = "\ - http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ - file://nodolt.patch \ - file://no-gtkdoc.patch \ - file://webgit-gtk_fix_build_with_automake_1.12.patch \ - file://bison-2.6.patch \ - file://obsolete_automake_macros.patch \ - file://0001-Enable-mips64-build.patch \ - file://aarch64.patch \ - " - -SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6" -SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7" - -# webkit-gtk can NOT be built on MIPS64 with n32 ABI -COMPATIBLE_HOST_mips64 = "mips64.*-linux$" - -inherit autotools lib_package gtk-doc pkgconfig - -S = "${WORKDIR}/webkit-${PV}/" - -EXTRA_OECONF = "\ - --enable-debug=no \ - --enable-svg \ - --enable-icon-database=yes \ - --enable-fullscreen-api \ - --enable-image-resizer \ - --enable-link-prefetch \ - --with-gtk=2.0 \ - --disable-geolocation \ - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ - UNICODE_CFLAGS=-D_REENTRANT \ - " - -#default unicode backend icu breaks in cross-compile when target and host are different endian type -EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib" - -CPPFLAGS_append_powerpc = " -I${STAGING_INCDIR}/pango-1.0 \ - -I${STAGING_LIBDIR}/glib-2.0/include \ - -I${STAGING_INCDIR}/glib-2.0" - -# ld can run out of memory linking libwebkitgtk! -# -LDFLAGS += "-Wl,--no-keep-memory" - -EXTRA_AUTORECONF = " -I Source/autotools " - - -#| ./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*]': -#| ./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*]' -#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here -#| ./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] -#| {standard input}: Assembler messages: -#| {standard input}:28873: Error: invalid immediate: 983040 is out of range -#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110 -#| /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 -#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as) -#| Please submit a full bug report, -#| with preprocessed source if appropriate. -#| See <http://gcc.gnu.org/bugs.html> for instructions. -#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1 -#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0' -ARM_INSTRUCTION_SET = "arm" - -CONFIGUREOPT_DEPTRACK = "" - -do_configure_append() { - # somethings wrong with icu, fix it up manually - for makefile in $(find ${B} -name "GNUmakefile") ; do - sed -i s:-I/usr/include::g $makefile - done -} - -do_install_append() { - rmdir ${D}${libexecdir} -} - -PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" -FILES_${PN}launcher = "${bindir}/GtkLauncher" -FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" -FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*" -FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/" -FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \ - ${datadir}/webkitgtk-*/images \ - ${datadir}/glib-2.0/schemas" - - |
