diff options
Diffstat (limited to 'yocto-poky/meta/recipes-sato')
30 files changed, 532 insertions, 191 deletions
diff --git a/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc b/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc index fa6b2b2e7..93538ed01 100644 --- a/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc +++ b/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc @@ -14,7 +14,6 @@ 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_${PN}-dbg += " ${libdir}/gtk-2.0/*/engines/.debug" FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes" inherit autotools-brokensep pkgconfig diff --git a/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb new file mode 100644 index 000000000..93e5a4eb6 --- /dev/null +++ b/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -0,0 +1,6 @@ +require core-image-sato-sdk.bb + +DESCRIPTION += "Also includes ptest packages." + +IMAGE_FEATURES += "ptest-pkgs" + diff --git a/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk.bb b/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk.bb index 62836f94d..d7cc52b52 100644 --- a/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -4,11 +4,7 @@ DESCRIPTION = "Image with Sato support that includes everything within \ core-image-sato plus meta-toolchain, development headers and libraries to \ form a standalone SDK." -QT4PKG = "qt4-pkgs" -QT4PKG_mips64 = "" -QT4PKG_mips64n32 = "" - -IMAGE_FEATURES += "dev-pkgs tools-sdk ${QT4PKG} \ +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/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch b/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch new file mode 100644 index 000000000..46397dc8a --- /dev/null +++ b/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch @@ -0,0 +1,60 @@ +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/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb index 318d2e080..dbe8c1145 100644 --- a/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb +++ b/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb @@ -13,7 +13,9 @@ SECTION = "x11/wm" SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d" PV = "2.0+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/${BPN}-2" +SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ + file://0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch \ + " EXTRA_OECONF = "--enable-startup-notification --with-dbus" diff --git a/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch b/yocto-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/yocto-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/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch b/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch deleted file mode 100644 index 18b6c4174..000000000 --- a/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch +++ /dev/null @@ -1,23 +0,0 @@ -Multiple matchbox-keyboard instances would occupy whole screen and cause X -window segfault(Bug 509). Making matchbox-keyboard singleton is one work -around. - -This patch allow only one instance of matchbox-keyboard based on some mechanism -in matchbox-desktop. In future, an applet and GTK-IM modules in -matchbox-keyboard can be used to automatically map/unmap the virtual keyboard -on demand. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [configuration] - -Index: matchbox-keyboard/matchbox-keyboard.desktop -=================================================================== ---- matchbox-keyboard.orig/matchbox-keyboard.desktop 2010-12-22 20:41:40.000000000 +0800 -+++ matchbox-keyboard/matchbox-keyboard.desktop 2010-12-22 20:42:12.000000000 +0800 -@@ -6,3 +6,5 @@ - Icon=matchbox-keyboard.png - Categories=Panel;Utility;MB - X-MB-INPUT-MECHANSIM=True -+X-MB-SingleInstance=true -+StartupNotify=true diff --git a/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb index 0d321d399..eba1970ee 100644 --- a/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ b/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb @@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" -SRCREV = "217f1bfe14c41cf7e291d04a63aa2d79cc13d063" +SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073" PV = "0.0+git${SRCPV}" PR = "r4" SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ - file://single-instance.patch \ + file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ file://80matchboxkeyboard.sh" S = "${WORKDIR}/git" @@ -35,8 +35,6 @@ FILES_${PN} = "${bindir}/ \ ${datadir}/pixmaps \ ${datadir}/matchbox-keyboard" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug" - FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so" FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" diff --git a/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch b/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch new file mode 100644 index 000000000..3bab6d292 --- /dev/null +++ b/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch @@ -0,0 +1,50 @@ +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/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb index 4ed7368fd..98c3ae487 100644 --- a/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +++ b/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb @@ -22,6 +22,7 @@ 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" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" @@ -33,7 +34,6 @@ S = "${WORKDIR}/git" FILES_${PN} += "${libdir}/matchbox-panel/*.so \ ${datadir}/matchbox-panel/brightness/*.png \ ${datadir}/matchbox-panel/startup/*.png " -FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" inherit autotools pkgconfig distro_features_check diff --git a/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 6679db8ac..8ba49231d 100644 --- a/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -9,7 +9,6 @@ PR = "r33" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup distro_features_check -# rdepends on x11vnc REQUIRED_DISTRO_FEATURES = "x11" PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" @@ -39,12 +38,10 @@ RDEPENDS_${PN}-base = "\ libsdl \ ${NETWORK_MANAGER} \ udev-extraconf \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server pulseaudio-client-conf-sato', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server pulseaudio-client-conf-sato pulseaudio-misc', '', d)} \ " -# pcmanfm doesn't work on mips FILEMANAGER ?= "pcmanfm" -FILEMANAGER_mips ?= "" WEB ?= "" #WEB = "epiphany" @@ -53,7 +50,6 @@ SUMMARY_${PN}-apps = "Sato desktop - applications" RDEPENDS_${PN}-apps = "\ leafpad \ gst-player-bin \ - x11vnc \ matchbox-terminal \ sato-screenshot \ ${FILEMANAGER} \ diff --git a/yocto-poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch b/yocto-poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch index 103d6d14a..ae54dbd56 100644 --- a/yocto-poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch +++ b/yocto-poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch @@ -11,5 +11,5 @@ index ccf8abb..3f6fc1c 100644 @@ -7,3 +7,4 @@ Exec=pcmanfm --desktop-pref StartupNotify=true Terminal=false - NotShowIn=GNOME;XFCE;KDE; + NotShowIn=GNOME;XFCE;KDE;MATE; +NoDisplay=true diff --git a/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb b/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb index b63db875d..a6b0aacd2 100644 --- a/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb +++ b/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb @@ -20,8 +20,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \ file://emblem-symbolic-link.png \ file://no-desktop.patch" -SRC_URI[md5sum] = "c993402d407b0a3fc076f842ac1bc5c9" -SRC_URI[sha256sum] = "cfa8d82fc63be147045174bef074807e1e32ce8c6bf4dbd8fad49e260bcf6380" +SRC_URI[md5sum] = "19764c2f59653724c8713e0064fa6829" +SRC_URI[sha256sum] = "38cdbb5f01d24483b41b8e6846e4aa66a5751bb3982a8618899e88a853dbe313" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/" inherit autotools pkgconfig distro_features_check diff --git a/yocto-poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch b/yocto-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/yocto-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/yocto-poky/meta/recipes-sato/puzzles/files/0001-rect-Fix-compiler-errors-about-uninitialized-use-of-.patch b/yocto-poky/meta/recipes-sato/puzzles/files/0001-rect-Fix-compiler-errors-about-uninitialized-use-of-.patch new file mode 100644 index 000000000..0b971c432 --- /dev/null +++ b/yocto-poky/meta/recipes-sato/puzzles/files/0001-rect-Fix-compiler-errors-about-uninitialized-use-of-.patch @@ -0,0 +1,32 @@ +From 78d6d1706c21ad467520075ff7a8bf15cfbd68b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 30 Dec 2015 22:13:16 +0000 +Subject: [PATCH] rect: Fix compiler errors about uninitialized use of + variables + +error: 'r2.x' may be used uninitialized in this function + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + rect.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/rect.c b/rect.c +index 55667c0..fa3a786 100644 +--- a/rect.c ++++ b/rect.c +@@ -1317,7 +1317,8 @@ static char *new_game_desc(const game_params *params_in, random_state *rs, + if (ndirs > 0) { + int which, dir; + struct rect r1, r2; +- ++ memset(&r1, 0, sizeof(struct rect)); ++ memset(&r2, 0, sizeof(struct rect)); + which = random_upto(rs, ndirs); + dir = dirs[which]; + +-- +2.6.4 + diff --git a/yocto-poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/yocto-poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch index d246feeb0..c134acde2 100644 --- a/yocto-poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch +++ b/yocto-poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch @@ -29,15 +29,6 @@ diff --git a/gtk.c b/gtk.c index a2eba2c..c54bf63 100644 --- a/gtk.c +++ b/gtk.c -@@ -381,7 +381,7 @@ static void clear_backing_store(frontend *fe) - - static void setup_backing_store(frontend *fe) - { -- cairo_t *cr; -+ cairo_t *cr = NULL; - int i; - - fe->pixmap = gdk_pixmap_new(fe->area->window, fe->pw, fe->ph, -1); @@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp) int main(int argc, char **argv) { diff --git a/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb index 9876fe0fd..dfa68a659 100644 --- a/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb +++ b/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb @@ -60,7 +60,6 @@ PACKAGES += "${PN}-extra" RDEPENDS_${PN}-extra += "oh-puzzles" FILES_${PN} = "/usr/share/pixmaps /usr/share/oh-puzzles/" -FILES_${PN}-dbg += "/usr/games/.debug/*" FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas" python __anonymous () { diff --git a/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb b/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb index 95826c1b6..346f43bc9 100644 --- a/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" -DEPENDS = "gtk+ libxt" +DEPENDS = "libxt" # The libxt requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" @@ -12,21 +12,26 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" 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-rect-Fix-compiler-errors-about-uninitialized-use-of-.patch \ + file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ " -SRCREV = "c296301a06ce49b87c954c9d15452521dfeddf1a" +SRCREV = "346584bf6e38232be8773c24fd7dedcbd7b3d9ed" PE = "1" PV = "0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit autotools-brokensep distro_features_check +inherit autotools-brokensep distro_features_check pkgconfig + +PACKAGECONFIG ??= "gtk2" +PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+," +PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3," do_configure_prepend () { ./mkfiles.pl } FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*" -FILES_${PN}-dbg += "${prefix}/bin/.debug" do_install () { rm -rf ${D}/* diff --git a/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 04a43c079..4d5daa661 100644 --- a/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -5,7 +5,7 @@ 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" +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 \ diff --git a/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb index 7049495e6..bfa8a614d 100644 --- a/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb +++ b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb @@ -2,7 +2,7 @@ require rxvt-unicode.inc LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://src/main.C;beginline=1;endline=31;md5=7dac0395806570856e037f98aba8513b" + file://src/main.C;beginline=1;endline=31;md5=d3600d7ee1062667fcd1193fbe6485f6" -SRC_URI[md5sum] = "a9a06c608258c5fd247c3725d8f44582" -SRC_URI[sha256sum] = "75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b" +SRC_URI[md5sum] = "93782dec27494eb079467dacf6e48185" +SRC_URI[sha256sum] = "e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd" diff --git a/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb index 8794032d2..1b2b65dfc 100644 --- a/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb +++ b/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb @@ -19,7 +19,6 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig distro_features_check FILES_${PN} += "${libdir}/matchbox-panel/*.so" -FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" do_install_append () { rm ${D}${libdir}/matchbox-panel/*.la diff --git a/yocto-poky/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/yocto-poky/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch new file mode 100644 index 000000000..fae3b0b2e --- /dev/null +++ b/yocto-poky/meta/recipes-sato/webkit/files/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/yocto-poky/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/yocto-poky/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch new file mode 100644 index 000000000..3d004db29 --- /dev/null +++ b/yocto-poky/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch @@ -0,0 +1,35 @@ +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> +--- + 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) + 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 () +- + 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 + diff --git a/yocto-poky/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch b/yocto-poky/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch deleted file mode 100644 index 28b342053..000000000 --- a/yocto-poky/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 22d5063c551d3c08c0a4ad8b80e08b793d53093d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 10 Sep 2015 16:23:27 +0300 -Subject: [PATCH] This patch fixes a command line that is too long (over 100K!) - and is rejected by /bin/sh. - -Upstream-Status: Backport [should appear in 2.10, http://trac.webkit.org/changeset/184856] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - Source/WebKit2/PlatformGTK.cmake | 11 ++++++----- - Tools/gtk/generate-inspector-gresource-manifest.py | 16 ++++++++++++---- - 2 files changed, 18 insertions(+), 9 deletions(-) - -diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake -index a13af7c..058c241 100644 ---- a/Source/WebKit2/PlatformGTK.cmake -+++ b/Source/WebKit2/PlatformGTK.cmake -@@ -408,7 +408,7 @@ set(WebKit2WebExtension_INSTALLED_HEADERS - ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h - ) - --file(GLOB InspectorFiles -+set(InspectorFiles - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css -@@ -423,13 +423,14 @@ file(GLOB InspectorFiles - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.png - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg --) -- --list(APPEND InspectorFiles - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js - ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js - ) - -+file(GLOB InspectorFilesDependencies -+ ${InspectorFiles} -+) -+ - # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore. - list(INSERT WebKit2_INCLUDE_DIRECTORIES 0 - "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}" -@@ -564,7 +565,7 @@ add_custom_command( - - add_custom_command( - OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml -- DEPENDS ${InspectorFiles} -+ DEPENDS ${InspectorFilesDependencies} - ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py - COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} - VERBATIM -diff --git a/Tools/gtk/generate-inspector-gresource-manifest.py b/Tools/gtk/generate-inspector-gresource-manifest.py -index 0687c4c..03060cf 100755 ---- a/Tools/gtk/generate-inspector-gresource-manifest.py -+++ b/Tools/gtk/generate-inspector-gresource-manifest.py -@@ -16,6 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - import argparse -+import glob - import os - import sys - -@@ -26,10 +27,17 @@ BASE_DIR = 'WebInspectorUI/' - def get_filenames(args): - filenames = [] - -- for filename in args: -- base_dir_index = filename.rfind(BASE_DIR) -- if base_dir_index != -1: -- filenames.append(filename[base_dir_index + len(BASE_DIR):]) -+ for pattern in args: -+ paths = glob.glob(pattern) -+ for filename in paths: -+ base_dir_index = filename.rfind(BASE_DIR) -+ if base_dir_index != -1: -+ name = filename[base_dir_index + len(BASE_DIR):] -+ # The result should use forward slashes, thus make sure any os-specific -+ # separator, added by the glob.glob() call, is properly replaced -+ if os.sep != '/': -+ name = name.replace(os.sep, '/') -+ filenames.append(name) - return filenames - - --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/yocto-poky/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch new file mode 100644 index 000000000..44b43cdbb --- /dev/null +++ b/yocto-poky/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch @@ -0,0 +1,40 @@ +From bae9f73b2c693b5aa156fed717d6481b60682786 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] 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/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( + 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}" + ${INTROSPECTION_SCANNER} + --quiet +@@ -930,7 +930,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}" + ${INTROSPECTION_SCANNER} +-- +2.6.4 + diff --git a/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch new file mode 100644 index 000000000..d7e4ef626 --- /dev/null +++ b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch @@ -0,0 +1,39 @@ +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/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch new file mode 100644 index 000000000..77ebf37ef --- /dev/null +++ b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch @@ -0,0 +1,61 @@ +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/yocto-poky/meta/recipes-sato/webkit/webkitgtk/clang.patch b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/clang.patch new file mode 100644 index 000000000..e5267138b --- /dev/null +++ b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/clang.patch @@ -0,0 +1,25 @@ +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/yocto-poky/meta/recipes-sato/webkit/webkitgtk/gcc5.patch b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/gcc5.patch deleted file mode 100644 index 5951a81f3..000000000 --- a/yocto-poky/meta/recipes-sato/webkit/webkitgtk/gcc5.patch +++ /dev/null @@ -1,26 +0,0 @@ -JSObject: Create explicit instantiation of putByIndexBeyondVectorLengthWithoutAttributes - -Reason for change: newer gcc might optimize away the templates -and they wont be available for other .cpp files to use as these -are used in a different .cpp we need to tell compiler to explicitly -instantiate them. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - -Index: webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp -=================================================================== ---- webkitgtk-2.8.5.orig/Source/JavaScriptCore/runtime/JSObject.cpp -+++ webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp -@@ -1965,6 +1965,10 @@ void JSObject::putByIndexBeyondVectorLen - } - } - -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); -+ - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) - { - VM& vm = exec->vm(); diff --git a/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb index e29666ae7..8eb6b9f3b 100644 --- a/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb +++ b/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb @@ -12,26 +12,34 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "\ http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch \ - file://gcc5.patch \ + 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 \ " -SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae" -SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20" +SRC_URI[md5sum] = "84832b9d8329413b4f1d87df5f7e8efe" +SRC_URI[sha256sum] = "990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e" -inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check +inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even gobject-introspection # depends on libxt REQUIRED_DISTRO_FEATURES = "x11" -DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ - gtk+ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ +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 \ atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ - ruby-native libsecret libnotify gstreamer1.0-plugins-bad \ + ruby-native libnotify gstreamer1.0-plugins-bad \ " PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)}" + ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ + enchant \ + gtk2 \ + libsecret \ + " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" @@ -41,11 +49,12 @@ PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_G PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" EXTRA_OECMAKE = " \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_INTROSPECTION=OFF \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ -DENABLE_GTKDOC=OFF \ -DENABLE_MINIBROWSER=ON \ " @@ -67,8 +76,13 @@ EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF " FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" -FILES_${PN}-dbg += "${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so" -FILES_${PN}-dbg += "${libdir}/webkitgtk/webkit2gtk-4.0/.debug/*" # 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 " + |
