diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-sato')
50 files changed, 664 insertions, 1014 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc b/import-layers/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc deleted file mode 100644 index 93538ed01..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc +++ /dev/null @@ -1,25 +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" - -inherit distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -PACKAGES += "gtk-theme-sato" -FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so " -FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*.la" -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/import-layers/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb b/import-layers/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb deleted file mode 100644 index da4d98ad4..000000000 --- a/import-layers/yocto-poky/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 += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" diff --git a/import-layers/yocto-poky/meta/recipes-sato/l3afpad/l3afpad_git.bb b/import-layers/yocto-poky/meta/recipes-sato/l3afpad/l3afpad_git.bb new file mode 100644 index 000000000..ccfda2658 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/l3afpad/l3afpad_git.bb @@ -0,0 +1,25 @@ +SUMMARY = "Simple GTK+ Text Editor" +HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad" + +# Note that COPYING seems to mistakenly contain LGPLv2.1. +# The source code is marked GPLv2+ and COPYING used to contain +# that as well. +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://src/l3afpad.h;endline=20;md5=8848fd645cd45115d8cb47ca5c42a50e \ + file://src/utils.c;endline=20;md5=ae4792f69d3bb7b7ba91d582ba9b1a05" + +DEPENDS = "gtk+3 intltool-native gettext-native" + +PV = "0.8.18.1.11+git${SRCPV}" +SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git" +SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig distro_features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +EXTRA_OECONF = "--disable-emacs --disable-print" +FILES_${PN} += "${datadir}/icons" diff --git a/import-layers/yocto-poky/meta/recipes-sato/leafpad/files/leafpad.desktop b/import-layers/yocto-poky/meta/recipes-sato/leafpad/files/leafpad.desktop deleted file mode 100644 index c7e2d5bb5..000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/leafpad/files/owl-menu.patch b/import-layers/yocto-poky/meta/recipes-sato/leafpad/files/owl-menu.patch deleted file mode 100644 index 2ebf74a6f..000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/import-layers/yocto-poky/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb deleted file mode 100644 index 093b89f77..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb +++ /dev/null @@ -1,35 +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 libowl gettext-native" -# The libowl requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${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 distro_features_check - -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/import-layers/yocto-poky/meta/recipes-sato/libowl/libowl_git.bb b/import-layers/yocto-poky/meta/recipes-sato/libowl/libowl_git.bb deleted file mode 100644 index 9cc47dbd5..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/libowl/libowl_git.bb +++ /dev/null @@ -1,23 +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 distro_features_check - -# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch index 825694962..1cb184fb4 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch @@ -1,10 +1,13 @@ Upstream-Status: Inappropriate [configuration] +--- + appearance/mb-appearance.c | 4 ++++ + 1 file changed, 4 insertions(+) -Index: appearance/mb-appearance.c -=================================================================== ---- appearance/mb-appearance.c (revision 1614) -+++ appearance/mb-appearance.c (working copy) -@@ -300,11 +300,13 @@ +diff --git a/appearance/mb-appearance.c b/appearance/mb-appearance.c +index 6af8376..71fd57b 100644 +--- a/appearance/mb-appearance.c ++++ b/appearance/mb-appearance.c +@@ -317,11 +317,13 @@ on_gconf_value_changed (GConfClient* client, const gchar* key, GConfValue* value gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button), gconf_value_get_string (value)); } else if (strcmp (key, HANDED_KEY) == 0) { @@ -18,18 +21,19 @@ Index: appearance/mb-appearance.c } } -@@ -395,12 +397,13 @@ - gtk_container_add (GTK_CONTAINER (align), font_button); +@@ -408,10 +410,12 @@ main (int argc, char **argv) { /* 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")); + frame = new_frame (_("Orientation"),handed_check); + gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0); 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); +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index 5f73a4c48..b993a9454 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb @@ -6,17 +6,17 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" -DEPENDS = "gconf gtk+" +DEPENDS = "gconf gtk+3" RDEPENDS_${PN} = "settings-daemon" -SRCREV = "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" -PV = "0.0+git${SRCPV}" +# SRCREV tagged 0.2 +SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" +SRC_URI = "git://git.yoctoproject.org/${BPN} \ + file://no-handed.patch" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" -SRC_URI = "git://git.yoctoproject.org/${BPN} \ - file://no-handed.patch;striplevel=0" - inherit autotools pkgconfig distro_features_check # The settings-daemon requires x11 in DISTRO_FEATURES diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb deleted file mode 100644 index 1979cbb76..000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch deleted file mode 100644 index 46397dc8a..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5fe37ef38500f858a22ecdf9bf69bf06e213bf68 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 22 Mar 2016 12:41:35 +0200 -Subject: [PATCH] Do nothing on delete-event when not STANDALONE - -This prevents an opportunistic alt-F4 from closing the desktop. - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Signed-off-by: Ross Burton <ross.burton@intel.com> - - -Upstream-Status: Backport ---- - src/desktop.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/desktop.c b/src/desktop.c -index d4fc2fb..94b4ddf 100644 ---- a/src/desktop.c -+++ b/src/desktop.c -@@ -122,6 +122,15 @@ load_items (TakuMenu *menu) - - } - -+#ifndef STANDALONE -+static gboolean -+delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) -+{ -+ /* prevent default handler from destroying the window */ -+ return TRUE; -+} -+#endif -+ - static void - workarea_changed (int x, int y, int w, int h) - { -@@ -144,11 +153,11 @@ create_desktop (void) - gtk_icon_size_register ("taku-icon", 64, 64); - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); -- g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); - gtk_widget_set_name (window, "TakuWindow"); - gtk_window_set_title (GTK_WINDOW (window), _("Desktop")); - - #ifndef STANDALONE -+ g_signal_connect (window, "delete-event", G_CALLBACK (delete_event_cb), NULL); - gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DESKTOP); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE); - -@@ -156,6 +165,7 @@ create_desktop (void) - screen_w = gdk_screen_get_width (screen); - screen_h = gdk_screen_get_height (screen); - #else -+ g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); - screen_w = 640; - screen_h = 480; - #endif --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory new file mode 100644 index 000000000..dfa41e3d3 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=All +Icon=mbfolder.png +Type=Directory +Match=meta-all diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory new file mode 100644 index 000000000..a7e350171 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Applications +Comment=Applications +Icon=gnome-applications.png +Type=Directory +Match=AudioVideo;Audio;Video;Graphics;Network;Office;Utility;System;Development;meta-fallback; diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory new file mode 100644 index 000000000..1b0928c75 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Games +Name[de]=Spiele +Comment=Games of all kind +Comment[de]=Spiele aller Art +Icon=mbfolder.png +Type=Directory +Match=Game + diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order new file mode 100644 index 000000000..01a86d293 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order @@ -0,0 +1,4 @@ +Applications +Games +Settings +All diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory new file mode 100644 index 000000000..5dde365f0 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Settings +Name[de]=Einstellungen +Comment=Settings for your handheld computer +Comment[de]=Einstellungen für Ihren Handheld-Computer +Icon=mbfolder.png +Type=Directory +Match=Settings diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb index dbe8c1145..d9a2f2214 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb @@ -4,17 +4,16 @@ 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" +DEPENDS = "gtk+3 startup-notification dbus" SECTION = "x11/wm" -SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d" -PV = "2.0+git${SRCPV}" +# SRCREV tagged 2.1 +SRCREV = "c8473519a0f37488b8b3e839e275b000cdde0b80" SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ - file://0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch \ + file://vfolders/* \ " EXTRA_OECONF = "--enable-startup-notification --with-dbus" @@ -25,3 +24,10 @@ inherit autotools pkgconfig distro_features_check # The startup-notification requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" + +do_install_append() { + install -d ${D}${datadir}/matchbox/vfolders/ + install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ +} + +FILES_${PN} += "${datadir}/matchbox/vfolders/" diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb index eba1970ee..465f1349a 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb @@ -8,12 +8,10 @@ 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 = "ebc330eac8b9d38e9aef9f01e7241c904bd01073" -PV = "0.0+git${SRCPV}" -PR = "r4" +DEPENDS = "libfakekey expat libxft" +#SRCREV for 0.1.1 +SRCREV = "630d89068dc0a1e9199306d405cb32f892dfa4d3" SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ file://80matchboxkeyboard.sh" @@ -25,7 +23,12 @@ inherit autotools pkgconfig gettext gtk-immodules-cache distro_features_check # The libxft, libfakekey and matchbox-panel-2 requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" +EXTRA_OECONF = "--disable-cairo" + +PACKAGECONFIG ??= "gtk3-im applet" +PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2" +PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+" +PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3" PACKAGES += "${PN}-im ${PN}-applet" @@ -35,7 +38,8 @@ FILES_${PN} = "${bindir}/ \ ${datadir}/pixmaps \ ${datadir}/matchbox-keyboard" -FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so" +FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ + ${libdir}/gtk-3.0/*/immodules/*.so" FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" @@ -45,6 +49,7 @@ do_install_append () { install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la + rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la rm -f ${D}${libdir}/matchbox-panel/*.la } diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch new file mode 100644 index 000000000..d13dd3d5a --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch @@ -0,0 +1,34 @@ +From f83a9179696b2d060ee4860733dafbf38bbd4b87 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 28 Sep 2016 15:05:41 +0300 +Subject: [PATCH] applets/systray: Allow icons to be smaller + +Don't expand/fill the systray items, align them in the center of the +systray panel. This makes sure the icons are drawn at the size they +expect. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Submitted +--- + applets/systray/systray.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/applets/systray/systray.c b/applets/systray/systray.c +index 39698a8..94a5753 100644 +--- a/applets/systray/systray.c ++++ b/applets/systray/systray.c +@@ -29,8 +29,9 @@ on_realize (GtkWidget *widget, gpointer user_data) + tray = (GtkWidget *)na_tray_new_for_screen (screen, orientation); + + gtk_widget_show (tray); +- +- gtk_container_add (GTK_CONTAINER (widget), tray); ++ gtk_widget_set_valign (tray, GTK_ALIGN_CENTER); ++ gtk_widget_set_halign (tray, GTK_ALIGN_CENTER); ++ gtk_box_pack_start (GTK_BOX (widget), tray, FALSE, FALSE, 0); + } + + G_MODULE_EXPORT GtkWidget * +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch deleted file mode 100644 index 3bab6d292..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a0b5fca04da208990f3c40e65dbb045da4cdb35e Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Sun, 20 Mar 2016 13:24:37 +0200 -Subject: [PATCH] showdesktop: Make sure active state is initialized - -There are cases (in qemu at least) where set_active() -is never called on startup. Make sure we initialize the active -state so the icon gets loaded and the applet is not confused -about the current state. - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Signed-off-by: Ross Burton <ross.burton@intel.com> - - -Upstream-Status: Backport ---- - applets/showdesktop/showdesktop.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/applets/showdesktop/showdesktop.c b/applets/showdesktop/showdesktop.c -index 61dd5c2..33c13e1 100644 ---- a/applets/showdesktop/showdesktop.c -+++ b/applets/showdesktop/showdesktop.c -@@ -181,6 +181,12 @@ button_clicked_cb (GtkButton *button, - &xev); - } - -+static void -+realize_cb (GtkWidget *button, ShowDesktopApplet *applet) -+{ -+ sync_applet (applet); -+} -+ - G_MODULE_EXPORT GtkWidget * - mb_panel_applet_create (const char *id, - GtkOrientation orientation) -@@ -216,6 +222,10 @@ mb_panel_applet_create (const char *id, - "clicked", - G_CALLBACK (button_clicked_cb), - applet); -+ g_signal_connect (button, -+ "realize", -+ G_CALLBACK (realize_cb), -+ applet); - - g_object_weak_ref (G_OBJECT (button), - (GWeakNotify) show_desktop_applet_free, --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch deleted file mode 100644 index 45ba9a031..000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb index 98c3ae487..d38e7f639 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb @@ -5,25 +5,25 @@ 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" + file://applets/startup/startup.c;endline=22;md5=7cbcea60b667f609495222faf3e07917" -DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" +DEPENDS = "gnome-common gtk+3 startup-notification dbus dbus-glib dbus-glib-native" DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" # The startup-notification requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" -SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" -PV = "2.0+git${SRCPV}" +# SRCREV tagged 2.11 +SRCREV = "850d5fffde7dbfb32015916524d88014cc2cfb30" RPROVIDES_${PN} = "matchbox-panel" RREPLACES_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel" SRC_URI = "git://git.yoctoproject.org/${BPN} \ - file://0001-showdesktop-Make-sure-active-state-is-initialized.patch \ - file://silence-warnings.patch" + file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ + " EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" @@ -33,7 +33,8 @@ S = "${WORKDIR}/git" FILES_${PN} += "${libdir}/matchbox-panel/*.so \ ${datadir}/matchbox-panel/brightness/*.png \ - ${datadir}/matchbox-panel/startup/*.png " + ${datadir}/matchbox-panel/startup/*.png \ + ${datadir}/icons/" FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" inherit autotools pkgconfig distro_features_check diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme b/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme new file mode 100644 index 000000000..c9260cfd8 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme @@ -0,0 +1,7 @@ +[X-GNOME-Metatheme] +Encoding=UTF-8 +Type=X-GNOME-Metatheme +Name=Sato +GtkTheme=Adwaita +IconTheme=Sato +MatchboxTheme=Sato diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index 42ce483d3..f6313bdeb 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -14,11 +14,6 @@ else KEYBOARD_APPLET="keyboard" fi -# Tell GTK+3 we really want server side decorations, even with -# GtkHeaderBar using applications: Without that mb-panel will render -# on top of the client side decorations. -export GTK_CSD=0 - matchbox-desktop & # Lines containing feature-[foo] are removed at build time if the machine @@ -28,6 +23,6 @@ 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 & +matchbox-panel --start-applets $START_APPLETS --end-applets $END_APPLETS & -exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@ +exec matchbox-window-manager -theme Sato -use_cursor $SHOWCURSOR $@ diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index 76de18ae9..42c742fca 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be6 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" +RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop matchbox-session gconf" PR = "r30" # This package is architecture specific because the session script is modified @@ -19,9 +19,12 @@ inherit distro_features_check # The matchbox-theme-sato requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "file://session" +SRC_URI = "file://session \ + file://index.theme" S = "${WORKDIR}" +FILES_${PN} += "${datadir}/themes/Sato/index.theme" + do_install() { # This is the set of machine features that the script has markers for FEATURES="phone" @@ -34,6 +37,7 @@ do_install() { fi done + install -D ${S}/index.theme ${D}/${datadir}/themes/Sato/index.theme install -d ${D}/${sysconfdir}/matchbox sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session chmod +x ${D}/${sysconfdir}/matchbox/session @@ -44,7 +48,8 @@ pkg_postinst_${PN} () { #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 theme Adwaita + set_value string matchbox_theme Sato set_value string icon_theme Sato set_value bool touchscreen true set_value string font_name "Sans 9" diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb index c8cbd57a6..4488191b2 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb @@ -6,15 +6,16 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820" -DEPENDS = "gtk+ vte" +DEPENDS = "gtk+3 vte" SECTION = "x11/utils" -SRCREV = "452bca253492a97a587f440289b9ab27d217353e" -PV = "0.0+git${SRCPV}" +#SRCREV tagged 0.1 +SRCREV = "3ad357db2302760b8a8817b5f4478dd87479442f" SRC_URI = "git://git.yoctoproject.org/${BPN}" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" inherit autotools pkgconfig distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb deleted file mode 100644 index f6786dda5..000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb new file mode 100644 index 000000000..7a043d344 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb @@ -0,0 +1,8 @@ +require matchbox-theme-sato.inc + +# SRCREV tagged 0.2 +SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78" +SRC_URI = "git://git.yoctoproject.org/matchbox-sato" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" + +S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb deleted file mode 100644 index 0d3569de9..000000000 --- a/import-layers/yocto-poky/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 += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" - -S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 8ba49231d..6fb1b678f 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -3,7 +3,6 @@ # SUMMARY = "Sato desktop" -LICENSE = "MIT" PR = "r33" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -31,9 +30,8 @@ RDEPENDS_${PN}-base = "\ matchbox-keyboard-im \ matchbox-config-gtk \ xcursor-transparent-theme \ - sato-icon-theme \ + adwaita-icon-theme \ settings-daemon \ - gtk-sato-engine \ shutdown-desktop \ libsdl \ ${NETWORK_MANAGER} \ @@ -48,8 +46,8 @@ WEB ?= "" SUMMARY_${PN}-apps = "Sato desktop - applications" RDEPENDS_${PN}-apps = "\ - leafpad \ - gst-player-bin \ + l3afpad \ + gst-player \ matchbox-terminal \ sato-screenshot \ ${FILEMANAGER} \ @@ -58,5 +56,5 @@ RDEPENDS_${PN}-apps = "\ SUMMARY_${PN}-games = "Sato desktop - games" RDEPENDS_${PN}-games = "\ - oh-puzzles \ + puzzles \ " diff --git a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb b/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb index a6b0aacd2..a6bf2136e 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" SECTION = "x11" -DEPENDS = "gtk+ startup-notification libfm intltool-native gettext-native" -DEPENDS_append_poky = " libowl" +DEPENDS = "gtk+3 startup-notification libfm intltool-native gettext-native" COMPATIBLE_HOST = '(x86_64.*|i.86.*|aarch64.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)' @@ -30,6 +29,8 @@ inherit autotools pkgconfig distro_features_check # The startup-notification requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" +EXTRA_OECONF = "--with-gtk=3" + do_install_append () { install -d ${D}/${datadir} install -d ${D}/${datadir}/pixmaps/ diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch b/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch deleted file mode 100644 index 7e2c3ab75..000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/import-layers/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb deleted file mode 100644 index dfa68a659..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb +++ /dev/null @@ -1,73 +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 gettext-native" - -# libowl requires x11 in DISTRO_FEATURES -DEPENDS_append_poky = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libowl', '', d)}" - -# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -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 distro_features_check - -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}-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/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb b/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb index 346f43bc9..20b98891b 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -21,45 +21,54 @@ PV = "0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit autotools-brokensep distro_features_check pkgconfig +inherit autotools distro_features_check pkgconfig -PACKAGECONFIG ??= "gtk2" +CFLAGS_append = " -Wno-deprecated-declarations" + +PACKAGECONFIG ??= "gtk3" PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+," PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3," +PACKAGES += "${PN}-extra" +FILES_${PN} = "" +FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications" + +python __anonymous () { + var = d.expand("FILES_${PN}") + data = d.getVar(var, False) + for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"): + data = data + " ${bindir}/%s" % name + data = data + " ${datadir}/applications/%s.desktop" % name + d.setVar(var, data) +} + do_configure_prepend () { + cd ${S} ./mkfiles.pl + cd ${B} } -FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*" - -do_install () { - rm -rf ${D}/* - export prefix=${D} - export DESTDIR=${D} - install -d ${D}/${prefix}/bin/ - oe_runmake install - - - install -d ${D}/${datadir}/applications/ +do_install_append () { + # net conflicts with Samba, so rename it + mv ${D}${bindir}/net ${D}${bindir}/puzzles-net # Create desktop shortcuts + install -d ${D}/${datadir}/applications/ cd ${D}/${prefix}/bin for prog in *; do if [ -x $prog ]; then # Convert prog to Title Case - title=$(echo $prog | sed 's/\(^\| \)./\U&/g') + title=$(echo $prog | sed 's/puzzles-//' | 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 +Exec=${bindir}/$prog Icon=applications-games Terminal=false Type=Application Categories=Game; StartupNotify=true -X-MB-SingleInstance=true STOP fi done diff --git a/import-layers/yocto-poky/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch b/import-layers/yocto-poky/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch deleted file mode 100644 index 2c176ee90..000000000 --- a/import-layers/yocto-poky/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=Adwaita - - 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/import-layers/yocto-poky/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/import-layers/yocto-poky/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb deleted file mode 100644 index ced735f00..000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/import-layers/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb index 1b2b65dfc..f3305aef7 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb @@ -7,12 +7,12 @@ 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" +DEPENDS = "matchbox-panel-2 gtk+3" +# SRCREV tagged 0.3 +SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756" SRC_URI = "git://git.yoctoproject.org/screenshot" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch deleted file mode 100644 index 594374467..000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index c0615530a..ceaeccaaa 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb @@ -4,16 +4,16 @@ 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+" +DEPENDS = "gconf glib-2.0 gtk+3" SECTION = "x11" -SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1" -PV = "0.0+git${SRCPV}" - +# SRCREV tagged 0.0.2 +SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ file://addsoundkeys.patch;apply=yes \ file://70settings-daemon.sh \ - file://dso_linking_change_build_fix.patch" + " +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch new file mode 100644 index 000000000..615fe4f40 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch @@ -0,0 +1,48 @@ +From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 29 Aug 2016 16:38:11 +0300 +Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/WebKit2/PlatformGTK.cmake | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake +index adaa010..f18cf8a 100644 +--- a/Source/WebKit2/PlatformGTK.cmake ++++ b/Source/WebKit2/PlatformGTK.cmake +@@ -906,8 +906,9 @@ endif () + string(REGEX MATCHALL "-L[^ ]*" + INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + +-add_custom_command( +- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++# This is a target and not a command because it's used to build another .gir ++# and a .typelib, which would trigger two racy parallel builds when using command ++add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir + DEPENDS WebKit2 + DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= +@@ -950,7 +951,7 @@ add_custom_command( + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir + DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir +- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} + LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" +@@ -1004,7 +1005,7 @@ add_custom_command( + + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib +- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir + COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib + ) + +-- +2.9.3 + diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch index 3d004db29..93a69c029 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Source/cmake/OptionsGTK.cmake | 6 ------ 1 file changed, 6 deletions(-) -diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index e5f1f5b..4698036 100644 ---- a/Source/cmake/OptionsGTK.cmake -+++ b/Source/cmake/OptionsGTK.cmake -@@ -443,12 +443,6 @@ if (USE_LIBHYPHEN) +Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake +=================================================================== +--- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake ++++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake +@@ -424,12 +424,6 @@ if (USE_LIBHYPHEN) endif () endif () @@ -27,9 +27,6 @@ index e5f1f5b..4698036 100644 - set(ENABLE_INTROSPECTION OFF) -endif () - - set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom) - set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk) - set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit) --- -2.7.0 - + # Override the cached variable, gtk-doc does not really work when building on Mac. + if (APPLE) + set(ENABLE_GTKDOC OFF) diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch new file mode 100644 index 000000000..586dd2375 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch @@ -0,0 +1,49 @@ +From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 11 Aug 2016 17:13:51 +0300 +Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under + OpenEmbedded build system + +This requires setting a few environment variables so that the transient +binary is build and linked correctly, and disabling the tweaks to RUN +variable from gtkdoc.py script so that our qemu wrapper is taken into use. + +Upstream-Status: Inappropriate [oe-specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/PlatformGTK.cmake | 2 +- + Tools/gtk/gtkdoc.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake +index af4d2e3..b7b93c7 100644 +--- a/Source/PlatformGTK.cmake ++++ b/Source/PlatformGTK.cmake +@@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) + add_custom_command( + OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" + DEPENDS ${DocumentationDependencies} +- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} ++ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} + COMMAND touch ${_stamp_name} + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + ) +diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py +index 4c8237b..c0205f0 100644 +--- a/Tools/gtk/gtkdoc.py ++++ b/Tools/gtk/gtkdoc.py +@@ -318,9 +318,9 @@ class GTKDoc(object): + additional_ldflags = '%s %s' % (additional_ldflags, arg) + ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags + current_ld_library_path = env.get('LD_LIBRARY_PATH') +- if current_ld_library_path: ++ if current_ld_library_path and 'RUN' not in env: + env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) +- else: ++ elif 'RUN' not in env: + env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path + + if ldflags: +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch new file mode 100644 index 000000000..25b3c9f24 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch @@ -0,0 +1,223 @@ +From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 17 Apr 2016 12:35:41 -0700 +Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem + +gcc-6 has now introduced stdlib.h in libstdc++ for better +compliance and its including the C library stdlib.h using +include_next which is sensitive to order of system header +include paths. Its infact better to not tinker with the +system header include paths at all. Since adding /usr/include +to -system is redundant and compiler knows about it moreover +now with gcc6 it interferes with compiler's functioning +and ends up with compile errors e.g. + +/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + Source/cmake/WebKitMacros.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Source/JavaScriptCore/CMakeLists.txt ++++ webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt +@@ -1311,7 +1311,7 @@ add_subdirectory(shell) + + WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES}) + include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) + add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES}) + target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES}) + set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore") +Index: webkitgtk-2.12.1/Source/WTF/wtf/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Source/WTF/wtf/CMakeLists.txt ++++ webkitgtk-2.12.1/Source/WTF/wtf/CMakeLists.txt +@@ -286,7 +286,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES}) + include_directories(${WTF_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WTF_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WTF_SYSTEM_INCLUDE_DIRECTORIES}) + add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES}) + target_link_libraries(WTF ${WTF_LIBRARIES}) + set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF") +Index: webkitgtk-2.12.1/Source/WebCore/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Source/WebCore/CMakeLists.txt ++++ webkitgtk-2.12.1/Source/WebCore/CMakeLists.txt +@@ -3748,7 +3748,7 @@ WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FIL + WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES}) + + include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) + + if (MSVC) + ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES) +Index: webkitgtk-2.12.1/Source/WebKit/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Source/WebKit/CMakeLists.txt ++++ webkitgtk-2.12.1/Source/WebKit/CMakeLists.txt +@@ -28,7 +28,7 @@ set(WebKit_LIBRARIES + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + include_directories(${WebKit_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) + + if (MSVC) + ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES) +Index: webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Source/WebKit2/CMakeLists.txt ++++ webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt +@@ -756,7 +756,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}") + + include_directories(${WebKit2_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebKit2_SYSTEM_INCLUDE_DIRECTORIES}) + add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES}) + + add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES}) +Index: webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt ++++ webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt +@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCL + ) + + include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) + + set(WebKitTestNetscapePlugin_LIBRARIES + ${X11_LIBRARIES} +Index: webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Tools/ImageDiff/CMakeLists.txt ++++ webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt +@@ -14,7 +14,7 @@ set(IMAGE_DIFF_LIBRARIES + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) + target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) + set_target_properties(ImageDiff PROPERTIES FOLDER "Tools") +Index: webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Tools/MiniBrowser/gtk/CMakeLists.txt ++++ webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt +@@ -55,7 +55,7 @@ endif () + add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) + + include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(MiniBrowser ${MiniBrowser_SOURCES}) + target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) + set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools") +Index: webkitgtk-2.12.1/Tools/WebKitTestRunner/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Tools/WebKitTestRunner/CMakeLists.txt ++++ webkitgtk-2.12.1/Tools/WebKitTestRunner/CMakeLists.txt +@@ -115,7 +115,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURC + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) + + add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) + target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) +Index: webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake +=================================================================== +--- webkitgtk-2.12.1.orig/Source/WebCore/PlatformGTK.cmake ++++ webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake +@@ -324,7 +324,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) + ${GTK2_INCLUDE_DIRS} + ${GDK2_INCLUDE_DIRS} + ) +- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE ++ target_include_directories(WebCorePlatformGTK2 PRIVATE + ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} + ) + target_link_libraries(WebCorePlatformGTK2 +@@ -366,7 +366,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP + target_include_directories(WebCorePlatformGTK PRIVATE + ${WebCore_INCLUDE_DIRECTORIES} + ) +-target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE ++target_include_directories(WebCorePlatformGTK PRIVATE + ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} + ${GTK_INCLUDE_DIRS} + ${GDK_INCLUDE_DIRS} +@@ -384,7 +384,7 @@ include_directories( + "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}" + ) + +-include_directories(SYSTEM ++include_directories( + ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} + ) + +Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake +=================================================================== +--- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/PlatformGTK.cmake ++++ webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake +@@ -20,7 +20,7 @@ include_directories( + ${WEBKIT2_DIR}/UIProcess/API/gtk + ) + +-include_directories(SYSTEM ++include_directories( + ${GDK3_INCLUDE_DIRS} + ${GLIB_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} +Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt ++++ webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt +@@ -23,7 +23,7 @@ include_directories( + ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk + ) + +-include_directories(SYSTEM ++include_directories( + ${ATSPI_INCLUDE_DIRS} + ${GLIB_INCLUDE_DIRS} + ${GSTREAMER_INCLUDE_DIRS} +Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake +=================================================================== +--- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake ++++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake +@@ -816,7 +816,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) + target_include_directories(WebKitPluginProcess2 PRIVATE + ${WebKit2CommonIncludeDirectories} + ) +- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE ++ target_include_directories(WebKitPluginProcess2 PRIVATE + ${WebKit2CommonSystemIncludeDirectories} + ${GTK2_INCLUDE_DIRS} + ${GDK2_INCLUDE_DIRS} +Index: webkitgtk-2.12.1/Source/JavaScriptCore/shell/CMakeLists.txt +=================================================================== +--- webkitgtk-2.12.1.orig/Source/JavaScriptCore/shell/CMakeLists.txt ++++ webkitgtk-2.12.1/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) + include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(jsc ${JSC_SOURCES}) + target_link_libraries(jsc ${JSC_LIBRARIES}) + set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore") diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch index 44b43cdbb..3f71297f5 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch @@ -13,28 +13,25 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Source/WebKit2/PlatformGTK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake -index 706f1e8..14a1c3b 100644 ---- a/Source/WebKit2/PlatformGTK.cmake -+++ b/Source/WebKit2/PlatformGTK.cmake -@@ -884,7 +884,7 @@ add_custom_command( +Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake +=================================================================== +--- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake ++++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake +@@ -910,7 +910,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir DEPENDS WebKit2 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= - LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" ${INTROSPECTION_SCANNER} --quiet -@@ -930,7 +930,7 @@ add_custom_command( +@@ -951,7 +951,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" - LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" ${INTROSPECTION_SCANNER} --- -2.6.4 - diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/musl-fixes.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/musl-fixes.patch new file mode 100644 index 000000000..4fdd56fea --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/musl-fixes.patch @@ -0,0 +1,48 @@ +Replace __GLIBC__ with __linux__ since musl also supports it +so checking __linux__ is more accomodating + +See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp +=================================================================== +--- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp ++++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers: + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) && ENABLE(JIT) ++#elif defined(__linux__) && ENABLE(JIT) + + #if CPU(X86) + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); +@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers: + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers: + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers: + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/files/ppc-musl-fix.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/ppc-musl-fix.patch new file mode 100644 index 000000000..5f58e4953 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/files/ppc-musl-fix.patch @@ -0,0 +1,26 @@ +ucontext structure is different between musl and glibc for ppc +therefore its not enough just to check for arch alone, we also +need to check for libc type. + +Fixes errors like + +Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'? + thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp +=================================================================== +--- webkitgtk-2.12.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp ++++ webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -86,7 +86,7 @@ static void pthreadSignalHandlerSuspendR + } + + ucontext_t* userContext = static_cast<ucontext_t*>(ucontext); +-#if CPU(PPC) ++#if CPU(PPC) && defined(__GLIBC__) + thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; + #else + thread->suspendedMachineContext = userContext->uc_mcontext; diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch deleted file mode 100644 index d7e4ef626..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0b68ad206d2d90df78d91cad4da19152084014cf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 16 Sep 2015 05:15:04 +0000 -Subject: [PATCH] Enable backtrace on linux when using glibc - -We dont have backtrace() implemented on non-glibc libc's on linux - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Accepted - - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 191d53f..a4d86b5 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -68,7 +68,7 @@ - #include <unistd.h> - #endif - --#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) - #include <cxxabi.h> - #include <dlfcn.h> - #include <execinfo.h> -@@ -225,7 +225,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) - // The CaptureStackBackTrace function is available in XP, but it is not defined --- -2.5.2 - diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch deleted file mode 100644 index 77ebf37ef..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 30e2ef302a329850ba55c7c458c98cbf396186ec Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 Dec 2015 21:47:34 +0000 -Subject: [PATCH] Fix build with non-glibc libraries on linux - -qualify isnan() calls with std namespace -malloc_trim is glibc specific API so guard it with __GLIBC__ -let ctype be used on non-glibc ( musl ) C library - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Accepted - - Source/JavaScriptCore/runtime/Options.cpp | 2 +- - Source/WTF/wtf/DisallowCType.h | 2 +- - Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp | 2 ++ - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Source/JavaScriptCore/runtime/Options.cpp b/Source/JavaScriptCore/runtime/Options.cpp -index fe830b4..c49aade 100644 ---- a/Source/JavaScriptCore/runtime/Options.cpp -+++ b/Source/JavaScriptCore/runtime/Options.cpp -@@ -610,7 +610,7 @@ bool Option::operator==(const Option& other) const - case Options::Type::unsignedType: - return m_entry.unsignedVal == other.m_entry.unsignedVal; - case Options::Type::doubleType: -- return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal)); -+ return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal)); - case Options::Type::int32Type: - return m_entry.int32Val == other.m_entry.int32Val; - case Options::Type::optionRangeType: -diff --git a/Source/WTF/wtf/DisallowCType.h b/Source/WTF/wtf/DisallowCType.h -index d85e767..dc6bcab 100644 ---- a/Source/WTF/wtf/DisallowCType.h -+++ b/Source/WTF/wtf/DisallowCType.h -@@ -40,7 +40,7 @@ - // are used from wx headers. On GTK+ for Mac many GTK+ files include <libintl.h> - // or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses - // isacii(). --#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) -+#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) && defined(__GLIBC__) - - #include <ctype.h> - -diff --git a/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp b/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp -index ea61909..1495642 100644 ---- a/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp -+++ b/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp -@@ -202,7 +202,9 @@ void MemoryPressureHandler::respondToMemoryPressure(Critical critical, Synchrono - void MemoryPressureHandler::platformReleaseMemory(Critical) - { - ReliefLogger log("Run malloc_trim"); -+#ifdef __GLIBC__ - malloc_trim(0); -+#endif - } - - void MemoryPressureHandler::ReliefLogger::platformLog() --- -2.6.4 - diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/clang.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/clang.patch deleted file mode 100644 index e5267138b..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/clang.patch +++ /dev/null @@ -1,25 +0,0 @@ -Clang's builtin for clear_cache accepts char* and errors out when using void*, -using char* work on both gcc and clang since char* is auto-converted to void* in gcc case - -Source/JavaScriptCore/assembler/ARM64Assembler.h:2857:33: error: cannot initialize a parameter of type 'char *' with an rvalue of type 'void *' - __builtin___clear_cache(reinterpret_cast<void*>(begin), reinterpret_cast<void*>(end)); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1 error generated. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Accepted - -Index: webkitgtk-2.8.5/Source/JavaScriptCore/assembler/ARM64Assembler.h -=================================================================== ---- webkitgtk-2.8.5.orig/Source/JavaScriptCore/assembler/ARM64Assembler.h -+++ webkitgtk-2.8.5/Source/JavaScriptCore/assembler/ARM64Assembler.h -@@ -2854,7 +2854,7 @@ public: - #if OS(LINUX) && COMPILER(GCC) - static inline void linuxPageFlush(uintptr_t begin, uintptr_t end) - { -- __builtin___clear_cache(reinterpret_cast<void*>(begin), reinterpret_cast<void*>(end)); -+ __builtin___clear_cache(reinterpret_cast<char*>(begin), reinterpret_cast<char*>(end)); - } - #endif - diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb index 8eb6b9f3b..941d0e206 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb @@ -12,32 +12,38 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "\ http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ - file://clang.patch \ - file://0001-Enable-backtrace-on-linux-when-using-glibc.patch \ - file://0001-Fix-build-with-non-glibc-libraries-on-linux.patch \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ + file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ + file://musl-fixes.patch \ + file://ppc-musl-fix.patch \ + file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ + file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ " -SRC_URI[md5sum] = "84832b9d8329413b4f1d87df5f7e8efe" -SRC_URI[sha256sum] = "990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e" +SRC_URI[md5sum] = "7a9ea00ec195488db90fdeb2d174ddaf" +SRC_URI[sha256sum] = "6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40" -inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even gobject-introspection +inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc + +# We cannot inherit pythonnative because that would conflict with inheriting python3native +# (which is done by gobject-introspection). But webkit only needs the path to native Python 2.x binary +# so we simply set it explicitly here. +EXTRANATIVEPATH += "python-native" # depends on libxt REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ - pango icu bison-native gnome-common gawk intltool-native libwebp \ + pango icu bison-native gawk intltool-native libwebp \ atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ ruby-native libnotify gstreamer1.0-plugins-bad \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ enchant \ - gtk2 \ libsecret \ " @@ -55,7 +61,7 @@ EXTRA_OECMAKE = " \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ - -DENABLE_GTKDOC=OFF \ + ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ -DENABLE_MINIBROWSER=ON \ " @@ -63,26 +69,40 @@ EXTRA_OECMAKE = " \ EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " -# ARM JIT code does not build on ARMv5/6 anymore, apparently they test only on v7 onwards +# ARM JIT code does not build on ARMv4/5/6 anymore EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " # binutils 2.25.1 has a bug on aarch64: # https://sourceware.org/bugzilla/show_bug.cgi?id=18430 EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE_append_mips = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE_append_mips64 = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " # JIT not supported on MIPS either EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF " +SECURITY_CFLAGS_remove_aarch64 = "-fpie" +SECURITY_CFLAGS_append_aarch64 = " -fPIE" + FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" # http://errors.yoctoproject.org/Errors/Details/20370/ -ARM_INSTRUCTION_SET = "arm" - -# Invalid data memory access: 0x00000000 -# ... -# qemu: uncaught target signal 11 (Segmentation fault) - core dumped -# Segmentation fault -EXTRA_OECMAKE_append_powerpc = " -DENABLE_INTROSPECTION=OFF " - +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" + +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET_armv7a = "thumb" +ARM_INSTRUCTION_SET_armv7r = "thumb" +ARM_INSTRUCTION_SET_armv7ve = "thumb" + +# WebKit2-4.0: ../../libgpg-error-1.21/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed. +# qemu: uncaught target signal 6 (Aborted) - core dumped +EXTRA_OECMAKE_append_mips64 = " -DENABLE_INTROSPECTION=OFF -DENABLE_GTKDOC=OFF" |