diff options
Diffstat (limited to 'meta/recipes-sato')
49 files changed, 627 insertions, 771 deletions
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb index 7fa69d0997..f45a83273c 100644 --- a/meta/recipes-sato/images/core-image-sato-dev.bb +++ b/meta/recipes-sato/images/core-image-sato-dev.bb @@ -3,5 +3,6 @@ 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." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "dev-pkgs" diff --git a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb b/meta/recipes-sato/images/core-image-sato-ptest-fast.bb deleted file mode 100644 index b794a7dc9e..0000000000 --- a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb +++ /dev/null @@ -1,16 +0,0 @@ -require core-image-sato-sdk.bb -require conf/distro/include/ptest-packagelists.inc - -IMAGE_INSTALL += "${PTESTS_FAST}" - -DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." - -# This image is sufficiently large (~1.8GB) 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 1500MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1524288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb deleted file mode 100644 index ff297fe324..0000000000 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ /dev/null @@ -1,21 +0,0 @@ -require core-image-sato-sdk.bb -require conf/distro/include/ptest-packagelists.inc - -DESCRIPTION += "Also includes ptest packages." - -IMAGE_FEATURES += "ptest-pkgs" - -PROVIDES += "core-image-sato-ptest" - -# Also include ptests which may not otherwise be included in a sato image -IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" - -# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1100MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1124288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index d7cc52b52b..b52de0def0 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -3,6 +3,7 @@ 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." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "dev-pkgs tools-sdk \ tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index 673106eb6d..35d0667737 100644 --- a/meta/recipes-sato/images/core-image-sato.bb +++ b/meta/recipes-sato/images/core-image-sato.bb @@ -1,6 +1,7 @@ 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." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs" @@ -8,8 +9,8 @@ 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" +TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-glib-2.0" +TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' -QB_MEM_qemumips = "-m 256" +QB_MEM:qemumips = "-m 256" diff --git a/meta/recipes-sato/l3afpad/l3afpad_git.bb b/meta/recipes-sato/l3afpad/l3afpad_git.bb index ccfda26589..f19d03896b 100644 --- a/meta/recipes-sato/l3afpad/l3afpad_git.bb +++ b/meta/recipes-sato/l3afpad/l3afpad_git.bb @@ -1,4 +1,8 @@ SUMMARY = "Simple GTK+ Text Editor" +DESCRIPTION = "L3afpad is a simple GTK+ text editor that emphasizes simplicity. As development \ +focuses on keeping weight down to a minimum, only the most essential features \ +are implemented in the editor. L3afpad is simple to use, is easily compiled, \ +requires few libraries, and starts up quickly." HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad" # Note that COPYING seems to mistakenly contain LGPLv2.1. @@ -17,9 +21,9 @@ SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff" S = "${WORKDIR}/git" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check mime-xdg ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OECONF = "--disable-emacs --disable-print" -FILES_${PN} += "${datadir}/icons" +FILES:${PN} += "${datadir}/icons" diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index b993a94547..d5fe9b5dce 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" DEPENDS = "gconf gtk+3" -RDEPENDS_${PN} = "settings-daemon" +RDEPENDS:${PN} = "settings-daemon" # SRCREV tagged 0.2 SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" @@ -17,7 +17,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # The settings-daemon requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb index b0cdfa2ae1..79ccb0391b 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb @@ -1,4 +1,5 @@ SUMMARY = "Matchbox Window Manager Desktop" +DESCRIPTION = "A lightweight windows manager for embedded systems. It uses the desktop background to provide an application launcher and allows modules to be loaded for additional functionality." HOMEPAGE = "http://matchbox-project.org/" BUGTRACKER = "http://bugzilla.yoctoproject.org/" @@ -13,21 +14,21 @@ SECTION = "x11/wm" # SRCREV tagged 2.2 SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ - file://vfolders/* \ + file://vfolders/ \ " EXTRA_OECONF = "--enable-startup-notification --with-dbus" S = "${WORKDIR}/git" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # The startup-notification requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" -do_install_append() { +do_install:append() { install -d ${D}${datadir}/matchbox/vfolders/ install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ } -FILES_${PN} += "${datadir}/matchbox/vfolders/" +FILES:${PN} += "${datadir}/matchbox/vfolders/" diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb index 465f1349af..a878411814 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb @@ -1,4 +1,5 @@ SUMMARY = "Matchbox virtual keyboard for X11" +DESCRIPTION = "An on screen 'virtual' or 'software' keyboard." HOMEPAGE = "http://matchbox-project.org" BUGTRACKER = "http://bugzilla.yoctoproject.org/" SECTION = "x11" @@ -18,7 +19,7 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ S = "${WORKDIR}/git" -inherit autotools pkgconfig gettext gtk-immodules-cache distro_features_check +inherit autotools pkgconfig gettext gtk-immodules-cache features_check # The libxft, libfakekey and matchbox-panel-2 requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" @@ -32,19 +33,19 @@ PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3" PACKAGES += "${PN}-im ${PN}-applet" -FILES_${PN} = "${bindir}/ \ +FILES:${PN} = "${bindir}/ \ ${sysconfdir} \ ${datadir}/applications \ ${datadir}/pixmaps \ ${datadir}/matchbox-keyboard" -FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ +FILES:${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ ${libdir}/gtk-3.0/*/immodules/*.so" -FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" +FILES:${PN}-applet = "${libdir}/matchbox-panel/*.so" -do_install_append () { +do_install:append () { install -d ${D}/${sysconfdir}/X11/Xsession.d/ install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ @@ -55,5 +56,5 @@ do_install_append () { GTKIMMODULES_PACKAGES = "${PN}-im" -RDEPENDS_${PN} = "formfactor dbus-wait" -RRECOMMENDS_${PN} = "${PN}-applet" +RDEPENDS:${PN} = "formfactor dbus-wait" +RRECOMMENDS:${PN} = "${PN}-applet" diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb index 421740f984..c6de14e34e 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb @@ -1,4 +1,6 @@ SUMMARY = "Simple GTK+ based panel for handheld devices" +DESCRIPTION = "A flexible always present 'window bar' for holding application \ +launchers and small 'applet' style applications" HOMEPAGE = "http://matchbox-project.org" BUGTRACKER = "http://bugzilla.yoctoproject.org/" @@ -17,9 +19,9 @@ 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" +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 \ @@ -31,10 +33,10 @@ EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-batter S = "${WORKDIR}/git" -FILES_${PN} += "${libdir}/matchbox-panel/*.so \ +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" +FILES:${PN}-dev += "${libdir}/matchbox-panel/*.la" -inherit autotools pkgconfig distro_features_check gettext +inherit autotools pkgconfig features_check gettext diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index 8230e95140..7af11c2f50 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb @@ -6,14 +6,14 @@ 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" +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 +inherit features_check # The matchbox-theme-sato requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" @@ -22,7 +22,7 @@ SRC_URI = "file://session \ file://index.theme" S = "${WORKDIR}" -FILES_${PN} += "${datadir}/themes/Sato/index.theme" +FILES:${PN} += "${datadir}/themes/Sato/index.theme" do_install() { # This is the set of machine features that the script has markers for @@ -43,7 +43,7 @@ do_install() { } PACKAGE_WRITE_DEPS += "gconf-native" -pkg_postinst_${PN} () { +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" diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb index 7f5eda3043..9f00281dde 100644 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb @@ -16,6 +16,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc index d947e1ab0f..bd680111d9 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aae86bb34b0a83716ca09f4e783d6ba4" DEPENDS = "matchbox-wm" SECTION = "x11/wm" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check -FILES_${PN} += "${datadir}/themes" +FILES:${PN} += "${datadir}/themes" # The matchbox-wm requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 7e14ece93d..cfa301a58d 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -3,16 +3,18 @@ # SUMMARY = "Sato desktop" +DESCRIPTION = "Packagegroups provide a convenient mechanism of bundling a collection of packages." +HOMEPAGE = "https://www.yoctoproject.org/" PR = "r33" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup distro_features_check +inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${PN}-base \ ${PN}-apps \ ${PN}-games \ @@ -20,8 +22,8 @@ RDEPENDS_${PN} = "\ NETWORK_MANAGER ?= "connman-gnome" -SUMMARY_${PN}-base = "Sato desktop - base packages" -RDEPENDS_${PN}-base = "\ +SUMMARY:${PN}-base = "Sato desktop - base packages" +RDEPENDS:${PN}-base = "\ matchbox-desktop \ matchbox-session-sato \ matchbox-keyboard \ @@ -43,10 +45,10 @@ WEB ?= "" #WEB = "epiphany" GSTEXAMPLES ?= "gst-examples" -GSTEXAMPLES_riscv64 = "" +GSTEXAMPLES:riscv64 = "" -SUMMARY_${PN}-apps = "Sato desktop - applications" -RDEPENDS_${PN}-apps = "\ +SUMMARY:${PN}-apps = "Sato desktop - applications" +RDEPENDS:${PN}-apps = "\ l3afpad \ matchbox-terminal \ sato-screenshot \ @@ -55,7 +57,7 @@ RDEPENDS_${PN}-apps = "\ ${WEB} \ " -SUMMARY_${PN}-games = "Sato desktop - games" -RDEPENDS_${PN}-games = "\ +SUMMARY:${PN}-games = "Sato desktop - games" +RDEPENDS:${PN}-games = "\ puzzles \ " diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb index a5e3a1ad33..aa1ac77e16 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb @@ -1,4 +1,5 @@ SUMMARY = "Fast lightweight tabbed filemanager" +DESCRIPTION = "A free file manager application and the standard file manager of LXDE." HOMEPAGE = "http://pcmanfm.sourceforge.net/" LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+" @@ -16,25 +17,24 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \ file://emblem-symbolic-link.png \ file://no-desktop.patch" -SRC_URI[md5sum] = "d32ad2c9c7c52bff2004bbc120b53420" -SRC_URI[sha256sum] = "6804043b3ee3a703edde41c724946174b505fe958703eadbd7e0876ece836855" +SRC_URI[sha256sum] = "14cb7b247493c4cce65fbb5902611e3ad00a7a870fbc1e50adc50428c5140cf7" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check mime-xdg # The startup-notification requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = "--with-gtk=3" -do_install_append () { +do_install:append () { install -d ${D}/${datadir} install -d ${D}/${datadir}/pixmaps/ install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps } -FILES_${PN} += "${libdir}/pcmanfm" +FILES:${PN} += "${libdir}/pcmanfm" -RRECOMMENDS_${PN} += "adwaita-icon-theme" +RRECOMMENDS:${PN} += "adwaita-icon-theme" diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb index e27339fb46..ec187ed9bd 100644 --- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb +++ b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb @@ -13,5 +13,5 @@ do_install() { 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" +FILES:${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" +CONFFILES:${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" diff --git a/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch b/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch deleted file mode 100644 index d40a3b1ef9..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch b/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch deleted file mode 100644 index f43d1df6cc..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch +++ /dev/null @@ -1,46 +0,0 @@ -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/meta/recipes-sato/puzzles/files/0001-malloc-Check-for-excessive-values-to-malloc.patch b/meta/recipes-sato/puzzles/files/0001-malloc-Check-for-excessive-values-to-malloc.patch new file mode 100644 index 0000000000..66af6afa2f --- /dev/null +++ b/meta/recipes-sato/puzzles/files/0001-malloc-Check-for-excessive-values-to-malloc.patch @@ -0,0 +1,49 @@ +From 1c01a5bc9ac7f8aaa484b1a8e0e74aa5f8899d0e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 8 Nov 2020 11:17:59 -0800 +Subject: [PATCH] malloc: Check for excessive values to malloc + +with whole program optimizers like lto smalloc() +is inlined the excessive constant argument is propagated to +malloc() and ultimately triggers the warning. + +malloc.c:15:9: error: argument 1 range [18446744065119617024, 18446744073709551580] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=] + +therefore add a check before excessive constant argument before calling +malloc + +Note that this will not happen with normal compile since they happen to +be in different translation units and compiler can not semantically +analyze as much + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + malloc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/malloc.c b/malloc.c +index a7fa7c5..520377c 100644 +--- a/malloc.c ++++ b/malloc.c +@@ -2,6 +2,7 @@ + * malloc.c: safe wrappers around malloc, realloc, free, strdup + */ + ++#include <stdint.h> + #include <stdlib.h> + #include <string.h> + #include "puzzles.h" +@@ -12,6 +13,8 @@ + */ + void *smalloc(size_t size) { + void *p; ++ if (size > PTRDIFF_MAX) ++ fatal("exceeds maximum object size"); + p = malloc(size); + if (!p) + fatal("out of memory"); +-- +2.29.2 + diff --git a/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch b/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch new file mode 100644 index 0000000000..a02d8732ab --- /dev/null +++ b/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch @@ -0,0 +1,42 @@ +From 3d78d4cffcdc1242892b6c21c26d1c96938c48d1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Feb 2021 10:02:43 -0800 +Subject: [PATCH] map: Fix stringop-overflow warning + +Fixes + +../git/map.c: In function 'new_game_desc': +../git/map.c:1663:23: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] + 1663 | ret[retlen++] = ','; + | ~~~~~~~~~~~~~~^~~~~ +../git/./map.c: In function 'new_game_desc': +../git/./map.c:1663:23: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] + 1663 | ret[retlen++] = ','; + | ~~~~~~~~~~~~~~^~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + map.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/map.c b/map.c +index 412305c..fa0c493 100644 +--- a/map.c ++++ b/map.c +@@ -1659,8 +1659,10 @@ static char *new_game_desc(const game_params *params, random_state *rs, + } + } + +- ret[retlen++] = 'a'-1 + run; +- ret[retlen++] = ','; ++ if(ret != NULL) { ++ ret[retlen++] = 'a'-1 + run; ++ ret[retlen++] = ','; ++ } + + run = 0; + for (i = 0; i < n; i++) { +-- +2.30.1 + diff --git a/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch b/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch index 5351f8eb4e..143e898a51 100644 --- a/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch +++ b/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch @@ -1,7 +1,7 @@ -From 6d8326275802a2e6e61d3e99460af6891ae8362f Mon Sep 17 00:00:00 2001 +From 453587d714473b806473b309727f865b673cbc06 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 +Subject: [PATCH] palisade: Fix warnings with clang on arm ARM treats 'char' as unsigned char when 'char' is not qualified with 'signed' or 'unsigned' explicitly. @@ -16,17 +16,16 @@ type 'clue' (aka 'char') is always false 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 +index 6ffbf2d..8b54d42 100644 --- a/palisade.c +++ b/palisade.c -@@ -295,11 +295,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx) +@@ -304,11 +304,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) { @@ -40,8 +39,8 @@ index 984e616..2b9c25c 100644 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; +@@ -326,7 +326,7 @@ static bool solver_number_exhausted(solver_ctx *ctx) + bool changed = false; for (i = 0; i < wh; ++i) { - if (ctx->clues[i] == EMPTY) continue; @@ -49,16 +48,16 @@ index 984e616..2b9c25c 100644 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, +@@ -538,7 +538,7 @@ static bool 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[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, +@@ -685,7 +685,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, p = numbers; r = 0; for (i = 0; i < wh; ++i) { @@ -67,6 +66,3 @@ index 984e616..2b9c25c 100644 while (r) { while (r > 26) { *p++ = 'z'; --- -2.7.0 - diff --git a/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch b/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch index 9ac62015d8..7ca582fe5d 100644 --- a/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch +++ b/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch @@ -1,4 +1,4 @@ -From 035467aa0abfbc0de7e5d24543d4aab37301593c Mon Sep 17 00:00:00 2001 +From 3af5a1e579e3324a13ba1f892c7befb3ab32d899 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 7 Mar 2019 21:56:57 -0800 Subject: [PATCH] pattern.c: Change string lenght parameter to be size_t in @@ -11,23 +11,24 @@ pattern.c:455:9: error: 'memset' specified size between 18446744071562067968 and Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- pattern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pattern.c b/pattern.c -index 45b1b0c..f73a4c2 100644 +index ffadd3f..4e5f187 100644 --- a/pattern.c +++ b/pattern.c -@@ -428,7 +428,7 @@ static int do_row(unsigned char *known, unsigned char *deduced, - unsigned char *row, - unsigned char *minpos_done, unsigned char *maxpos_done, - unsigned char *minpos_ok, unsigned char *maxpos_ok, -- unsigned char *start, int len, int step, int *data, -+ unsigned char *start, size_t len, int step, int *data, - unsigned int *changed +@@ -428,7 +428,7 @@ static bool do_row(unsigned char *known, unsigned char *deduced, + unsigned char *row, + unsigned char *minpos_done, unsigned char *maxpos_done, + unsigned char *minpos_ok, unsigned char *maxpos_ok, +- unsigned char *start, int len, int step, int *data, ++ unsigned char *start, size_t len, int step, int *data, + unsigned int *changed #ifdef STANDALONE_SOLVER - , const char *rowcol, int index, int cluewid + , const char *rowcol, int index, int cluewid -- -2.21.0 +2.17.1 diff --git a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch index c134acde2f..28040523d4 100644 --- a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch +++ b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch @@ -1,4 +1,7 @@ -gtk.c: fix compiling failure with option -g -O +From 876c6ff1e20f51b0921acda99861f476b6423f26 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 11 Aug 2014 12:39:53 +0800 +Subject: [PATCH] gtk.c: fix compiling failure with option -g -O There were compiling failure with option -g -O ... @@ -21,23 +24,21 @@ 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(-) + gtk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk.c b/gtk.c -index a2eba2c..c54bf63 100644 +index 4565836..5e83b48 100644 --- a/gtk.c +++ b/gtk.c -@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp) +@@ -2944,7 +2944,7 @@ static void list_presets_from_menu(struct preset_menu *menu) 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 - + int ngenerate = 0, px = 1, py = 1; + bool print = false; + bool time_generation = false, test_solve = false, list_presets = false; diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 59b952522d..298e29f559 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -1,46 +1,33 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" +DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games." HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b" +LIC_FILES_CHKSUM = "file://LICENCE;md5=6e7d24cf1c949887ee9447a1e2a4a24c" -DEPENDS = "libxt" - -# The libxt requires x11 in DISTRO_FEATURES +# gtk support includes a bunch of x11 headers REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ +SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main \ 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 \ file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \ file://fix-ki-uninitialized.patch \ + file://0001-malloc-Check-for-excessive-values-to-malloc.patch \ + file://0001-map-Fix-stringop-overflow-warning.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "c6e0161dd475415316ed66dc82794d68e52f0025" +SRCREV = "8f3413c31ffd43c4ebde40894ac1b2f7cdf222c3" PE = "2" PV = "0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit autotools distro_features_check pkgconfig - -PACKAGECONFIG ??= "gtk3" -PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+," -PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3," - -CFLAGS_append = " -Wno-deprecated-declarations" - -ASNEEDED = "" +inherit cmake features_check pkgconfig -do_configure_prepend () { - cd ${S} - ./mkfiles.pl - cd ${B} -} +DEPENDS += "gtk+3" -do_install_append () { +do_install:append () { # net conflicts with Samba, so rename it mv ${D}${bindir}/net ${D}${bindir}/puzzles-net @@ -66,16 +53,3 @@ STOP done } -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) -} diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index b568f04580..69b8a659ed 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -5,6 +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." +HOMEPAGE = "https://rxvt.org/" DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ @@ -15,10 +16,10 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 inherit autotools pkgconfig update-alternatives PROVIDES = "virtual/x-terminal-emulator" -ALTERNATIVE_${PN} = "x-terminal-emulator" +ALTERNATIVE:${PN} = "x-terminal-emulator" ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" -CFLAGS_append = " -fpermissive" +CFLAGS:append = " -fpermissive" EXTRA_OECONF = "--enable-xim \ --enable-utmp --enable-wtmp --enable-lastlog \ @@ -30,23 +31,25 @@ EXTRA_OECONF = "--enable-xim \ --enable-combining --disable-perl \ --with-x=${STAGING_DIR_HOST}${prefix}" +EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" + PACKAGECONFIG ??= "" PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," -do_configure_prepend () { +do_configure:prepend () { if [ ! -e ${S}/acinclude.m4 ]; then cp ${S}/aclocal.m4 ${S}/acinclude.m4 fi } -do_compile_prepend () { +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 () { +do_install:append () { install -d ${D}/${datadir} install -d ${D}/${datadir}/applications install -d ${D}/${datadir}/pixmaps/ @@ -55,4 +58,4 @@ do_install_append () { install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications } -FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" +FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.26.bb index bfa8a614df..3fe69a543f 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.26.bb @@ -4,5 +4,5 @@ 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" +SRC_URI[sha256sum] = "643116b9a25d29ad29f4890131796d42e6d2d21312282a613ef66c80c5b8c98b" + diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb index f3305aef78..b2913b4ed5 100644 --- a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb @@ -16,12 +16,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check -FILES_${PN} += "${libdir}/matchbox-panel/*.so" +FILES:${PN} += "${libdir}/matchbox-panel/*.so" -do_install_append () { - rm ${D}${libdir}/matchbox-panel/*.la +do_install:append () { + rm -f ${D}${libdir}/matchbox-panel/*.la } # The matchbox-panel-2 requires x11 in DISTRO_FEATURES diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index bb6b69b900..742364f699 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Provides a bridge between gconf and xsettings" -HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/" +HOMEPAGE = "https://git.yoctoproject.org/cgit/cgit.cgi/xsettings-daemon/" BUGTRACKER = "http://bugzilla.yoctoproject.org/" LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ @@ -17,14 +17,14 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" -inherit autotools pkgconfig gconf distro_features_check +inherit autotools pkgconfig gconf features_check -FILES_${PN} = "${bindir}/* ${sysconfdir}" +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 () { +do_install:append () { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ } diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb index 28d5096023..4bb896fc7b 100644 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb @@ -15,7 +15,7 @@ do_install() { sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { grep -q qemuarm $D${sysconfdir}/hostname && \ sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \ || true diff --git a/meta/recipes-sato/webkit/libwpe_1.10.1.bb b/meta/recipes-sato/webkit/libwpe_1.10.1.bb new file mode 100644 index 0000000000..4e77481bc8 --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.10.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +inherit cmake features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "a327b3ffcf2356dbe8148c1db4bbdc5359d7e7163d177f67551a8393b144adf0" + +# This is a tweak of upstream-version-is-even needed because +# ipstream directory contains tarballs for other components as well. +UPSTREAM_CHECK_REGEX = "libwpe-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch new file mode 100644 index 0000000000..6d7d7067e4 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch @@ -0,0 +1,42 @@ +From acf26a385d17a59ccd4b767d6303ec3dbf78e788 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 3 Feb 2020 17:06:27 -0800 +Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG + +Fixes build failures on risv64 + +Taken from https://trac.webkit.org/changeset/231843/webkit + + Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of +-lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to +missing atomic primitives. + +Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + Source/cmake/OptionsGTK.cmake | 1 + + Source/cmake/OptionsJSCOnly.cmake | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake +index f316f49..de81ce0 100644 +--- a/Source/cmake/OptionsGTK.cmake ++++ b/Source/cmake/OptionsGTK.cmake +@@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN() + SET_PROJECT_VERSION(2 32 3) + + set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") ++set(THREADS_PREFER_PTHREAD_FLAG ON) + + find_package(Cairo 1.14.0 REQUIRED) + find_package(Fontconfig 2.8.0 REQUIRED) +diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake +index 1066440..d9aca95 100644 +--- a/Source/cmake/OptionsJSCOnly.cmake ++++ b/Source/cmake/OptionsJSCOnly.cmake +@@ -1,3 +1,4 @@ ++set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + + if (MSVC) diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch deleted file mode 100644 index 0c145c7ebd..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c4d4d9f1aa74addefdad40294cf16d9e0b3dd6ec 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 823964c2..00841146 100644 ---- a/Source/JavaScriptCore/runtime/MachineContext.h -+++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - #if CPU(X86) - return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#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 34f7cb14..32ad9150 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -714,7 +714,7 @@ - - #endif /* OS(DARWIN) */ - --#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) -+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) - #define HAVE_MACHINE_CONTEXT 1 - #endif - diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch index aa9a06701a..0c31c5fa21 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch @@ -1,4 +1,4 @@ -From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001 +From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 29 Aug 2016 16:38:11 +0300 Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir @@ -11,12 +11,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index a074a80..8c6ebb5 100644 +index a069c5f6..ea2f542b 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION) - string(REGEX MATCHALL "-L[^ ]*" - INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") +@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION) + set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}") + endif () - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir @@ -26,7 +26,7 @@ index a074a80..8c6ebb5 100644 DEPENDS WebKit DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= -@@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION) +@@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir @@ -35,7 +35,7 @@ index a074a80..8c6ebb5 100644 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" -@@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION) +@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch b/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch new file mode 100644 index 0000000000..98d2d1ded9 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch @@ -0,0 +1,31 @@ +From dcf9ae0dc0b4510eddbeeea09e11edfb123f95af Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 2 May 2021 13:10:49 -0700 +Subject: [PATCH] MiniBrowser: Fix reproduciblity + +Do not emit references to source dir in generated sourcecode + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=225283] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Tools/MiniBrowser/gtk/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt +index 93b62521..482d3b00 100644 +--- a/Tools/MiniBrowser/gtk/CMakeLists.txt ++++ b/Tools/MiniBrowser/gtk/CMakeLists.txt +@@ -51,8 +51,8 @@ add_custom_command( + OUTPUT ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c + ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h + MAIN_DEPENDENCY ${MiniBrowser_DIR}/browser-marshal.list +- COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c +- COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h ++ COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body --skip-source > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c ++ COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header --skip-source > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h + VERBATIM) + + if (USE_GTK4) +-- +2.31.1 + diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch deleted file mode 100644 index e8d1d8c341..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bed4cf4aaa6aad4172ec9942e9039fb8e1ef68a4 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(-) - -diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 661b40e..404441b 100644 ---- a/Source/cmake/OptionsGTK.cmake -+++ b/Source/cmake/OptionsGTK.cmake -@@ -352,12 +352,6 @@ if (ENABLED_COMPILER_SANITIZERS) - set(ENABLE_INTROSPECTION OFF) - 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/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch index e7c668c040..866e9d9d09 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch @@ -1,4 +1,4 @@ -From 4b5e02212a31b82fc9b3becad90542274816fc29 Mon Sep 17 00:00:00 2001 +From 1c7e7a385387d7febf633bbb6d2b99ece523e719 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 11 Aug 2016 17:13:51 +0300 Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under @@ -17,15 +17,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake -index b0fb31ca..6cb6313d 100644 +index 18e86448..102c873a 100644 --- a/Source/cmake/GtkDoc.cmake +++ b/Source/cmake/GtkDoc.cmake @@ -4,7 +4,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" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/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/gtkdoc/generate-gtkdoc ${_extra_args} +- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/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" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} COMMAND touch ${_stamp_name} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" VERBATIM diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch deleted file mode 100644 index e71905d26a..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ /dev/null @@ -1,125 +0,0 @@ -From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 17 Apr 2016 12:35:41 -0700 -Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem - -gcc-6 has now introduced stdlib.h in libstdc++ for better -compliance and its including the C library stdlib.h using -include_next which is sensitive to order of system header -include paths. Its infact better to not tinker with the -system header include paths at all. Since adding /usr/include -to -system is redundant and compiler knows about it moreover -now with gcc6 it interferes with compiler's functioning -and ends up with compile errors e.g. - -/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - ---- - Source/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 87153e35..cd0beed4 100644 ---- a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) - WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) - include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_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 e0dd9cd9..a2997f3e 100644 ---- a/Source/WebCore/PlatformGTK.cmake -+++ b/Source/WebCore/PlatformGTK.cmake -@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) - target_include_directories(WebCorePlatformGTK2 PRIVATE - ${WebCore_INCLUDE_DIRECTORIES} - ) -- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE -+ target_include_directories(WebCorePlatformGTK2 PRIVATE - ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} - ${GTK2_INCLUDE_DIRS} - ${GDK2_INCLUDE_DIRS} -@@ -190,7 +190,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} -@@ -206,7 +206,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 693bbdfe..20e3802f 100644 ---- a/Source/WebKit/PlatformGTK.cmake -+++ b/Source/WebKit/PlatformGTK.cmake -@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) - target_include_directories(WebKitPluginProcess2 PRIVATE - ${WebKitCommonIncludeDirectories} - ) -- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE -+ target_include_directories(WebKitPluginProcess2 PRIVATE - ${WebKitCommonSystemIncludeDirectories} - ${GTK2_INCLUDE_DIRS} - ${GDK2_INCLUDE_DIRS} -diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake -index 6d58d57e..976e2362 100644 ---- a/Source/cmake/WebKitMacros.cmake -+++ b/Source/cmake/WebKitMacros.cmake -@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target) - ${${_target}_SOURCES} - ) - target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>") -- target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>") -+ target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>") - target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>") - target_link_libraries(${_target} ${${_target}_LIBRARIES}) - set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") -diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt -index a0d32059..f259ade2 100644 ---- a/Tools/MiniBrowser/gtk/CMakeLists.txt -+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt -@@ -59,7 +59,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 8dd0e146..d037fc35 100644 ---- a/Tools/TestWebKitAPI/PlatformGTK.cmake -+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake -@@ -22,7 +22,7 @@ include_directories( - ${WEBKIT_DIR}/UIProcess/API/gtk - ) - --include_directories(SYSTEM -+include_directories( - ${GDK3_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch b/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch deleted file mode 100644 index bd4ac1e353..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2d9687840b97186b80053dd262209e39455ac876 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 8 May 2019 15:31:23 +0200 -Subject: [PATCH] gstreamer: add a missing format string - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - .../platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -index e1e497ee..483fd65c 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -@@ -738,7 +738,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat - WebKitWebSrc* src = WEBKIT_WEB_SRC(element); - - #if GST_CHECK_VERSION(1, 14, 0) -- GST_DEBUG_OBJECT(src, gst_state_change_get_name(transition)); -+ GST_DEBUG_OBJECT(src, "%s", gst_state_change_get_name(transition)); - #endif - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: diff --git a/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch deleted file mode 100644 index 4d1de72851..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch b/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch deleted file mode 100644 index 57ae48c141..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Alberto Garcia <berto@igalia.com> -Subject: Disable USE_GSTREAMER_GL is the package is not found -Forwarded: no -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: webkitgtk/Source/cmake/GStreamerChecks.cmake -=================================================================== ---- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake -+++ webkitgtk/Source/cmake/GStreamerChecks.cmake -@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) - message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.") - else () - if (NOT PC_GSTREAMER_GL_FOUND) -- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.") -+ set(USE_GSTREAMER_GL OFF) -+ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.") - endif () - endif () - endif () diff --git a/meta/recipes-sato/webkit/webkitgtk/include_array.patch b/meta/recipes-sato/webkit/webkitgtk/include_array.patch deleted file mode 100644 index 7268b04bf4..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/include_array.patch +++ /dev/null @@ -1,15 +0,0 @@ -Added missing include for std::array - -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197085] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp.org 2019-04-18 18:03:50.226231691 -0700 -+++ webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp 2019-04-18 18:07:28.569153989 -0700 -@@ -31,6 +31,7 @@ - #include <elf.h> - #include <fcntl.h> - #include <mutex> -+#include <array> - #include <sys/mman.h> - #include <sys/stat.h> - #include <sys/syscall.h> diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch new file mode 100644 index 0000000000..ffe1b74be3 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch @@ -0,0 +1,34 @@ +From d95f46e149226f634830e76cc1f4f8e3ee04ff5a Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Fri, 6 Nov 2020 04:38:13 +0100 +Subject: [PATCH] webkitgtk: fix build with x11 enabled + +Since +https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 +it uses XVisualInfo which is defined in Xutil.h + +Without this the build fails with: +webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: 'XVisualInfo' was not declared in this scope; did you mean 'VisualID'? + 132 | XVisualInfo visualTemplate; + | ^~~~~~~~~~~ + | VisualID + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +--- + Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +index 2d66b9cd..424fb5a1 100644 +--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp ++++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +@@ -30,6 +30,7 @@ + + #if PLATFORM(X11) + #include <X11/Xlib.h> ++#include <X11/Xutil.h> + #include <X11/extensions/Xcomposite.h> + #if PLATFORM(GTK) + #include <X11/Xutil.h> diff --git a/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch b/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch new file mode 100644 index 0000000000..f71f8452fd --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch @@ -0,0 +1,77 @@ +From 04e4999c6fa2e9810634745a07f1e380f27b8e61 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 Mar 2021 13:24:57 -0700 +Subject: [PATCH] reduce thread stack and heap usage for javascriptcore on musl + +default sizes for musl are smaller compared to glibc, this matches +to musl defaults, avoid stack overflow crashes in jscore + +This is based on Alpine Linux's patch based on suggestion from +https://bugs.webkit.org/show_bug.cgi?id=187485 + +Real solution would entail more as the suggestions to increase +stack size via -Wl,-z,stack-size=N does not work fully and also +setting DEFAULT_THREAD_STACK_SIZE_IN_KB alone is not enough either + +This patch only changes behavior when using musl, the defaults for +glibc in OE remains same + +Upstream-Status: Accepted +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + Source/JavaScriptCore/runtime/OptionsList.h | 18 +++++++++++++++--- + Source/WTF/wtf/Threading.h | 4 ++++ + 2 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h +index bb6d2f1d..a6209742 100644 +--- a/Source/JavaScriptCore/runtime/OptionsList.h ++++ b/Source/JavaScriptCore/runtime/OptionsList.h +@@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage(); + // On instantiation of the first VM instance, the Options will be write protected + // and cannot be modified thereafter. + ++#if OS(LINUX) && !defined(__GLIBC__) ++// non-glibc options on linux ( musl ) ++constexpr unsigned jscMaxPerThreadStack = 128 * KB; ++constexpr unsigned jscSoftReservedZoneSize = 32 * KB; ++constexpr unsigned jscReservedZoneSize = 16 * KB; ++#else ++//default ++constexpr unsigned jscMaxPerThreadStack = 4 * MB; ++constexpr unsigned jscSoftReservedZoneSize = 128 * KB; ++constexpr unsigned jscReservedZoneSize = 64 * KB; ++#endif ++ + #define FOR_EACH_JSC_OPTION(v) \ + v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \ + v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \ +@@ -86,9 +98,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage(); + \ + v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ + \ +- v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \ +- v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ +- v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ ++ v(Unsigned, maxPerThreadStackUsage, jscMaxPerThreadStack, Normal, "Max allowed stack usage by the VM") \ ++ v(Unsigned, softReservedZoneSize, jscSoftReservedZoneSize, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ ++ v(Unsigned, reservedZoneSize, jscReservedZoneSize, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ + \ + v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \ + v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ +diff --git a/Source/WTF/wtf/Threading.h b/Source/WTF/wtf/Threading.h +index 9495d6c1..190b3811 100644 +--- a/Source/WTF/wtf/Threading.h ++++ b/Source/WTF/wtf/Threading.h +@@ -60,6 +60,10 @@ + #include <dispatch/dispatch.h> + #endif + ++#if OS(LINUX) && !defined(__GLIBC__) ++#define DEFAULT_THREAD_STACK_SIZE_IN_KB 128 ++#endif ++ + namespace WTF { + + class AbstractLocker; diff --git a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch b/meta/recipes-sato/webkit/webkitgtk/narrowing.patch deleted file mode 100644 index 598b6b5df5..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix build with clang on arm where char is unsigned - -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/Source/WebCore/contentextensions/DFACombiner.cpp -+++ b/Source/WebCore/contentextensions/DFACombiner.cpp -@@ -37,7 +37,7 @@ namespace WebCore { - namespace ContentExtensions { - - class DFAMerger { -- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList; -+ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList; - - enum class WhichDFA { - A, ---- a/Source/WebCore/contentextensions/NFAToDFA.cpp -+++ b/Source/WebCore/contentextensions/NFAToDFA.cpp -@@ -41,9 +41,9 @@ namespace WebCore { - - namespace ContentExtensions { - --typedef MutableRange<char, NFANodeIndexSet> NFANodeRange; --typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList; --typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList; -+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange; -+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList; -+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList; - typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList; - typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures; - diff --git a/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch b/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch new file mode 100644 index 0000000000..aa11c131d2 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch @@ -0,0 +1,28 @@ +From ec6045fcf5a46123b54029a675d08d89a5e30f21 Mon Sep 17 00:00:00 2001 +From: Alberto Garcia <berto@igalia.com> +Date: Sun, 25 Apr 2021 18:45:13 +0000 +Subject: [PATCH] Reduce memory usage when not using the Gold linker + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + Source/cmake/OptionsCommon.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake +index dd4da682..71ad6106 100644 +--- a/Source/cmake/OptionsCommon.cmake ++++ b/Source/cmake/OptionsCommon.cmake +@@ -101,6 +101,11 @@ option(GCC_OFFLINEASM_SOURCE_MAP + ${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT}) + + option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE}) ++# Pass --reduce-memory-overheads to the bfd linker in order to save memory ++if (NOT USE_LD_GOLD) ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads") ++endif () + + # Enable the usage of OpenMP. + # - At this moment, OpenMP is only used as an alternative implementation diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch deleted file mode 100644 index 85d281e7f4..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch +++ /dev/null @@ -1,30 +0,0 @@ -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Upstream-Status: Pending - -From 897563a0397266d8ceb058f172e16b06419b2593 Mon Sep 17 00:00:00 2001 -From: Daniel Schepler <dschepler@gmail.com> -Date: Mon, 26 Mar 2018 17:48:34 +0300 -Subject: [PATCH] Fix FTBFS in x32 - -=================================================================== - ---- - Source/WTF/wtf/Platform.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 850e298..551c047 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -132,7 +132,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 - #define WTF_CPU_KNOWN 1 - #endif diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb deleted file mode 100644 index 8c695ce9e7..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb +++ /dev/null @@ -1,130 +0,0 @@ -SUMMARY = "WebKit web rendering engine for the GTK+ platform" -HOMEPAGE = "http://www.webkitgtk.org/" -BUGTRACKER = "http://bugs.webkit.org/" - -LICENSE = "BSD & LGPLv2+" -LIC_FILES_CHKSUM = "file://Source/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://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ - file://0001-Fix-build-with-musl.patch \ - file://detect-gstreamer-gl.patch \ - file://include_array.patch \ - file://narrowing.patch \ - file://0001-gstreamer-add-a-missing-format-string.patch \ - " - -SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87" -SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8" - -inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc - -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -CVE_PRODUCT = "webkitgtk webkitgtk\+" - -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" -# Source is at https://github.com/google/woff2 -PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" -PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" - -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 python3` \ - " - -# Javascript JIT is not supported on ARC -EXTRA_OECMAKE_append_arc = " -DENABLE_JIT=OFF " -# By default 25-bit "medium" calls are used on ARC -# which is not enough for binaries larger than 32 MiB -CFLAGS_append_arc = " -mlong-calls" -CXXFLAGS_append_arc = " -mlong-calls" - -# 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 " - -EXTRA_OECMAKE_append_mipsarchn32 = " -DUSE_LD_GOLD=OFF " -EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " - -# JIT not supported on MIPS either -EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " - -# 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" - -LDFLAGS_append_toolchain-clang = " -rtlib=compiler-rt" - -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" - -# Can't be built with ccache -CCACHE_DISABLE = "1" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb new file mode 100644 index 0000000000..1f3f7a9c00 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb @@ -0,0 +1,150 @@ +SUMMARY = "WebKit web rendering engine for the GTK+ platform" +HOMEPAGE = "https://www.webkitgtk.org/" +BUGTRACKER = "https://bugs.webkit.org/" + +LICENSE = "BSD-2-Clause & 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 = "https://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-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ + file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ + file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ + file://include_xutil.patch \ + file://reduce-memory-overheads.patch \ + file://musl-lower-stack-usage.patch \ + file://0001-MiniBrowser-Fix-reproduciblity.patch \ + " + +SRC_URI[sha256sum] = "c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc" + +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" + +CVE_PRODUCT = "webkitgtk webkitgtk\+" + +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt 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 librsvg libtheora libvorbis \ + ruby-native libnotify gstreamer1.0-plugins-bad \ + gettext-native glib-2.0 glib-2.0-native libtasn1 \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ + enchant \ + libsecret \ + " + +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" +PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" +PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" +PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" +PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" +PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" +PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" +PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," + +# webkitgtk is full of /usr/bin/env python, particular for generating docs +do_configure[postfuncs] += "setup_python_link" +setup_python_link() { + if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + fi +} + +EXTRA_OECMAKE = " \ + -DPORT=GTK \ + ${@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 python3` \ + -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + -DENABLE_GAMEPAD=OFF \ + " + +# Javascript JIT is not supported on ARC +EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " +# By default 25-bit "medium" calls are used on ARC +# which is not enough for binaries larger than 32 MiB +CFLAGS:append:arc = " -mlong-calls" +CXXFLAGS:append:arc = " -mlong-calls" + +# 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 " + +EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " + +# JIT and gold linker does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" + +# JIT not supported on MIPS either +EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " + +# 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" + +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED:libc-musl:armv7a = "False" +GI_DATA_ENABLED:libc-musl:armv7ve = "False" + +# Can't be built with ccache +CCACHE_DISABLE = "1" + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${WORKDIR},,g" \ + ${B}/DerivedSources/webkit2gtk/webkit2/*.cpp \ + ${B}/DerivedSources/ForwardingHeaders/JavaScriptCore/*.h \ + ${B}/DerivedSources/JavaScriptCore/*.h \ + ${B}/DerivedSources/JavaScriptCore/yarr/*.h \ + ${B}/DerivedSources/MiniBrowser/*.c +} + diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb new file mode 100644 index 0000000000..29ffb9091f --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" + +DEPENDS:append:class-target = " wayland-native" + +inherit meson features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "b89dfd3500a4dec711132cd7bff72599e67d56a419d000730e14bb99547509cc" + +# This is a tweak of upstream-version-is-even needed because +# ipstream directory contains tarballs for other components as well. +UPSTREAM_CHECK_REGEX = "wpebackend-fdo-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" |