diff options
Diffstat (limited to 'poky/meta/recipes-sato')
62 files changed, 1851 insertions, 0 deletions
diff --git a/poky/meta/recipes-sato/images/core-image-sato-dev.bb b/poky/meta/recipes-sato/images/core-image-sato-dev.bb new file mode 100644 index 000000000..7fa69d099 --- /dev/null +++ b/poky/meta/recipes-sato/images/core-image-sato-dev.bb @@ -0,0 +1,7 @@ +require core-image-sato.bb + +DESCRIPTION = "Image with Sato for development work. It includes everything \ +within core-image-sato plus a native toolchain, application development and \ +testing libraries, profiling and debug symbols." + +IMAGE_FEATURES += "dev-pkgs" diff --git a/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb new file mode 100644 index 000000000..531571ee8 --- /dev/null +++ b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -0,0 +1,11 @@ +require core-image-sato-sdk.bb + +DESCRIPTION += "Also includes ptest packages." + +IMAGE_FEATURES += "ptest-pkgs" + +# This image is sufficiently large (~3GB) that it can't actually fit in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add just 500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "524288" diff --git a/poky/meta/recipes-sato/images/core-image-sato-sdk.bb b/poky/meta/recipes-sato/images/core-image-sato-sdk.bb new file mode 100644 index 000000000..d7cc52b52 --- /dev/null +++ b/poky/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -0,0 +1,11 @@ +require core-image-sato.bb + +DESCRIPTION = "Image with Sato support that includes everything within \ +core-image-sato plus meta-toolchain, development headers and libraries to \ +form a standalone SDK." + +IMAGE_FEATURES += "dev-pkgs tools-sdk \ + tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" + +IMAGE_INSTALL += "kernel-devsrc" + diff --git a/poky/meta/recipes-sato/images/core-image-sato.bb b/poky/meta/recipes-sato/images/core-image-sato.bb new file mode 100644 index 000000000..b89795028 --- /dev/null +++ b/poky/meta/recipes-sato/images/core-image-sato.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ +mobile devices. The image supports X11 with a Sato theme, Pimlico \ +applications, and contains terminal, editor, and file manager." + +IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs" + +LICENSE = "MIT" + +inherit core-image + +TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0" +TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" diff --git a/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb b/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb new file mode 100644 index 000000000..ccfda2658 --- /dev/null +++ b/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/poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch new file mode 100644 index 000000000..1cb184fb4 --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch @@ -0,0 +1,39 @@ +Upstream-Status: Inappropriate [configuration] +--- + appearance/mb-appearance.c | 4 ++++ + 1 file changed, 4 insertions(+) + +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) { ++#if 0 + GEnumValue *e; + e = g_enum_get_value_by_name (g_type_class_ref (GTK_TYPE_CORNER_TYPE), + gconf_value_get_string (value)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (handed_check), + e->value == GTK_CORNER_TOP_RIGHT); ++#endif + } + } + +@@ -408,10 +410,12 @@ main (int argc, char **argv) { + + /* Left/Right Handed */ + ++#if 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); ++#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/poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb new file mode 100644 index 000000000..b993a9454 --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "Matchbox GTK+ theme configuration application" +HOMEPAGE = "http://matchbox-project.org" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" + +DEPENDS = "gconf gtk+3" +RDEPENDS_${PN} = "settings-daemon" + +# 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" + +inherit autotools pkgconfig distro_features_check + +# The settings-daemon requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory new file mode 100644 index 000000000..dfa41e3d3 --- /dev/null +++ b/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/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory new file mode 100644 index 000000000..a7e350171 --- /dev/null +++ b/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/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory new file mode 100644 index 000000000..1b0928c75 --- /dev/null +++ b/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/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order new file mode 100644 index 000000000..01a86d293 --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order @@ -0,0 +1,4 @@ +Applications +Games +Settings +All diff --git a/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory new file mode 100644 index 000000000..5dde365f0 --- /dev/null +++ b/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/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb new file mode 100644 index 000000000..b0cdfa2ae --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Matchbox Window Manager Desktop" +HOMEPAGE = "http://matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \ + file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00" + +DEPENDS = "gtk+3 startup-notification dbus" +SECTION = "x11/wm" + +# SRCREV tagged 2.2 +SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" +SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ + file://vfolders/* \ + " + +EXTRA_OECONF = "--enable-startup-notification --with-dbus" + +S = "${WORKDIR}/git" + +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/poky/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch b/poky/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch new file mode 100644 index 000000000..6b7a5cfec --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch @@ -0,0 +1,33 @@ +From 38da4cd575edb7463cfff241afff64c2f66ea09a Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 12 Apr 2016 09:40:37 +0300 +Subject: [PATCH] desktop file: Hide the keyboard from app list + +matchbox-keyboard is not a normal app and there's no need to start +it via the desktop app grid when using Sato desktop: +* when there's no hardware keyboard, the panel applet can be used to + show/hide the daemonized matchbox-keyboard +* when there is a hardware keyboard, matchbox-keyboard can still be + started for debug purposes from command line or the applet can be + enabled by editing /etc/formfactor/machconfig + +So hide the keyboard from the desktop app list. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + matchbox-keyboard.desktop | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/matchbox-keyboard.desktop b/matchbox-keyboard.desktop +index c092bfe..613d349 100644 +--- a/matchbox-keyboard.desktop ++++ b/matchbox-keyboard.desktop +@@ -6,3 +6,4 @@ Type=Application + Icon=matchbox-keyboard.png + Categories=Panel;Utility;MB + X-MB-INPUT-MECHANSIM=True ++NoDisplay=true +-- +2.1.4 + diff --git a/poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh new file mode 100644 index 000000000..6cf188b2d --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +. /etc/formfactor/config + +CMD="" + +if [ "$HAVE_KEYBOARD" = "0" ]; then + CMD="matchbox-keyboard -d" +elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then + if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then + CMD="matchbox-keyboard -d -o landscape" + elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then + CMD="matchbox-keyboard -d -o portrait" + fi +fi + +if [ "$CMD" ]; then + # Delay to make sure the window manager is active + # by waiting for the desktop to say its finished loading + dbus-wait org.matchbox_project.desktop Loaded && $CMD & +fi diff --git a/poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb new file mode 100644 index 000000000..465f1349a --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb @@ -0,0 +1,59 @@ +SUMMARY = "Matchbox virtual keyboard for X11" +HOMEPAGE = "http://matchbox-project.org" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" +SECTION = "x11" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \ + file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7" + +DEPENDS = "libfakekey expat libxft" + +#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" + +S = "${WORKDIR}/git" + +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" + +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" + +FILES_${PN} = "${bindir}/ \ + ${sysconfdir} \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${datadir}/matchbox-keyboard" + +FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ + ${libdir}/gtk-3.0/*/immodules/*.so" + +FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" + + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d/ + install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ + + rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la + rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la + rm -f ${D}${libdir}/matchbox-panel/*.la +} + +GTKIMMODULES_PACKAGES = "${PN}-im" + +RDEPENDS_${PN} = "formfactor dbus-wait" +RRECOMMENDS_${PN} = "${PN}-applet" diff --git a/poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch b/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/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/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb new file mode 100644 index 000000000..421740f98 --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb @@ -0,0 +1,40 @@ +SUMMARY = "Simple GTK+ based panel for handheld devices" +HOMEPAGE = "http://matchbox-project.org" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \ + file://applets/startup/startup.c;endline=22;md5=7cbcea60b667f609495222faf3e07917" + +DEPENDS = "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 tagged 2.11 plus some autotools fixes +SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" + +RPROVIDES_${PN} = "matchbox-panel" +RREPLACES_${PN} = "matchbox-panel" +RCONFLICTS_${PN} = "matchbox-panel" + +SRC_URI = "git://git.yoctoproject.org/${BPN} \ + 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)}" +EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${libdir}/matchbox-panel/*.so \ + ${datadir}/matchbox-panel/brightness/*.png \ + ${datadir}/matchbox-panel/startup/*.png \ + ${datadir}/icons/" +FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" + +inherit autotools pkgconfig distro_features_check gettext diff --git a/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme new file mode 100644 index 000000000..c9260cfd8 --- /dev/null +++ b/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/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session new file mode 100644 index 000000000..f6313bdeb --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -0,0 +1,28 @@ +#!/bin/sh + +. /etc/formfactor/config + +if [ "$HAVE_TOUCHSCREEN" = "1" ]; then + SHOWCURSOR="no" +else + SHOWCURSOR="yes" +fi + +if [ "$HAVE_KEYBOARD" = "1" ]; then + KEYBOARD_APPLET="" +else + KEYBOARD_APPLET="keyboard" +fi + +matchbox-desktop & + +# Lines containing feature-[foo] are removed at build time if the machine +# doesn't have the feature "foo". + +START_APPLETS=showdesktop,windowselector +END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify +END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone + +matchbox-panel --start-applets $START_APPLETS --end-applets $END_APPLETS & + +exec matchbox-window-manager -theme Sato -use_cursor $SHOWCURSOR $@ diff --git a/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb new file mode 100644 index 000000000..d146e836d --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb @@ -0,0 +1,56 @@ +SUMMARY = "Custom Matchbox session files for the Sato environment" +HOMEPAGE = "http://www.matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2.0+" +LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" + +SECTION = "x11" +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 +# based on the machine architecture. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit distro_features_check + +# The matchbox-theme-sato requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +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" + SCRIPT="${S}/sedder" + rm -f $SCRIPT + touch $SCRIPT + for FEAT in $FEATURES; do + if echo ${MACHINE_FEATURES} | awk "/$FEAT/ {exit 1}"; then + echo "/feature-$FEAT/d" >> $SCRIPT + fi + done + + install -D ${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 +} + +PACKAGE_WRITE_DEPS += "gconf-native" +pkg_postinst_${PN} () { + set_value() { + #type, name, value + gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3" + } + set_value string theme 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/poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb b/poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb new file mode 100644 index 000000000..4488191b2 --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "Lightweight GTK+ terminal application" +HOMEPAGE = "http://www.matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820" + +DEPENDS = "gtk+3 vte" +SECTION = "x11/utils" + +#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 = "${GTK3DISTROFEATURES}" diff --git a/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc b/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc new file mode 100644 index 000000000..d947e1ab0 --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc @@ -0,0 +1,16 @@ +SUMMARY = "Matchbox window manager Sato themes" +HOMEPAGE = "http://www.matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "CC-BY-SA-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=aae86bb34b0a83716ca09f4e783d6ba4" + +DEPENDS = "matchbox-wm" +SECTION = "x11/wm" + +inherit autotools pkgconfig distro_features_check + +FILES_${PN} += "${datadir}/themes" + +# The matchbox-wm requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb new file mode 100644 index 000000000..7a043d344 --- /dev/null +++ b/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/poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb new file mode 100644 index 000000000..224428ddd --- /dev/null +++ b/poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -0,0 +1,59 @@ +# +# Copyright (C) 2007-2008 OpenedHand Ltd. +# + +SUMMARY = "Sato desktop" +PR = "r33" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit packagegroup distro_features_check +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" + +RDEPENDS_${PN} = "\ + ${PN}-base \ + ${PN}-apps \ + ${PN}-games \ + " + +NETWORK_MANAGER ?= "connman-gnome" + +SUMMARY_${PN}-base = "Sato desktop - base packages" +RDEPENDS_${PN}-base = "\ + matchbox-desktop \ + matchbox-session-sato \ + matchbox-keyboard \ + matchbox-keyboard-applet \ + matchbox-keyboard-im \ + matchbox-config-gtk \ + xcursor-transparent-theme \ + adwaita-icon-theme \ + settings-daemon \ + shutdown-desktop \ + libsdl \ + ${NETWORK_MANAGER} \ + udev-extraconf \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server pulseaudio-client-conf-sato pulseaudio-misc', '', d)} \ + " + +FILEMANAGER ?= "pcmanfm" + +WEB ?= "" +#WEB = "epiphany" + +SUMMARY_${PN}-apps = "Sato desktop - applications" +RDEPENDS_${PN}-apps = "\ + l3afpad \ + gst-examples \ + matchbox-terminal \ + sato-screenshot \ + ${FILEMANAGER} \ + ${WEB} \ + " + +SUMMARY_${PN}-games = "Sato desktop - games" +RDEPENDS_${PN}-games = "\ + puzzles \ + " diff --git a/poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png b/poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png Binary files differnew file mode 100644 index 000000000..b8e559456 --- /dev/null +++ b/poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png diff --git a/poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png b/poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png Binary files differnew file mode 100644 index 000000000..05921a668 --- /dev/null +++ b/poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png diff --git a/poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png b/poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png Binary files differnew file mode 100644 index 000000000..ce77a8e62 --- /dev/null +++ b/poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png diff --git a/poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png b/poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png Binary files differnew file mode 100644 index 000000000..bfe4bad56 --- /dev/null +++ b/poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png diff --git a/poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch b/poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch new file mode 100644 index 000000000..ae54dbd56 --- /dev/null +++ b/poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch @@ -0,0 +1,15 @@ +Disable the desktop preferences launcher as we don't use the pcmanfm desktop in +Sato. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/data/pcmanfm-desktop-pref.desktop b/data/pcmanfm-desktop-pref.desktop +index ccf8abb..3f6fc1c 100644 +--- a/data/pcmanfm-desktop-pref.desktop.in ++++ b/data/pcmanfm-desktop-pref.desktop.in +@@ -7,3 +7,4 @@ Exec=pcmanfm --desktop-pref + StartupNotify=true + Terminal=false + NotShowIn=GNOME;XFCE;KDE;MATE; ++NoDisplay=true diff --git a/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb b/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb new file mode 100644 index 000000000..4127a0704 --- /dev/null +++ b/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb @@ -0,0 +1,40 @@ +SUMMARY = "Fast lightweight tabbed filemanager" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://src/pcmanfm.h;endline=22;md5=417b3855771a3a87f8ad753d994491f0 \ + file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" + +SECTION = "x11" +DEPENDS = "gtk+3 startup-notification libfm intltool-native gettext-native glib-2.0-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \ + file://gnome-fs-directory.png \ + file://gnome-fs-regular.png \ + file://gnome-mime-text-plain.png \ + file://emblem-symbolic-link.png \ + file://no-desktop.patch" + +SRC_URI[md5sum] = "b4d1f8ce08d87e4f27805a246fc51ac2" +SRC_URI[sha256sum] = "0c86cac028b705ff314c7464d814c2cf7ff604c17491c20aa204b1ef1a80ad67" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/" + +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/ + + install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps +} + +FILES_${PN} += "${libdir}/pcmanfm" + +RRECOMMENDS_${PN} += "adwaita-icon-theme" diff --git a/poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf b/poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf new file mode 100644 index 000000000..97492e7a5 --- /dev/null +++ b/poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf @@ -0,0 +1,7 @@ +# We rely on PulseAudio's autospawn feature to automatically start the daemon +# in Sato. The graphical session in Sato runs under root, however, and +# PulseAudio disables autospawning for root by default. In a normal setup it's +# not desirable to autospawn for root, because it can easily interfere with +# other users' PulseAudio instances, but in Sato there are no other users, so +# it's OK to enable this in Sato. +allow-autospawn-for-root = yes diff --git a/poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb new file mode 100644 index 000000000..e27339fb4 --- /dev/null +++ b/poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb @@ -0,0 +1,17 @@ +SUMMARY = "/etc/pulse/client.conf tailored for Sato" +SECTION = "multimedia" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://50-sato.conf" +S = "${WORKDIR}" + +inherit allarch + +do_install() { + install -d ${D}${sysconfdir}/pulse/client.conf.d + install -m 0644 ${S}/50-sato.conf ${D}${sysconfdir}/pulse/client.conf.d/50-sato.conf +} + +FILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" +CONFFILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" diff --git a/poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch b/poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch new file mode 100644 index 000000000..d40a3b1ef --- /dev/null +++ b/poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch @@ -0,0 +1,32 @@ +From 337799e40350b3db2441cc98f65ec36a74dfb356 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 21 Apr 2017 12:18:08 -0700 +Subject: [PATCH] Use -Wno-error=format-overflow= if the compiler supports it + +we need this warning to be suppressed with gcc7+ +however older compilers dont support it so we need +a way to disble it only if compiler supports it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3a38c95..bb9035e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ fi + if test "x$GCC" = "xyes"; then + AC_MSG_CHECKING([for usable gcc warning flags]) + gccwarningflags= +- for flag in -Wall -Werror -std=c89 -pedantic; do ++ for flag in -Wall -Werror -std=c89 -pedantic -Wno-error=format-overflow=; do + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS" +-- +2.12.2 + diff --git a/poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch b/poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch new file mode 100644 index 000000000..f43d1df6c --- /dev/null +++ b/poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch @@ -0,0 +1,46 @@ +From 9808dc09e08937c9bffd858d3ded428225a4312a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 7 Sep 2015 09:02:38 +0000 +Subject: [PATCH] Use labs instead of abs + +cluevals is array of longs so we have to use labs() instead of abs() +since abs() returns int + +Fixes + +keen.c:1458:17: error: absolute value function 'abs' given an argument +of type 'long' but has parameter of type 'int' which may cause +truncation of value + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + keen.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/keen.c b/keen.c +index a6a7238..1631992 100644 +--- a/keen.c ++++ b/keen.c +@@ -1043,7 +1043,7 @@ done + cluevals[j] *= grid[i]; + break; + case C_SUB: +- cluevals[j] = abs(cluevals[j] - grid[i]); ++ cluevals[j] = labs(cluevals[j] - grid[i]); + break; + case C_DIV: + { +@@ -1455,7 +1455,7 @@ static int check_errors(const game_state *state, long *errors) + cluevals[j] *= state->grid[i]; + break; + case C_SUB: +- cluevals[j] = abs(cluevals[j] - state->grid[i]); ++ cluevals[j] = labs(cluevals[j] - state->grid[i]); + break; + case C_DIV: + { +-- +2.5.1 + diff --git a/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch b/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch new file mode 100644 index 000000000..5351f8eb4 --- /dev/null +++ b/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch @@ -0,0 +1,72 @@ +From 6d8326275802a2e6e61d3e99460af6891ae8362f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Jan 2016 23:10:19 -0800 +Subject: [puzzles][PATCH] palisade: Fix warnings with clang on arm + +ARM treats 'char' as unsigned char when 'char' is not qualified with +'signed' or 'unsigned' explicitly. + +This results in warnings e.g. + +palisade.c:531:22: error: comparison of constant -1 with expression of +type 'clue' (aka 'char') is always false +[-Werror,-Wtautological-constant-out-of-range-compare] + if (clues[i] == EMPTY) continue; + +Therefore, typcast the contant to char in such places to be explicit + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + palisade.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/palisade.c b/palisade.c +index 984e616..2b9c25c 100644 +--- a/palisade.c ++++ b/palisade.c +@@ -295,11 +295,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx) + * If p = q = 3 then the region has size exactly 2. */ + + for (i = 0; i < wh; ++i) { +- if (ctx->clues[i] == EMPTY) continue; ++ if (ctx->clues[i] == (char)EMPTY) continue; + for (dir = 0; dir < 4; ++dir) { + int j = i + dx[dir] + w*dy[dir]; + if (disconnected(ctx, i, j, dir)) continue; +- if (ctx->clues[j] == EMPTY) continue; ++ if (ctx->clues[j] == (char)EMPTY) continue; + if ((8 - ctx->clues[i] - ctx->clues[j] > ctx->params->k) || + (ctx->clues[i] == 3 && ctx->clues[j] == 3 && + ctx->params->k != 2)) +@@ -317,7 +317,7 @@ static int solver_number_exhausted(solver_ctx *ctx) + int changed = FALSE; + + for (i = 0; i < wh; ++i) { +- if (ctx->clues[i] == EMPTY) continue; ++ if (ctx->clues[i] == (char)EMPTY) continue; + + if (bitcount[(ctx->borders[i] & BORDER_MASK)] == ctx->clues[i]) { + for (dir = 0; dir < 4; ++dir) { +@@ -528,7 +528,7 @@ static int is_solved(const game_params *params, clue *clues, + for (i = 0; i < wh; ++i) { + if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, TRUE); + if (dsf_size(dsf, i) != k) goto error; +- if (clues[i] == EMPTY) continue; ++ if (clues[i] == (char)EMPTY) continue; + if (clues[i] != bitcount[border[i] & BORDER_MASK]) goto error; + } + +@@ -674,7 +674,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, + p = numbers; + r = 0; + for (i = 0; i < wh; ++i) { +- if (numbers[i] != EMPTY) { ++ if (numbers[i] != (char)EMPTY) { + while (r) { + while (r > 26) { + *p++ = 'z'; +-- +2.7.0 + diff --git a/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch new file mode 100644 index 000000000..c134acde2 --- /dev/null +++ b/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch @@ -0,0 +1,43 @@ +gtk.c: fix compiling failure with option -g -O + +There were compiling failure with option -g -O +... +././gtk.c: In function 'configure_area': +././gtk.c:397:2: error: 'cr' may be used uninitialized in this function [-Werror=maybe-uninitialized] + cairo_set_source_rgb(cr, + ^ +././gtk.c:384:14: note: 'cr' was declared here + cairo_t *cr; + ^ +././gtk.c: In function 'main': +././gtk.c:2911:6: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized] + fprintf(stderr, "%s: %s\n", pname, error); + ^ +cc1: all warnings being treated as errors +... + +Initialized pointer 'cr' and 'error' with NULL + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + gtk.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gtk.c b/gtk.c +index a2eba2c..c54bf63 100644 +--- a/gtk.c ++++ b/gtk.c +@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp) + int main(int argc, char **argv) + { + char *pname = argv[0]; +- char *error; ++ char *error = NULL; + int ngenerate = 0, print = FALSE, px = 1, py = 1; + int time_generation = FALSE, test_solve = FALSE, list_presets = FALSE; + int soln = FALSE, colour = FALSE; +-- +1.9.1 + diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb new file mode 100644 index 000000000..bfd817719 --- /dev/null +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -0,0 +1,76 @@ +SUMMARY = "Simon Tatham's Portable Puzzle Collection" +HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" + +DEPENDS = "libxt" + +# The libxt requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b" + +SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ + file://fix-compiling-failure-with-option-g-O.patch \ + file://0001-Use-labs-instead-of-abs.patch \ + file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ + file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ + " +UPSTREAM_CHECK_COMMITS = "1" +SRCREV = "2adf0052d66eae88c7a5e55e67fe16e13f7018b5" +PE = "2" +PV = "0.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit autotools distro_features_check pkgconfig + +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} +} + +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/puzzles-//' | sed 's/\(^\| \)./\U&/g') + echo "making ${D}/${datadir}/applications/$prog.desktop" + cat <<STOP > ${D}/${datadir}/applications/$prog.desktop +[Desktop Entry] +Name=$title +Exec=${bindir}/$prog +Icon=applications-games +Terminal=false +Type=Application +Categories=Game; +StartupNotify=true +STOP + fi + done +} diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc new file mode 100644 index 000000000..b568f0458 --- /dev/null +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -0,0 +1,58 @@ +SECTION = "x11/utils" +SUMMARY = "rxvt terminal clone supporting unicode" +DESCRIPTION = "rxvt-unicode is a clone of the well known \ +terminal emulator rxvt, modified to store text in Unicode \ +(either UCS-2 or UCS-4) and to use locale-correct input and \ +output. It also supports mixing multiple fonts at the \ +same time, including Xft fonts." +DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu" + +SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ + file://xwc.patch \ + file://rxvt.desktop \ + file://rxvt.png" + +inherit autotools pkgconfig update-alternatives + +PROVIDES = "virtual/x-terminal-emulator" +ALTERNATIVE_${PN} = "x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" + +CFLAGS_append = " -fpermissive" + +EXTRA_OECONF = "--enable-xim \ + --enable-utmp --enable-wtmp --enable-lastlog \ + --with-term=rxvt --enable-keepscrolling \ + --enable-xft --with-name=rxvt --enable-frills \ + --enable-swapscreen --enable-transparency \ + --with-codesets=eu --enable-pointer-blank \ + --enable-text-blink --enable-rxvt-scroll \ + --enable-combining --disable-perl \ + --with-x=${STAGING_DIR_HOST}${prefix}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," + +do_configure_prepend () { + if [ ! -e ${S}/acinclude.m4 ]; then + cp ${S}/aclocal.m4 ${S}/acinclude.m4 + fi +} + +do_compile_prepend () { + echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h + echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h + echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h + echo '#define HAVE_XLOCALE 1' >> config.h +} + +do_install_append () { + install -d ${D}/${datadir} + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps/ + + install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications +} + +FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop new file mode 100644 index 000000000..882ea4113 --- /dev/null +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=Terminal +Comment=A unicode capable rxvt clone +Exec=rxvt +Icon=terminal +Terminal=false +Type=Application +Categories=Utility;TerminalEmulator; diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png Binary files differnew file mode 100644 index 000000000..e56fa2e9c --- /dev/null +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch new file mode 100644 index 000000000..16efeef49 --- /dev/null +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +diff -ruN rxvt-unicode-9.10-orig//src/screen.C rxvt-unicode-9.10/src/screen.C +--- rxvt-unicode-9.10-orig//src/screen.C 2011-04-19 13:34:01.327664984 +0800 ++++ rxvt-unicode-9.10/src/screen.C 2011-04-19 13:34:47.037665001 +0800 +@@ -3152,7 +3152,7 @@ + return false; + } + +-#if 0 ++#if HAVE_XWC + XTextProperty ct; + + if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) +@@ -3734,9 +3734,11 @@ + } + else + #endif ++#ifdef HAVE_XWC + if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) + freect = 1; + else ++#endif + { + /* if we failed to convert then send it raw */ + ct.value = (unsigned char *)cl; diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb new file mode 100644 index 000000000..bfa8a614d --- /dev/null +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb @@ -0,0 +1,8 @@ +require rxvt-unicode.inc + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/main.C;beginline=1;endline=31;md5=d3600d7ee1062667fcd1193fbe6485f6" + +SRC_URI[md5sum] = "93782dec27494eb079467dacf6e48185" +SRC_URI[sha256sum] = "e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd" diff --git a/poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb b/poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb new file mode 100644 index 000000000..f3305aef7 --- /dev/null +++ b/poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb @@ -0,0 +1,28 @@ +SUMMARY = "Ultra-simple screen capture utility, aimed at handheld devices" +HOMEPAGE = "http://www.o-hand.com" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \ + file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" + +DEPENDS = "matchbox-panel-2 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" + +inherit autotools pkgconfig distro_features_check + +FILES_${PN} += "${libdir}/matchbox-panel/*.so" + +do_install_append () { + rm ${D}${libdir}/matchbox-panel/*.la +} + +# The matchbox-panel-2 requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh b/poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh new file mode 100644 index 000000000..95374135f --- /dev/null +++ b/poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh @@ -0,0 +1 @@ +/usr/bin/settings-daemon & diff --git a/poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch new file mode 100644 index 000000000..baf06d6b8 --- /dev/null +++ b/poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch @@ -0,0 +1,49 @@ +Upstream-Status: Pending + +Index: settings-daemon/settings-daemon.c +=================================================================== +--- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 ++++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100 +@@ -187,6 +187,10 @@ + GCONF_VALUE_STRING, translate_string_string }, + { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme", + GCONF_VALUE_STRING, translate_string_string }, ++ { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName", ++ GCONF_VALUE_STRING, translate_string_string }, ++ { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" , ++ GCONF_VALUE_BOOL, translate_bool_int }, + }; + + static const TranslationEntry* +Index: settings-daemon/settings-daemon.schemas +=================================================================== +--- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100 ++++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100 +@@ -196,6 +196,27 @@ + </locale> + </schema> + ++ <schema> ++ <key>/schemas/desktop/gnome/sound/theme_name</key> ++ <applyto>/desktop/gnome/sound/theme_name</applyto> ++ <owner>gnome</owner> ++ <type>string</type> ++ <default>freedesktop</default> ++ <locale name="C"> ++ <short>Sound Theme Name</short> ++ </locale> ++ </schema> ++ ++ <schema> ++ <key>/schemas/desktop/gnome/sound/event_sounds</key> ++ <applyto>/desktop/gnome/sound/event_sounds</applyto> ++ <owner>gnome</owner> ++ <type>bool</type> ++ <default>true</default> ++ <locale name="C"> ++ <short>Enable Sound Events</short> ++ </locale> ++ </schema> + + </schemalist> + </gconfschemafile> diff --git a/poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb new file mode 100644 index 000000000..bb6b69b90 --- /dev/null +++ b/poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb @@ -0,0 +1,30 @@ +SUMMARY = "Provides a bridge between gconf and xsettings" +HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ + file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" +DEPENDS = "gconf glib-2.0 gtk+3" +SECTION = "x11" + +# SRCREV tagged 0.0.2 +SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" +SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ + file://addsoundkeys.patch \ + file://70settings-daemon.sh \ + " +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig gconf distro_features_check + +FILES_${PN} = "${bindir}/* ${sysconfdir}" + +# Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ +} diff --git a/poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb new file mode 100644 index 000000000..28d509602 --- /dev/null +++ b/poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb @@ -0,0 +1,24 @@ +SUMMARY = "Provides an icon to shut down the system cleanly" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://shutdown.desktop" + +PR = "r1" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}${datadir}/applications + install -m 0644 shutdown.desktop ${D}${datadir}/applications/ + + sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' +} + +pkg_postinst_${PN} () { + grep -q qemuarm $D${sysconfdir}/hostname && \ + sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \ + || true +} + +inherit allarch diff --git a/poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop new file mode 100644 index 000000000..662659afc --- /dev/null +++ b/poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=Shutdown +Comment=Close down the machine safely +Exec=poweroff +Icon=system-shutdown +Terminal=false +Categories=Utility; +StartupNotify=true diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch new file mode 100644 index 000000000..fae3b0b2e --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch @@ -0,0 +1,27 @@ +From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 27 Oct 2015 16:02:19 +0200 +Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained + from pkg-config with PKG_CONFIG_SYSROOT_DIR + +Upstream-Status: Pending [review on oe-core list] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/cmake/FindGObjectIntrospection.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake +index e1f49b4..03a4446 100644 +--- a/Source/cmake/FindGObjectIntrospection.cmake ++++ b/Source/cmake/FindGObjectIntrospection.cmake +@@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args) + else () + string(REGEX REPLACE "[\r\n]" " " _result "${_result}") + string(REGEX REPLACE " +$" "" _result "${_result}") ++ string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}") + separate_arguments(_result) + set(${_outvar} ${_result} CACHE INTERNAL "") + endif () +-- +2.1.4 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch new file mode 100644 index 000000000..7cc4514fc --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch @@ -0,0 +1,77 @@ +From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 6 Oct 2017 17:00:08 +0300 +Subject: [PATCH] Fix build with musl + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- + Source/WTF/wtf/Platform.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h +index 95080b9..2bb689c 100644 +--- a/Source/JavaScriptCore/runtime/MachineContext.h ++++ b/Source/JavaScriptCore/runtime/MachineContext.h +@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + #if CPU(X86) + return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); +@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 5a2863b..b36c3ff 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -680,7 +680,7 @@ + #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 + #endif + +-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) + #define HAVE_MACHINE_CONTEXT 1 + #endif + +-- +2.14.1 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch new file mode 100644 index 000000000..21574072f --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch @@ -0,0 +1,38 @@ +From adf3d4c9d4133bd6995590d921c0ccaec5254da9 Mon Sep 17 00:00:00 2001 +From: Bhargava Sreekantappa Gayathri + <bhargava.sreekantappa-gayathri@xilinx.com> +Date: Tue, 27 Feb 2018 16:09:31 -0800 +Subject: [PATCH] Fix gles3 header when gles2 is enabled + +A GLES 2 application should not use gl3.h. +Fix the gles3 header failure while compiling webkitgtk. + +FAILED: +Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/GLContext.cpp.o + ^~~~~~~~~~~~~ +compilation terminated. + +Upstream-Status: Backport +Imported patch from: https://bugs.webkit.org/show_bug.cgi?id=183008 + +Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com> +Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> +--- + Source/WebCore/platform/graphics/GLContext.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp +index 599dcc0..46d2fd4 100644 +--- a/Source/WebCore/platform/graphics/GLContext.cpp ++++ b/Source/WebCore/platform/graphics/GLContext.cpp +@@ -31,7 +31,6 @@ + #elif USE(OPENGL_ES_2) + #define GL_GLEXT_PROTOTYPES 1 + #include <GLES2/gl2.h> +-#include <GLES3/gl3.h> + #endif + + #if USE(GLX) +-- +2.7.4 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch new file mode 100644 index 000000000..896890b43 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch @@ -0,0 +1,49 @@ +From b7f40eceef0f23bf88090789d4c5845c35f048ae 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 4/9] Fix racy parallel build of WebKit2-4.0.gir + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + Source/WebKit/PlatformGTK.cmake | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index a33c6a86..d83a2e77 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -1122,8 +1122,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= +@@ -1168,7 +1169,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}" +@@ -1225,7 +1226,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.14.1 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch new file mode 100644 index 000000000..0f6eeed1a --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch @@ -0,0 +1,34 @@ +From 48648570e449cf7f84a26dc03c1e3f620fa69757 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 29 Feb 2016 18:13:39 +0200 +Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc + disabling when cross-compiling + +This was not possible to override from the command line and in OpenEmbedded +(one of the most prominent cross-compilation frameworks) introspection does work fine, +through the use of qemu target emulation. + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +Upstream-Status: Pending +--- + Source/cmake/OptionsGTK.cmake | 6 ------ + 1 file changed, 6 deletions(-) + +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 () + +-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building. +-if (CMAKE_CROSSCOMPILING) +- set(ENABLE_GTKDOC OFF) +- set(ENABLE_INTROSPECTION OFF) +-endif () +- + # Override the cached variable, gtk-doc does not really work when building on Mac. + if (APPLE) + set(ENABLE_GTKDOC OFF) diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch new file mode 100644 index 000000000..83fd5129a --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch @@ -0,0 +1,50 @@ +From 9b09974003097c9a408bbeea568996768efe705b 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 05/10] 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 50b5393..7a31db5 100644 +--- a/Source/PlatformGTK.cmake ++++ b/Source/PlatformGTK.cmake +@@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) + add_custom_command( + OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" + DEPENDS ${DocumentationDependencies} +- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} ++ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc -v ${_extra_args} + COMMAND touch ${_stamp_name} + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + VERBATIM +diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py +index 03c8e8e..34fbaff 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['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path) +- else: ++ elif 'RUN' not in env: + env['LD_LIBRARY_PATH'] = self.library_path + + if ldflags: +-- +2.15.1 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch new file mode 100644 index 000000000..9fc1421fd --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch @@ -0,0 +1,127 @@ +From ef832a115b40861c08df333339b1366da49e5393 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 9/9] 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/JavaScriptCore/shell/CMakeLists.txt | 2 +- + Source/WebCore/PlatformGTK.cmake | 6 +++--- + Source/WebKit/PlatformGTK.cmake | 2 +- + Source/cmake/WebKitMacros.cmake | 2 +- + Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- + Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +index bc37dd31..4e49871f 100644 +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) + WEBKIT_WRAP_SOURCELIST(${TESTAPI_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}) + +diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake +index 73506c74..8eb8b415 100644 +--- a/Source/WebCore/PlatformGTK.cmake ++++ b/Source/WebCore/PlatformGTK.cmake +@@ -281,7 +281,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 +@@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore) + 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} +@@ -321,7 +321,7 @@ include_directories( + "${WEBCORE_DIR}/bindings/gobject/" + ) + +-include_directories(SYSTEM ++include_directories( + ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} + ) + +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index d83a2e77..401246f4 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -1050,7 +1050,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} +diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake +index 7bc89543..d9818fa4 100644 +--- a/Source/cmake/WebKitMacros.cmake ++++ b/Source/cmake/WebKitMacros.cmake +@@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target) + endmacro() + + macro(WEBKIT_FRAMEWORK _target) +- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) ++ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) + target_sources(${_target} PRIVATE + ${${_target}_HEADERS} + ${${_target}_SOURCES} +diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt +index e832a86d..ce92c864 100644 +--- a/Tools/MiniBrowser/gtk/CMakeLists.txt ++++ b/Tools/MiniBrowser/gtk/CMakeLists.txt +@@ -57,7 +57,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}) + +diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake +index 1be3dd52..7bdddf37 100644 +--- a/Tools/TestWebKitAPI/PlatformGTK.cmake ++++ b/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} +-- +2.14.1 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch new file mode 100644 index 000000000..fb4c4dc93 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch @@ -0,0 +1,41 @@ +From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 28 Oct 2015 14:18:57 +0200 +Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to + the compiler flags. + +g-ir-compiler is using a C compiler internally, so it needs to set +the proper flags for it. + +Upstream-Status: Pending [review on oe-core list] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + Source/WebKit/PlatformGTK.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index 7f92ae72..a33c6a86 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -1126,7 +1126,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= + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${INTROSPECTION_SCANNER} + --quiet +@@ -1169,7 +1169,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}" + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${INTROSPECTION_SCANNER} +-- +2.14.1 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch b/poky/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch new file mode 100644 index 000000000..4d1de7285 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch @@ -0,0 +1,23 @@ +Disable the tests meant to run when compiling natively + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake +=================================================================== +--- webkitgtk-2.14.5.orig/Source/cmake/OptionsCommon.cmake ++++ webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake +@@ -67,8 +67,11 @@ endif () + # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux. + # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53. + # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual) +-set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) +-if (WTF_CPU_ARM64 AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) ++if( NOT WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) ++ set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) ++endif(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) ++ ++if (WTF_CPU_ARM64 AND NOT CMAKE_CROSSCOMPILING AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) + execute_process(COMMAND nproc OUTPUT_VARIABLE PROC_COUNT) + math(EXPR PROC_MAX ${PROC_COUNT}-1) + foreach (PROC_ID RANGE ${PROC_MAX}) diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/poky/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch new file mode 100644 index 000000000..c6157e103 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch @@ -0,0 +1,46 @@ +From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 May 2017 22:34:24 -0700 +Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 + +Taken from +https://bugs.webkit.org/show_bug.cgi?id=161900 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + Source/WTF/wtf/CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt +index 6b5e45b9..46ee3c22 100644 +--- a/Source/WTF/wtf/CMakeLists.txt ++++ b/Source/WTF/wtf/CMakeLists.txt +@@ -205,7 +205,6 @@ set(WTF_HEADERS + + set(WTF_SOURCES + Assertions.cpp +- Atomics.cpp + AutomaticThread.cpp + BitVector.cpp + CPUTime.cpp +@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) + list(APPEND WTF_LIBRARIES bmalloc) + endif () + ++file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp ++ "int main(void)\n" ++ "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n") ++try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp) ++if (NOT ATOMICS_BUILD_SUCCEEDED) ++ list(APPEND WTF_SOURCES Atomics.cpp) ++endif () ++file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp) ++ + list(APPEND WTF_SOURCES + unicode/icu/CollatorICU.cpp + ) +-- +2.14.1 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch b/poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch new file mode 100644 index 000000000..4a6ab544b --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch @@ -0,0 +1,29 @@ +Fix configure failure for aarch64 + +| -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed +| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always +| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always - Success +| CMake Error at Source/cmake/OptionsCommon.cmake:42 (WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG): +| Unknown CMake command "WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG". +| Call Stack (most recent call first): +| Source/cmake/WebKitCommon.cmake:58 (include) +| CMakeLists.txt:166 (include) +| + +Upstream-Status: Pending + +Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> + +Index: webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake +=================================================================== +--- webkitgtk-2.14.6.orig/Source/cmake/OptionsCommon.cmake 2018-02-15 18:56:29.315238564 -0800 ++++ webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake 2018-02-15 18:54:57.469518064 -0800 +@@ -39,7 +39,7 @@ + if (NOT WTF_CPU_ARM64) + message(FATAL_ERROR "WTF_CPU_ARM64_CORTEXA53 set without WTF_CPU_ARM64") + endif () +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG(-mfix-cortex-a53-835769) ++ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-mfix-cortex-a53-835769) + endif () + + EXPOSE_VARIABLE_TO_BUILD(WTF_CPU_ARM64_CORTEXA53) diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch new file mode 100644 index 000000000..5f2383758 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch @@ -0,0 +1,21 @@ +From: Daniel Schepler <dschepler@gmail.com> +Subject: Fix FTBFS in x32 +Bug-Debian: https://bugs.debian.org/700795 +Upstream-Status: Pending +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h +=================================================================== +--- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h ++++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h +@@ -172,7 +172,11 @@ + /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ + #if defined(__x86_64__) \ + || defined(_M_X64) ++#ifdef __ILP32__ ++#define WTF_CPU_X86_64_32 1 ++#else + #define WTF_CPU_X86_64 1 ++#endif + #define WTF_CPU_X86_SSE2 1 + #endif + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb new file mode 100644 index 000000000..c29fa7f4c --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb @@ -0,0 +1,123 @@ +SUMMARY = "WebKit web rendering engine for the GTK+ platform" +HOMEPAGE = "http://www.webkitgtk.org/" +BUGTRACKER = "http://bugs.webkit.org/" + +LICENSE = "BSD & LGPLv2+" +LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + " + +SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ + 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-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ + file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ + file://x32_support.patch \ + file://cross-compile.patch \ + file://detect-atomics-during-configure.patch \ + file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ + file://0001-Fix-build-with-musl.patch \ + file://fix-configure-failure-aarch64.patch \ + file://0001-Fix-gles3-header-when-gles2-is-enabled.patch \ + " + +SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" +SRC_URI[sha256sum] = "93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c" + +inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc + +# depends on libxt +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ + gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ + 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 \ + gettext-native glib-2.0 glib-2.0-native libtasn1 \ + " + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ + enchant \ + libsecret \ + " + +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" +PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant" +PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" +PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" +PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" +PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" + +EXTRA_OECMAKE = " \ + -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ + ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ + -DENABLE_MINIBROWSER=ON \ + -DPYTHON_EXECUTABLE=`which python` \ + " + +# GL/GLES header clash: both define the same thing, differently, on 32 bit x86 +EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF " +EXTRA_OECMAKE_append_x86-x32 = " -DUSE_GSTREAMER_GL=OFF " + +# Javascript JIT is not supported on powerpc +EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " + +# 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_mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " + +EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" + +# JIT not supported on MIPS either +EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " + +# JIT not supported on X32 +# An attempt was made to upstream JIT support for x32 in +# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as +# unresolved due to limited X32 adoption. +EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " + +SECURITY_CFLAGS_remove_aarch64 = "-fpie" +SECURITY_CFLAGS_append_aarch64 = " -fPIE" + +FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" + +RRECOMMENDS_${PN} += "ca-certificates shared-mime-info" + +# http://errors.yoctoproject.org/Errors/Details/20370/ +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" + +# qemu: uncaught target signal 11 (Segmentation fault) - core dumped +# Segmentation fault +GI_DATA_ENABLED_armv7a = "False" +GI_DATA_ENABLED_armv7ve = "False" |
