diff options
Diffstat (limited to 'meta/recipes-sato')
53 files changed, 659 insertions, 999 deletions
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 d37ad00cf8..0000000000 --- a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | inherit features_check | ||
2 | REQUIRED_DISTRO_FEATURES = "ptest" | ||
3 | |||
4 | require core-image-sato-sdk.bb | ||
5 | require conf/distro/include/ptest-packagelists.inc | ||
6 | |||
7 | IMAGE_INSTALL += "${PTESTS_FAST}" | ||
8 | |||
9 | DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." | ||
10 | HOMEPAGE = "https://www.yoctoproject.org/" | ||
11 | |||
12 | # This image is sufficiently large (~1.8GB) that it can't actually fit in a live | ||
13 | # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the | ||
14 | # box) and explicitly add just 1500MB. | ||
15 | # strace-ptest in particular needs more than 500MB | ||
16 | IMAGE_OVERHEAD_FACTOR = "1.0" | ||
17 | IMAGE_ROOTFS_EXTRA_SPACE = "1524288" | ||
18 | |||
19 | # ptests need more memory than standard to avoid the OOM killer | ||
20 | QB_MEM = "-m 1024" | ||
21 | |||
22 | # Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places | ||
23 | PTEST_EXPECT_FAILURE = "1" | ||
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 eea89a5d6c..0000000000 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | inherit features_check | ||
2 | REQUIRED_DISTRO_FEATURES = "ptest" | ||
3 | |||
4 | require core-image-sato-sdk.bb | ||
5 | require conf/distro/include/ptest-packagelists.inc | ||
6 | |||
7 | DESCRIPTION += "Also includes ptest packages." | ||
8 | HOMEPAGE = "https://www.yoctoproject.org/" | ||
9 | |||
10 | PROVIDES += "core-image-sato-ptest" | ||
11 | |||
12 | # Also include ptests which may not otherwise be included in a sato image | ||
13 | IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" | ||
14 | |||
15 | # This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live | ||
16 | # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the | ||
17 | # box) and explicitly add just 1100MB. | ||
18 | # strace-ptest in particular needs more than 500MB | ||
19 | IMAGE_OVERHEAD_FACTOR = "1.0" | ||
20 | IMAGE_ROOTFS_EXTRA_SPACE = "1124288" | ||
21 | |||
22 | # ptests need more memory than standard to avoid the OOM killer | ||
23 | # also lttng-tools needs /tmp that has at least 1G | ||
24 | QB_MEM = "-m 2048" | ||
25 | |||
26 | # Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places | ||
27 | PTEST_EXPECT_FAILURE = "1" | ||
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index b52de0def0..afab473b52 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb | |||
@@ -10,3 +10,6 @@ IMAGE_FEATURES += "dev-pkgs tools-sdk \ | |||
10 | 10 | ||
11 | IMAGE_INSTALL += "kernel-devsrc" | 11 | IMAGE_INSTALL += "kernel-devsrc" |
12 | 12 | ||
13 | # Compiling stuff, specifically SystemTap probes, can require lots of memory | ||
14 | # See https://bugzilla.yoctoproject.org/show_bug.cgi?id=14673 | ||
15 | QB_MEM = "-m 768" | ||
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index e50b24a476..9200ae5440 100644 --- a/meta/recipes-sato/images/core-image-sato.bb +++ b/meta/recipes-sato/images/core-image-sato.bb | |||
@@ -1,3 +1,4 @@ | |||
1 | SUMMARY = "Image with Sato, a mobile environment and visual style for mobile devices." | ||
1 | DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ | 2 | DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ |
2 | mobile devices. The image supports X11 with a Sato theme, Pimlico \ | 3 | mobile devices. The image supports X11 with a Sato theme, Pimlico \ |
3 | applications, and contains terminal, editor, and file manager." | 4 | applications, and contains terminal, editor, and file manager." |
@@ -9,8 +10,9 @@ LICENSE = "MIT" | |||
9 | 10 | ||
10 | inherit core-image | 11 | inherit core-image |
11 | 12 | ||
12 | TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0" | 13 | TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-glib-2.0" |
13 | TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" | 14 | TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" |
14 | 15 | ||
15 | QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' | 16 | QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' |
16 | QB_MEM_qemumips = "-m 256" | 17 | QB_MEM:qemuarmv5 = "-m 256" |
18 | QB_MEM:qemumips = "-m 256" | ||
diff --git a/meta/recipes-sato/l3afpad/l3afpad_git.bb b/meta/recipes-sato/l3afpad/l3afpad_git.bb index 85c2c500ea..5540083928 100644 --- a/meta/recipes-sato/l3afpad/l3afpad_git.bb +++ b/meta/recipes-sato/l3afpad/l3afpad_git.bb | |||
@@ -5,18 +5,18 @@ are implemented in the editor. L3afpad is simple to use, is easily compiled, \ | |||
5 | requires few libraries, and starts up quickly." | 5 | requires few libraries, and starts up quickly." |
6 | HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad" | 6 | HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad" |
7 | 7 | ||
8 | # Note that COPYING seems to mistakenly contain LGPLv2.1. | 8 | # Note that COPYING seems to mistakenly contain LGPL-2.1. |
9 | # The source code is marked GPLv2+ and COPYING used to contain | 9 | # The source code is marked GPL-2.0-or-later and COPYING used to contain |
10 | # that as well. | 10 | # that as well. |
11 | LICENSE = "GPLv2+" | 11 | LICENSE = "GPL-2.0-or-later" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ |
13 | file://src/l3afpad.h;endline=20;md5=8848fd645cd45115d8cb47ca5c42a50e \ | 13 | file://src/l3afpad.h;endline=20;md5=8848fd645cd45115d8cb47ca5c42a50e \ |
14 | file://src/utils.c;endline=20;md5=ae4792f69d3bb7b7ba91d582ba9b1a05" | 14 | file://src/utils.c;endline=20;md5=ae4792f69d3bb7b7ba91d582ba9b1a05" |
15 | 15 | ||
16 | DEPENDS = "gtk+3 intltool-native gettext-native" | 16 | DEPENDS = "gtk+3 intltool-native gettext-native" |
17 | 17 | ||
18 | PV = "0.8.18.1.11+git${SRCPV}" | 18 | PV = "0.8.18.1.11+git" |
19 | SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git" | 19 | SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master;protocol=https" |
20 | SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff" | 20 | SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
@@ -26,4 +26,4 @@ inherit autotools pkgconfig features_check mime-xdg | |||
26 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 26 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
27 | 27 | ||
28 | EXTRA_OECONF = "--disable-emacs --disable-print" | 28 | EXTRA_OECONF = "--disable-emacs --disable-print" |
29 | FILES_${PN} += "${datadir}/icons" | 29 | FILES:${PN} += "${datadir}/icons" |
diff --git a/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch b/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch new file mode 100644 index 0000000000..d3a458f100 --- /dev/null +++ b/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 989ae1f3651686c1f1046fe1c1596d564c3f452d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 13 Dec 2021 14:33:01 +0100 | ||
4 | Subject: [PATCH] CMakeLists.txt: do not run cross-binary | ||
5 | |||
6 | Upstream-Status: Inappropriate [issue reported at https://github.com/yusiwen/libptytty/issues/2] | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | CMakeLists.txt | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
13 | index c1ad6c0..3bd4d97 100644 | ||
14 | --- a/CMakeLists.txt | ||
15 | +++ b/CMakeLists.txt | ||
16 | @@ -271,7 +271,7 @@ if(NOT HAVE_UNIX_FDPASS) | ||
17 | message(FATAL_ERROR "libptytty requires unix-compliant filehandle passing ability") | ||
18 | endif() | ||
19 | |||
20 | -check_c_source_runs( | ||
21 | +check_c_source_compiles( | ||
22 | " | ||
23 | #include <grp.h> | ||
24 | #include <sys/stat.h> | ||
diff --git a/meta/recipes-sato/libptytty/libptytty_2.0.bb b/meta/recipes-sato/libptytty/libptytty_2.0.bb new file mode 100644 index 0000000000..1199f0f44b --- /dev/null +++ b/meta/recipes-sato/libptytty/libptytty_2.0.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | SUMMARY = " OS independent and secure pty/tty and utmp/wtmp/lastlog handling" | ||
2 | HOMEPAGE = "http://software.schmorp.de/pkg/libptytty.html" | ||
3 | LICENSE = "GPL-2.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
5 | |||
6 | SRC_URI = "http://dist.schmorp.de/libptytty/libptytty-${PV}.tar.gz \ | ||
7 | file://0001-CMakeLists.txt-do-not-run-cross-binary.patch \ | ||
8 | " | ||
9 | SRC_URI[sha256sum] = "8033ed3aadf28759660d4f11f2d7b030acf2a6890cb0f7926fb0cfa6739d31f7" | ||
10 | |||
11 | inherit cmake | ||
12 | |||
13 | EXTRA_OECMAKE:append:libc-musl = " -DWTMP_SUPPORT=OFF" | ||
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 547e851c15..caa34966cc 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 | |||
@@ -2,18 +2,18 @@ SUMMARY = "Matchbox GTK+ theme configuration application" | |||
2 | HOMEPAGE = "http://matchbox-project.org" | 2 | HOMEPAGE = "http://matchbox-project.org" |
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | 3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" |
4 | 4 | ||
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPL-2.0-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
7 | file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" | 7 | file://appearance/mb-appearance.c;endline=25;md5=f49d7ae8b8634a94315410cd2e055bdf" |
8 | 8 | ||
9 | DEPENDS = "gconf gtk+3" | 9 | DEPENDS = "gconf gtk+3" |
10 | RDEPENDS_${PN} = "settings-daemon" | 10 | RDEPENDS:${PN} = "settings-daemon" |
11 | 11 | ||
12 | # SRCREV tagged 0.2 | 12 | SRCREV = "7182e603357250952aa24d90f6d89345f93da7ce" |
13 | SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" | 13 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \ |
14 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | ||
15 | file://no-handed.patch" | 14 | file://no-handed.patch" |
16 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
16 | PV = "0.2+git" | ||
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb index d775b5c651..ab178f97e6 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb | |||
@@ -3,17 +3,16 @@ DESCRIPTION = "A lightweight windows manager for embedded systems. It uses the d | |||
3 | HOMEPAGE = "http://matchbox-project.org/" | 3 | HOMEPAGE = "http://matchbox-project.org/" |
4 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | 4 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" |
5 | 5 | ||
6 | LICENSE = "GPLv2+ & LGPLv2+" | 6 | LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
8 | file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \ | 8 | file://src/desktop.c;endline=20;md5=2e488557570c7dee53bfd0567e4273a9 \ |
9 | file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00" | 9 | file://src/main.c;endline=19;md5=5d2234b35efa927ab3ae36ebac52ba59" |
10 | 10 | ||
11 | DEPENDS = "gtk+3 startup-notification dbus" | 11 | DEPENDS = "gtk+3 startup-notification dbus" |
12 | SECTION = "x11/wm" | 12 | SECTION = "x11/wm" |
13 | 13 | ||
14 | # SRCREV tagged 2.2 | 14 | SRCREV = "0fd6a0c3f3b7bbf4f4b46190d71f7aef35d6bbfd" |
15 | SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" | 15 | SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master;protocol=https \ |
16 | SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ | ||
17 | file://vfolders/ \ | 16 | file://vfolders/ \ |
18 | " | 17 | " |
19 | 18 | ||
@@ -26,9 +25,9 @@ inherit autotools pkgconfig features_check | |||
26 | # The startup-notification requires x11 in DISTRO_FEATURES | 25 | # The startup-notification requires x11 in DISTRO_FEATURES |
27 | REQUIRED_DISTRO_FEATURES = "x11" | 26 | REQUIRED_DISTRO_FEATURES = "x11" |
28 | 27 | ||
29 | do_install_append() { | 28 | do_install:append() { |
30 | install -d ${D}${datadir}/matchbox/vfolders/ | 29 | install -d ${D}${datadir}/matchbox/vfolders/ |
31 | install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ | 30 | install -m 0644 ${UNPACKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ |
32 | } | 31 | } |
33 | 32 | ||
34 | FILES_${PN} += "${datadir}/matchbox/vfolders/" | 33 | 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 49e37bd77c..a1f7862efa 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 | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://matchbox-project.org" | |||
4 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | 4 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" |
5 | SECTION = "x11" | 5 | SECTION = "x11" |
6 | 6 | ||
7 | LICENSE = "LGPLv2.1" | 7 | LICENSE = "LGPL-2.1-only" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ |
9 | file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \ | 9 | file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \ |
10 | file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7" | 10 | file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7" |
@@ -13,7 +13,7 @@ DEPENDS = "libfakekey expat libxft" | |||
13 | 13 | ||
14 | #SRCREV for 0.1.1 | 14 | #SRCREV for 0.1.1 |
15 | SRCREV = "630d89068dc0a1e9199306d405cb32f892dfa4d3" | 15 | SRCREV = "630d89068dc0a1e9199306d405cb32f892dfa4d3" |
16 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ | 16 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1;protocol=https \ |
17 | file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ | 17 | file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ |
18 | file://80matchboxkeyboard.sh" | 18 | file://80matchboxkeyboard.sh" |
19 | 19 | ||
@@ -33,21 +33,21 @@ PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3" | |||
33 | 33 | ||
34 | PACKAGES += "${PN}-im ${PN}-applet" | 34 | PACKAGES += "${PN}-im ${PN}-applet" |
35 | 35 | ||
36 | FILES_${PN} = "${bindir}/ \ | 36 | FILES:${PN} = "${bindir}/ \ |
37 | ${sysconfdir} \ | 37 | ${sysconfdir} \ |
38 | ${datadir}/applications \ | 38 | ${datadir}/applications \ |
39 | ${datadir}/pixmaps \ | 39 | ${datadir}/pixmaps \ |
40 | ${datadir}/matchbox-keyboard" | 40 | ${datadir}/matchbox-keyboard" |
41 | 41 | ||
42 | FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ | 42 | FILES:${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ |
43 | ${libdir}/gtk-3.0/*/immodules/*.so" | 43 | ${libdir}/gtk-3.0/*/immodules/*.so" |
44 | 44 | ||
45 | FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" | 45 | FILES:${PN}-applet = "${libdir}/matchbox-panel/*.so" |
46 | 46 | ||
47 | 47 | ||
48 | do_install_append () { | 48 | do_install:append () { |
49 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ | 49 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ |
50 | install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 50 | install -m 755 ${UNPACKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
51 | 51 | ||
52 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la | 52 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la |
53 | rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la | 53 | rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la |
@@ -56,5 +56,5 @@ do_install_append () { | |||
56 | 56 | ||
57 | GTKIMMODULES_PACKAGES = "${PN}-im" | 57 | GTKIMMODULES_PACKAGES = "${PN}-im" |
58 | 58 | ||
59 | RDEPENDS_${PN} = "formfactor dbus-wait" | 59 | RDEPENDS:${PN} = "formfactor dbus-wait" |
60 | RRECOMMENDS_${PN} = "${PN}-applet" | 60 | 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.12.bb index c659964a2b..83425f60fe 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.12.bb | |||
@@ -4,39 +4,36 @@ launchers and small 'applet' style applications" | |||
4 | HOMEPAGE = "http://matchbox-project.org" | 4 | HOMEPAGE = "http://matchbox-project.org" |
5 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | 5 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" |
6 | 6 | ||
7 | LICENSE = "GPLv2+" | 7 | LICENSE = "GPL-2.0-or-later" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
9 | file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \ | 9 | file://matchbox-panel/mb-panel.h;endline=10;md5=f007add2f09d6a1920ee5a28645e9ce1 \ |
10 | file://applets/startup/startup.c;endline=22;md5=7cbcea60b667f609495222faf3e07917" | 10 | file://applets/startup/startup.c;endline=22;md5=9ee7a4192e53cc00041ef445d4ff6909" |
11 | 11 | ||
12 | DEPENDS = "gtk+3 startup-notification dbus dbus-glib dbus-glib-native" | 12 | DEPENDS = "gtk+3 startup-notification dbus dbus-glib dbus-glib-native" |
13 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" | 13 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" |
14 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" | ||
15 | 14 | ||
16 | # The startup-notification requires x11 in DISTRO_FEATURES | 15 | # The startup-notification requires x11 in DISTRO_FEATURES |
17 | REQUIRED_DISTRO_FEATURES = "x11" | 16 | REQUIRED_DISTRO_FEATURES = "x11" |
18 | 17 | ||
19 | # SRCREV tagged 2.11 plus some autotools fixes | 18 | SRCREV = "39fdbc40888c1c75cd7bfd9fd341e6ad58487fce" |
20 | SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" | ||
21 | 19 | ||
22 | RPROVIDES_${PN} = "matchbox-panel" | 20 | RPROVIDES:${PN} = "matchbox-panel" |
23 | RREPLACES_${PN} = "matchbox-panel" | 21 | RREPLACES:${PN} = "matchbox-panel" |
24 | RCONFLICTS_${PN} = "matchbox-panel" | 22 | RCONFLICTS:${PN} = "matchbox-panel" |
25 | 23 | ||
26 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | 24 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \ |
27 | file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ | 25 | file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ |
28 | " | 26 | " |
29 | 27 | ||
30 | EXTRA_OECONF = "--enable-startup-notification --enable-dbus" | 28 | EXTRA_OECONF = "--enable-startup-notification --enable-dbus" |
31 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" | 29 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" |
32 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" | ||
33 | 30 | ||
34 | S = "${WORKDIR}/git" | 31 | S = "${WORKDIR}/git" |
35 | 32 | ||
36 | FILES_${PN} += "${libdir}/matchbox-panel/*.so \ | 33 | FILES:${PN} += "${libdir}/matchbox-panel/*.so \ |
37 | ${datadir}/matchbox-panel/brightness/*.png \ | 34 | ${datadir}/matchbox-panel/brightness/*.png \ |
38 | ${datadir}/matchbox-panel/startup/*.png \ | 35 | ${datadir}/matchbox-panel/startup/*.png \ |
39 | ${datadir}/icons/" | 36 | ${datadir}/icons/" |
40 | FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" | 37 | FILES:${PN}-dev += "${libdir}/matchbox-panel/*.la" |
41 | 38 | ||
42 | inherit autotools pkgconfig features_check gettext | 39 | inherit autotools pkgconfig features_check gettext |
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index 3a70574af9..61fea51054 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | |||
@@ -22,7 +22,6 @@ matchbox-desktop & | |||
22 | START_APPLETS=showdesktop,windowselector | 22 | START_APPLETS=showdesktop,windowselector |
23 | END_APPLETS=$KEYBOARD_APPLET,systray,startup-notify,notify | 23 | END_APPLETS=$KEYBOARD_APPLET,systray,startup-notify,notify |
24 | END_APPLETS=battery,$END_APPLETS # feature-acpi | 24 | END_APPLETS=battery,$END_APPLETS # feature-acpi |
25 | END_APPLETS=battery,$END_APPLETS # feature-apm | ||
26 | END_APPLETS=clock,$END_APPLETS | 25 | END_APPLETS=clock,$END_APPLETS |
27 | END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone | 26 | END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone |
28 | 27 | ||
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 966c5b5b92..90734b6bd0 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 | |||
@@ -2,12 +2,11 @@ SUMMARY = "Custom Matchbox session files for the Sato environment" | |||
2 | HOMEPAGE = "http://www.matchbox-project.org/" | 2 | HOMEPAGE = "http://www.matchbox-project.org/" |
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | 3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" |
4 | 4 | ||
5 | LICENSE = "GPLv2.0+" | 5 | LICENSE = "GPL-2.0-or-later" |
6 | LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" | 6 | LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" |
7 | 7 | ||
8 | SECTION = "x11" | 8 | SECTION = "x11" |
9 | RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop matchbox-session gconf" | 9 | RDEPENDS:${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop matchbox-session gconf" |
10 | PR = "r30" | ||
11 | 10 | ||
12 | # This package is architecture specific because the session script is modified | 11 | # This package is architecture specific because the session script is modified |
13 | # based on the machine architecture. | 12 | # based on the machine architecture. |
@@ -22,11 +21,11 @@ SRC_URI = "file://session \ | |||
22 | file://index.theme" | 21 | file://index.theme" |
23 | S = "${WORKDIR}" | 22 | S = "${WORKDIR}" |
24 | 23 | ||
25 | FILES_${PN} += "${datadir}/themes/Sato/index.theme" | 24 | FILES:${PN} += "${datadir}/themes/Sato/index.theme" |
26 | 25 | ||
27 | do_install() { | 26 | do_install() { |
28 | # This is the set of machine features that the script has markers for | 27 | # This is the set of machine features that the script has markers for |
29 | FEATURES="acpi apm phone" | 28 | FEATURES="acpi phone" |
30 | SCRIPT="${S}/sedder" | 29 | SCRIPT="${S}/sedder" |
31 | rm -f $SCRIPT | 30 | rm -f $SCRIPT |
32 | touch $SCRIPT | 31 | touch $SCRIPT |
@@ -43,7 +42,7 @@ do_install() { | |||
43 | } | 42 | } |
44 | 43 | ||
45 | PACKAGE_WRITE_DEPS += "gconf-native" | 44 | PACKAGE_WRITE_DEPS += "gconf-native" |
46 | pkg_postinst_${PN} () { | 45 | pkg_postinst:${PN} () { |
47 | set_value() { | 46 | set_value() { |
48 | #type, name, value | 47 | #type, name, value |
49 | gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3" | 48 | 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 9f00281dde..f91c593f78 100644 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb | |||
@@ -2,17 +2,17 @@ SUMMARY = "Lightweight GTK+ terminal application" | |||
2 | HOMEPAGE = "http://www.matchbox-project.org/" | 2 | HOMEPAGE = "http://www.matchbox-project.org/" |
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | 3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" |
4 | 4 | ||
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPL-2.0-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
7 | file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820" | 7 | file://main.c;endline=20;md5=7d9d802a36298b5c74440a880e2f4817" |
8 | 8 | ||
9 | DEPENDS = "gtk+3 vte" | 9 | DEPENDS = "gtk+3 vte" |
10 | SECTION = "x11/utils" | 10 | SECTION = "x11/utils" |
11 | 11 | ||
12 | #SRCREV tagged 0.2 | 12 | SRCREV = "99e6eb7db1b5fef110973d96194eec992a2515a2" |
13 | SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5" | 13 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https" |
14 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 14 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
15 | PV = "0.2+git" | ||
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
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 ce683e9630..bd680111d9 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc | |||
@@ -10,7 +10,7 @@ SECTION = "x11/wm" | |||
10 | 10 | ||
11 | inherit autotools pkgconfig features_check | 11 | inherit autotools pkgconfig features_check |
12 | 12 | ||
13 | FILES_${PN} += "${datadir}/themes" | 13 | FILES:${PN} += "${datadir}/themes" |
14 | 14 | ||
15 | # The matchbox-wm requires x11 in DISTRO_FEATURES | 15 | # The matchbox-wm requires x11 in DISTRO_FEATURES |
16 | REQUIRED_DISTRO_FEATURES = "x11" | 16 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb index 7a043d3447..c60a11c3c0 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb | |||
@@ -2,7 +2,7 @@ require matchbox-theme-sato.inc | |||
2 | 2 | ||
3 | # SRCREV tagged 0.2 | 3 | # SRCREV tagged 0.2 |
4 | SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78" | 4 | SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78" |
5 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato" | 5 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master;protocol=https" |
6 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 6 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
7 | 7 | ||
8 | S = "${WORKDIR}/git" | 8 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 25725e078d..3f735e072b 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | |||
@@ -5,7 +5,6 @@ | |||
5 | SUMMARY = "Sato desktop" | 5 | SUMMARY = "Sato desktop" |
6 | DESCRIPTION = "Packagegroups provide a convenient mechanism of bundling a collection of packages." | 6 | DESCRIPTION = "Packagegroups provide a convenient mechanism of bundling a collection of packages." |
7 | HOMEPAGE = "https://www.yoctoproject.org/" | 7 | HOMEPAGE = "https://www.yoctoproject.org/" |
8 | PR = "r33" | ||
9 | 8 | ||
10 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 9 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
11 | 10 | ||
@@ -14,7 +13,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
14 | 13 | ||
15 | PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" | 14 | PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" |
16 | 15 | ||
17 | RDEPENDS_${PN} = "\ | 16 | RDEPENDS:${PN} = "\ |
18 | ${PN}-base \ | 17 | ${PN}-base \ |
19 | ${PN}-apps \ | 18 | ${PN}-apps \ |
20 | ${PN}-games \ | 19 | ${PN}-games \ |
@@ -22,8 +21,8 @@ RDEPENDS_${PN} = "\ | |||
22 | 21 | ||
23 | NETWORK_MANAGER ?= "connman-gnome" | 22 | NETWORK_MANAGER ?= "connman-gnome" |
24 | 23 | ||
25 | SUMMARY_${PN}-base = "Sato desktop - base packages" | 24 | SUMMARY:${PN}-base = "Sato desktop - base packages" |
26 | RDEPENDS_${PN}-base = "\ | 25 | RDEPENDS:${PN}-base = "\ |
27 | matchbox-desktop \ | 26 | matchbox-desktop \ |
28 | matchbox-session-sato \ | 27 | matchbox-session-sato \ |
29 | matchbox-keyboard \ | 28 | matchbox-keyboard \ |
@@ -31,7 +30,7 @@ RDEPENDS_${PN}-base = "\ | |||
31 | matchbox-keyboard-im \ | 30 | matchbox-keyboard-im \ |
32 | matchbox-config-gtk \ | 31 | matchbox-config-gtk \ |
33 | xcursor-transparent-theme \ | 32 | xcursor-transparent-theme \ |
34 | adwaita-icon-theme \ | 33 | sato-icon-theme \ |
35 | settings-daemon \ | 34 | settings-daemon \ |
36 | shutdown-desktop \ | 35 | shutdown-desktop \ |
37 | ${NETWORK_MANAGER} \ | 36 | ${NETWORK_MANAGER} \ |
@@ -45,10 +44,10 @@ WEB ?= "" | |||
45 | #WEB = "epiphany" | 44 | #WEB = "epiphany" |
46 | 45 | ||
47 | GSTEXAMPLES ?= "gst-examples" | 46 | GSTEXAMPLES ?= "gst-examples" |
48 | GSTEXAMPLES_riscv64 = "" | 47 | GSTEXAMPLES:riscv64 = "" |
49 | 48 | ||
50 | SUMMARY_${PN}-apps = "Sato desktop - applications" | 49 | SUMMARY:${PN}-apps = "Sato desktop - applications" |
51 | RDEPENDS_${PN}-apps = "\ | 50 | RDEPENDS:${PN}-apps = "\ |
52 | l3afpad \ | 51 | l3afpad \ |
53 | matchbox-terminal \ | 52 | matchbox-terminal \ |
54 | sato-screenshot \ | 53 | sato-screenshot \ |
@@ -57,7 +56,7 @@ RDEPENDS_${PN}-apps = "\ | |||
57 | ${WEB} \ | 56 | ${WEB} \ |
58 | " | 57 | " |
59 | 58 | ||
60 | SUMMARY_${PN}-games = "Sato desktop - games" | 59 | SUMMARY:${PN}-games = "Sato desktop - games" |
61 | RDEPENDS_${PN}-games = "\ | 60 | RDEPENDS:${PN}-games = "\ |
62 | puzzles \ | 61 | puzzles \ |
63 | " | 62 | " |
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb index d3a9b84227..22c9fa59dc 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Fast lightweight tabbed filemanager" | |||
2 | DESCRIPTION = "A free file manager application and the standard file manager of LXDE." | 2 | DESCRIPTION = "A free file manager application and the standard file manager of LXDE." |
3 | HOMEPAGE = "http://pcmanfm.sourceforge.net/" | 3 | HOMEPAGE = "http://pcmanfm.sourceforge.net/" |
4 | 4 | ||
5 | LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+" | 5 | LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ |
7 | file://src/pcmanfm.h;endline=22;md5=417b3855771a3a87f8ad753d994491f0 \ | 7 | file://src/pcmanfm.h;endline=22;md5=417b3855771a3a87f8ad753d994491f0 \ |
8 | file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" | 8 | file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" |
@@ -28,13 +28,13 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
28 | 28 | ||
29 | EXTRA_OECONF = "--with-gtk=3" | 29 | EXTRA_OECONF = "--with-gtk=3" |
30 | 30 | ||
31 | do_install_append () { | 31 | do_install:append () { |
32 | install -d ${D}/${datadir} | 32 | install -d ${D}/${datadir} |
33 | install -d ${D}/${datadir}/pixmaps/ | 33 | install -d ${D}/${datadir}/pixmaps/ |
34 | 34 | ||
35 | install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps | 35 | install -m 0644 ${UNPACKDIR}/*.png ${D}/${datadir}/pixmaps |
36 | } | 36 | } |
37 | 37 | ||
38 | FILES_${PN} += "${libdir}/pcmanfm" | 38 | FILES:${PN} += "${libdir}/pcmanfm" |
39 | 39 | ||
40 | RRECOMMENDS_${PN} += "adwaita-icon-theme" | 40 | 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() { | |||
13 | install -m 0644 ${S}/50-sato.conf ${D}${sysconfdir}/pulse/client.conf.d/50-sato.conf | 13 | install -m 0644 ${S}/50-sato.conf ${D}${sysconfdir}/pulse/client.conf.d/50-sato.conf |
14 | } | 14 | } |
15 | 15 | ||
16 | FILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" | 16 | FILES:${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" |
17 | CONFFILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" | 17 | 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 @@ | |||
1 | From 337799e40350b3db2441cc98f65ec36a74dfb356 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 21 Apr 2017 12:18:08 -0700 | ||
4 | Subject: [PATCH] Use -Wno-error=format-overflow= if the compiler supports it | ||
5 | |||
6 | we need this warning to be suppressed with gcc7+ | ||
7 | however older compilers dont support it so we need | ||
8 | a way to disble it only if compiler supports it | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 3a38c95..bb9035e 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -42,7 +42,7 @@ fi | ||
22 | if test "x$GCC" = "xyes"; then | ||
23 | AC_MSG_CHECKING([for usable gcc warning flags]) | ||
24 | gccwarningflags= | ||
25 | - for flag in -Wall -Werror -std=c89 -pedantic; do | ||
26 | + for flag in -Wall -Werror -std=c89 -pedantic -Wno-error=format-overflow=; do | ||
27 | ac_save_CFLAGS="$CFLAGS" | ||
28 | ac_save_LIBS="$LIBS" | ||
29 | CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS" | ||
30 | -- | ||
31 | 2.12.2 | ||
32 | |||
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 deleted file mode 100644 index 66af6afa2f..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-malloc-Check-for-excessive-values-to-malloc.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 1c01a5bc9ac7f8aaa484b1a8e0e74aa5f8899d0e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 8 Nov 2020 11:17:59 -0800 | ||
4 | Subject: [PATCH] malloc: Check for excessive values to malloc | ||
5 | |||
6 | with whole program optimizers like lto smalloc() | ||
7 | is inlined the excessive constant argument is propagated to | ||
8 | malloc() and ultimately triggers the warning. | ||
9 | |||
10 | malloc.c:15:9: error: argument 1 range [18446744065119617024, 18446744073709551580] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=] | ||
11 | |||
12 | therefore add a check before excessive constant argument before calling | ||
13 | malloc | ||
14 | |||
15 | Note that this will not happen with normal compile since they happen to | ||
16 | be in different translation units and compiler can not semantically | ||
17 | analyze as much | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | --- | ||
23 | malloc.c | 3 +++ | ||
24 | 1 file changed, 3 insertions(+) | ||
25 | |||
26 | diff --git a/malloc.c b/malloc.c | ||
27 | index a7fa7c5..520377c 100644 | ||
28 | --- a/malloc.c | ||
29 | +++ b/malloc.c | ||
30 | @@ -2,6 +2,7 @@ | ||
31 | * malloc.c: safe wrappers around malloc, realloc, free, strdup | ||
32 | */ | ||
33 | |||
34 | +#include <stdint.h> | ||
35 | #include <stdlib.h> | ||
36 | #include <string.h> | ||
37 | #include "puzzles.h" | ||
38 | @@ -12,6 +13,8 @@ | ||
39 | */ | ||
40 | void *smalloc(size_t size) { | ||
41 | void *p; | ||
42 | + if (size > PTRDIFF_MAX) | ||
43 | + fatal("exceeds maximum object size"); | ||
44 | p = malloc(size); | ||
45 | if (!p) | ||
46 | fatal("out of memory"); | ||
47 | -- | ||
48 | 2.29.2 | ||
49 | |||
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 deleted file mode 100644 index a02d8732ab..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 3d78d4cffcdc1242892b6c21c26d1c96938c48d1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 27 Feb 2021 10:02:43 -0800 | ||
4 | Subject: [PATCH] map: Fix stringop-overflow warning | ||
5 | |||
6 | Fixes | ||
7 | |||
8 | ../git/map.c: In function 'new_game_desc': | ||
9 | ../git/map.c:1663:23: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] | ||
10 | 1663 | ret[retlen++] = ','; | ||
11 | | ~~~~~~~~~~~~~~^~~~~ | ||
12 | ../git/./map.c: In function 'new_game_desc': | ||
13 | ../git/./map.c:1663:23: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] | ||
14 | 1663 | ret[retlen++] = ','; | ||
15 | | ~~~~~~~~~~~~~~^~~~~ | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | map.c | 6 ++++-- | ||
21 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/map.c b/map.c | ||
24 | index 412305c..fa0c493 100644 | ||
25 | --- a/map.c | ||
26 | +++ b/map.c | ||
27 | @@ -1659,8 +1659,10 @@ static char *new_game_desc(const game_params *params, random_state *rs, | ||
28 | } | ||
29 | } | ||
30 | |||
31 | - ret[retlen++] = 'a'-1 + run; | ||
32 | - ret[retlen++] = ','; | ||
33 | + if(ret != NULL) { | ||
34 | + ret[retlen++] = 'a'-1 + run; | ||
35 | + ret[retlen++] = ','; | ||
36 | + } | ||
37 | |||
38 | run = 0; | ||
39 | for (i = 0; i < n; i++) { | ||
40 | -- | ||
41 | 2.30.1 | ||
42 | |||
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 deleted file mode 100644 index 143e898a51..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From 453587d714473b806473b309727f865b673cbc06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 13 Jan 2016 23:10:19 -0800 | ||
4 | Subject: [PATCH] palisade: Fix warnings with clang on arm | ||
5 | |||
6 | ARM treats 'char' as unsigned char when 'char' is not qualified with | ||
7 | 'signed' or 'unsigned' explicitly. | ||
8 | |||
9 | This results in warnings e.g. | ||
10 | |||
11 | palisade.c:531:22: error: comparison of constant -1 with expression of | ||
12 | type 'clue' (aka 'char') is always false | ||
13 | [-Werror,-Wtautological-constant-out-of-range-compare] | ||
14 | if (clues[i] == EMPTY) continue; | ||
15 | |||
16 | Therefore, typcast the contant to char in such places to be explicit | ||
17 | |||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | Upstream-Status: Submitted | ||
20 | --- | ||
21 | palisade.c | 10 +++++----- | ||
22 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
23 | |||
24 | diff --git a/palisade.c b/palisade.c | ||
25 | index 6ffbf2d..8b54d42 100644 | ||
26 | --- a/palisade.c | ||
27 | +++ b/palisade.c | ||
28 | @@ -304,11 +304,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx) | ||
29 | * If p = q = 3 then the region has size exactly 2. */ | ||
30 | |||
31 | for (i = 0; i < wh; ++i) { | ||
32 | - if (ctx->clues[i] == EMPTY) continue; | ||
33 | + if (ctx->clues[i] == (char)EMPTY) continue; | ||
34 | for (dir = 0; dir < 4; ++dir) { | ||
35 | int j = i + dx[dir] + w*dy[dir]; | ||
36 | if (disconnected(ctx, i, j, dir)) continue; | ||
37 | - if (ctx->clues[j] == EMPTY) continue; | ||
38 | + if (ctx->clues[j] == (char)EMPTY) continue; | ||
39 | if ((8 - ctx->clues[i] - ctx->clues[j] > ctx->params->k) || | ||
40 | (ctx->clues[i] == 3 && ctx->clues[j] == 3 && | ||
41 | ctx->params->k != 2)) | ||
42 | @@ -326,7 +326,7 @@ static bool solver_number_exhausted(solver_ctx *ctx) | ||
43 | bool changed = false; | ||
44 | |||
45 | for (i = 0; i < wh; ++i) { | ||
46 | - if (ctx->clues[i] == EMPTY) continue; | ||
47 | + if (ctx->clues[i] == (char)EMPTY) continue; | ||
48 | |||
49 | if (bitcount[(ctx->borders[i] & BORDER_MASK)] == ctx->clues[i]) { | ||
50 | for (dir = 0; dir < 4; ++dir) { | ||
51 | @@ -538,7 +538,7 @@ static bool is_solved(const game_params *params, clue *clues, | ||
52 | for (i = 0; i < wh; ++i) { | ||
53 | if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, true); | ||
54 | if (dsf_size(dsf, i) != k) goto error; | ||
55 | - if (clues[i] == EMPTY) continue; | ||
56 | + if (clues[i] == (char)EMPTY) continue; | ||
57 | if (clues[i] != bitcount[border[i] & BORDER_MASK]) goto error; | ||
58 | } | ||
59 | |||
60 | @@ -685,7 +685,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, | ||
61 | p = numbers; | ||
62 | r = 0; | ||
63 | for (i = 0; i < wh; ++i) { | ||
64 | - if (numbers[i] != EMPTY) { | ||
65 | + if (numbers[i] != (char)EMPTY) { | ||
66 | while (r) { | ||
67 | while (r > 26) { | ||
68 | *p++ = 'z'; | ||
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 deleted file mode 100644 index 7ca582fe5d..0000000000 --- a/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 3af5a1e579e3324a13ba1f892c7befb3ab32d899 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 7 Mar 2019 21:56:57 -0800 | ||
4 | Subject: [PATCH] pattern.c: Change string lenght parameter to be size_t in | ||
5 | do_row() | ||
6 | |||
7 | This fixes below error on some architectures e.g. RISC-V | ||
8 | |||
9 | pattern.c:455:9: error: 'memset' specified size between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=] 455 | memset(deduced, DOT, (size_t)len); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | --- | ||
16 | pattern.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/pattern.c b/pattern.c | ||
20 | index ffadd3f..4e5f187 100644 | ||
21 | --- a/pattern.c | ||
22 | +++ b/pattern.c | ||
23 | @@ -428,7 +428,7 @@ static bool do_row(unsigned char *known, unsigned char *deduced, | ||
24 | unsigned char *row, | ||
25 | unsigned char *minpos_done, unsigned char *maxpos_done, | ||
26 | unsigned char *minpos_ok, unsigned char *maxpos_ok, | ||
27 | - unsigned char *start, int len, int step, int *data, | ||
28 | + unsigned char *start, size_t len, int step, int *data, | ||
29 | unsigned int *changed | ||
30 | #ifdef STANDALONE_SOLVER | ||
31 | , const char *rowcol, int index, int cluewid | ||
32 | -- | ||
33 | 2.17.1 | ||
34 | |||
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 deleted file mode 100644 index 28040523d4..0000000000 --- a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 876c6ff1e20f51b0921acda99861f476b6423f26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Mon, 11 Aug 2014 12:39:53 +0800 | ||
4 | Subject: [PATCH] gtk.c: fix compiling failure with option -g -O | ||
5 | |||
6 | There were compiling failure with option -g -O | ||
7 | ... | ||
8 | ././gtk.c: In function 'configure_area': | ||
9 | ././gtk.c:397:2: error: 'cr' may be used uninitialized in this function [-Werror=maybe-uninitialized] | ||
10 | cairo_set_source_rgb(cr, | ||
11 | ^ | ||
12 | ././gtk.c:384:14: note: 'cr' was declared here | ||
13 | cairo_t *cr; | ||
14 | ^ | ||
15 | ././gtk.c: In function 'main': | ||
16 | ././gtk.c:2911:6: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized] | ||
17 | fprintf(stderr, "%s: %s\n", pname, error); | ||
18 | ^ | ||
19 | cc1: all warnings being treated as errors | ||
20 | ... | ||
21 | |||
22 | Initialized pointer 'cr' and 'error' with NULL | ||
23 | |||
24 | Upstream-Status: Pending | ||
25 | |||
26 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
27 | |||
28 | --- | ||
29 | gtk.c | 2 +- | ||
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/gtk.c b/gtk.c | ||
33 | index 4565836..5e83b48 100644 | ||
34 | --- a/gtk.c | ||
35 | +++ b/gtk.c | ||
36 | @@ -2944,7 +2944,7 @@ static void list_presets_from_menu(struct preset_menu *menu) | ||
37 | int main(int argc, char **argv) | ||
38 | { | ||
39 | char *pname = argv[0]; | ||
40 | - char *error; | ||
41 | + char *error = NULL; | ||
42 | int ngenerate = 0, px = 1, py = 1; | ||
43 | bool print = false; | ||
44 | bool time_generation = false, test_solve = false, list_presets = false; | ||
diff --git a/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch b/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch deleted file mode 100644 index 7218d620ec..0000000000 --- a/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | puzzles: avoid compiler unitialized variable error | ||
2 | |||
3 | The compiler does not realize that we must go through the while() | ||
4 | loop at least once, so we replace it with a for() loop. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
9 | |||
10 | --- a/tree234.c | ||
11 | +++ b/tree234.c | ||
12 | @@ -326,8 +326,11 @@ static void *add234_internal(tree234 *t, | ||
13 | return orig_e; | ||
14 | } | ||
15 | |||
16 | - n = t->root; | ||
17 | - while (n) { | ||
18 | + /* | ||
19 | + * We know t->root is not NULL. The logic | ||
20 | + * to break out of this is at the end of the loop. | ||
21 | + */ | ||
22 | + for (n = t->root;;) { | ||
23 | LOG((" node %p: %p/%d \"%s\" %p/%d \"%s\" %p/%d \"%s\" %p/%d\n", | ||
24 | n, | ||
25 | n->kids[0], n->counts[0], n->elems[0], | ||
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 16a08585cc..e9403ee130 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb | |||
@@ -2,49 +2,28 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" | |||
2 | DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games." | 2 | DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games." |
3 | HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" | 3 | HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a" | 5 | LIC_FILES_CHKSUM = "file://LICENCE;md5=191542b32377bde254e9799e0a46f18b" |
6 | 6 | ||
7 | DEPENDS = "libxt" | 7 | # gtk support includes a bunch of x11 headers |
8 | |||
9 | # The libxt requires x11 in DISTRO_FEATURES | ||
10 | REQUIRED_DISTRO_FEATURES = "x11" | 8 | REQUIRED_DISTRO_FEATURES = "x11" |
11 | 9 | ||
12 | SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ | 10 | SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main;protocol=https" |
13 | file://fix-compiling-failure-with-option-g-O.patch \ | ||
14 | file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ | ||
15 | file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ | ||
16 | file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \ | ||
17 | file://fix-ki-uninitialized.patch \ | ||
18 | file://0001-malloc-Check-for-excessive-values-to-malloc.patch \ | ||
19 | file://0001-map-Fix-stringop-overflow-warning.patch \ | ||
20 | " | ||
21 | 11 | ||
22 | UPSTREAM_CHECK_COMMITS = "1" | 12 | UPSTREAM_CHECK_COMMITS = "1" |
23 | SRCREV = "84cb4c6701e027090ff3fd955ce08065e20121b2" | 13 | SRCREV = "80aac3104096aee4057b675c53ece8e60793aa90" |
24 | PE = "2" | 14 | PE = "2" |
25 | PV = "0.0+git${SRCPV}" | 15 | PV = "0.0+git" |
26 | 16 | ||
27 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
28 | 18 | ||
29 | inherit autotools features_check pkgconfig | 19 | inherit cmake features_check pkgconfig |
30 | |||
31 | PACKAGECONFIG ??= "gtk3" | ||
32 | PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+," | ||
33 | PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3," | ||
34 | |||
35 | CFLAGS_append = " -Wno-deprecated-declarations" | ||
36 | |||
37 | ASNEEDED = "" | ||
38 | 20 | ||
39 | do_configure_prepend () { | 21 | DEPENDS += "gtk+3" |
40 | cd ${S} | ||
41 | ./mkfiles.pl | ||
42 | cd ${B} | ||
43 | } | ||
44 | 22 | ||
45 | do_install_append () { | 23 | do_install:append () { |
46 | # net conflicts with Samba, so rename it | 24 | # net conflicts with Samba, so rename it |
47 | mv ${D}${bindir}/net ${D}${bindir}/puzzles-net | 25 | mv ${D}${bindir}/net ${D}${bindir}/puzzles-net |
26 | rm ${D}/${datadir}/applications/net.desktop | ||
48 | 27 | ||
49 | # Create desktop shortcuts | 28 | # Create desktop shortcuts |
50 | install -d ${D}/${datadir}/applications/ | 29 | install -d ${D}/${datadir}/applications/ |
@@ -68,16 +47,3 @@ STOP | |||
68 | done | 47 | done |
69 | } | 48 | } |
70 | 49 | ||
71 | PACKAGES += "${PN}-extra" | ||
72 | |||
73 | FILES_${PN} = "" | ||
74 | FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications" | ||
75 | |||
76 | python __anonymous () { | ||
77 | var = d.expand("FILES_${PN}") | ||
78 | data = d.getVar(var, False) | ||
79 | for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"): | ||
80 | data = data + " ${bindir}/%s" % name | ||
81 | data = data + " ${datadir}/applications/%s.desktop" % name | ||
82 | d.setVar(var, data) | ||
83 | } | ||
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index ff2c8f009d..95cc140e9e 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | |||
@@ -6,7 +6,7 @@ terminal emulator rxvt, modified to store text in Unicode \ | |||
6 | output. It also supports mixing multiple fonts at the \ | 6 | output. It also supports mixing multiple fonts at the \ |
7 | same time, including Xft fonts." | 7 | same time, including Xft fonts." |
8 | HOMEPAGE = "https://rxvt.org/" | 8 | HOMEPAGE = "https://rxvt.org/" |
9 | DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu" | 9 | DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty ncurses-native" |
10 | 10 | ||
11 | SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ | 11 | SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ |
12 | file://xwc.patch \ | 12 | file://xwc.patch \ |
@@ -16,13 +16,12 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 | |||
16 | inherit autotools pkgconfig update-alternatives | 16 | inherit autotools pkgconfig update-alternatives |
17 | 17 | ||
18 | PROVIDES = "virtual/x-terminal-emulator" | 18 | PROVIDES = "virtual/x-terminal-emulator" |
19 | ALTERNATIVE_${PN} = "x-terminal-emulator" | 19 | ALTERNATIVE:${PN} = "x-terminal-emulator" |
20 | ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" | 20 | ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" |
21 | 21 | ||
22 | CFLAGS_append = " -fpermissive" | 22 | CFLAGS:append = " -fpermissive" |
23 | 23 | ||
24 | EXTRA_OECONF = "--enable-xim \ | 24 | EXTRA_OECONF = "--enable-xim \ |
25 | --enable-utmp --enable-wtmp --enable-lastlog \ | ||
26 | --with-term=rxvt --enable-keepscrolling \ | 25 | --with-term=rxvt --enable-keepscrolling \ |
27 | --enable-xft --with-name=rxvt --enable-frills \ | 26 | --enable-xft --with-name=rxvt --enable-frills \ |
28 | --enable-swapscreen --enable-transparency \ | 27 | --enable-swapscreen --enable-transparency \ |
@@ -31,31 +30,32 @@ EXTRA_OECONF = "--enable-xim \ | |||
31 | --enable-combining --disable-perl \ | 30 | --enable-combining --disable-perl \ |
32 | --with-x=${STAGING_DIR_HOST}${prefix}" | 31 | --with-x=${STAGING_DIR_HOST}${prefix}" |
33 | 32 | ||
34 | EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" | ||
35 | |||
36 | PACKAGECONFIG ??= "" | 33 | PACKAGECONFIG ??= "" |
37 | PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," | 34 | PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," |
38 | 35 | ||
39 | do_configure_prepend () { | 36 | do_configure:prepend () { |
40 | if [ ! -e ${S}/acinclude.m4 ]; then | 37 | if [ ! -e ${S}/acinclude.m4 ]; then |
41 | cp ${S}/aclocal.m4 ${S}/acinclude.m4 | 38 | cp ${S}/aclocal.m4 ${S}/acinclude.m4 |
42 | fi | 39 | fi |
43 | } | 40 | } |
44 | 41 | ||
45 | do_compile_prepend () { | 42 | do_compile:prepend () { |
46 | echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h | 43 | echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h |
47 | echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h | 44 | echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h |
48 | echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h | 45 | echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h |
49 | echo '#define HAVE_XLOCALE 1' >> config.h | 46 | echo '#define HAVE_XLOCALE 1' >> config.h |
50 | } | 47 | } |
51 | 48 | ||
52 | do_install_append () { | 49 | do_install:append () { |
53 | install -d ${D}/${datadir} | 50 | install -d ${D}/${datadir} |
54 | install -d ${D}/${datadir}/applications | 51 | install -d ${D}/${datadir}/applications |
55 | install -d ${D}/${datadir}/pixmaps/ | 52 | install -d ${D}/${datadir}/pixmaps/ |
56 | 53 | ||
57 | install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps | 54 | install -m 0644 ${UNPACKDIR}/rxvt.png ${D}/${datadir}/pixmaps |
58 | install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications | 55 | install -m 0644 ${UNPACKDIR}/rxvt.desktop ${D}/${datadir}/applications |
56 | |||
57 | ${STAGING_BINDIR_NATIVE}/tic -x ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo || \ | ||
58 | ${STAGING_BINDIR_NATIVE}/tic ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo | ||
59 | } | 59 | } |
60 | 60 | ||
61 | FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" | 61 | FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png ${datadir}/terminfo" |
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-libev-remove-deprecated-throw-specification.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-libev-remove-deprecated-throw-specification.patch deleted file mode 100644 index f10dca09d6..0000000000 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-libev-remove-deprecated-throw-specification.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 9a8f1d73e7b7e183768a8379ef32429a84f0e5c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 26 Feb 2021 18:11:56 -0800 | ||
4 | Subject: [PATCH] libev: remove deprecated throw specification | ||
5 | |||
6 | removes the throw specifications that are deprecated since C++11: | ||
7 | warning: dynamic exception specifications are deprecated in C++11 [-Wdeprecated] | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | libev/ev++.h | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/libev/ev++.h b/libev/ev++.h | ||
16 | index 4f0a36a..85ddf44 100644 | ||
17 | --- a/libev/ev++.h | ||
18 | +++ b/libev/ev++.h | ||
19 | @@ -376,7 +376,7 @@ namespace ev { | ||
20 | |||
21 | struct default_loop : loop_ref | ||
22 | { | ||
23 | - default_loop (unsigned int flags = AUTO) throw (bad_loop) | ||
24 | + default_loop (unsigned int flags = AUTO) | ||
25 | #if EV_MULTIPLICITY | ||
26 | : loop_ref (ev_default_loop (flags)) | ||
27 | #endif | ||
28 | -- | ||
29 | 2.30.1 | ||
30 | |||
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop index 882ea41136..1ac3d99510 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop | |||
@@ -1,9 +1,9 @@ | |||
1 | [Desktop Entry] | 1 | [Desktop Entry] |
2 | Version=1.0 | 2 | Version=1.0 |
3 | Name=Terminal | 3 | Name=Rxvt Terminal |
4 | Comment=A unicode capable rxvt clone | 4 | Comment=A unicode capable rxvt clone |
5 | Exec=rxvt | 5 | Exec=rxvt |
6 | Icon=terminal | 6 | Icon=utilities-terminal |
7 | Terminal=false | 7 | Terminal=false |
8 | Type=Application | 8 | Type=Application |
9 | Categories=Utility;TerminalEmulator; | 9 | Categories=Utility;TerminalEmulator; |
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.31.bb index 283e8d7751..c127b9bbe3 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.31.bb | |||
@@ -1,10 +1,8 @@ | |||
1 | require rxvt-unicode.inc | 1 | require rxvt-unicode.inc |
2 | 2 | ||
3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPL-3.0-only" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ |
5 | file://src/main.C;beginline=1;endline=31;md5=d3600d7ee1062667fcd1193fbe6485f6" | 5 | file://src/main.C;beginline=1;endline=31;md5=d3600d7ee1062667fcd1193fbe6485f6" |
6 | 6 | ||
7 | SRC_URI += "file://0001-libev-remove-deprecated-throw-specification.patch" | 7 | SRC_URI[sha256sum] = "aaa13fcbc149fe0f3f391f933279580f74a96fd312d6ed06b8ff03c2d46672e8" |
8 | |||
9 | SRC_URI[sha256sum] = "e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd" | ||
10 | 8 | ||
diff --git a/meta/recipes-sato/sato-icon-theme/icon-naming-utils_0.8.90.bb b/meta/recipes-sato/sato-icon-theme/icon-naming-utils_0.8.90.bb new file mode 100644 index 0000000000..5502b66905 --- /dev/null +++ b/meta/recipes-sato/sato-icon-theme/icon-naming-utils_0.8.90.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | HOMEPAGE = "http://tango.freedesktop.org/" | ||
2 | SUMMARY = "Enables backwards compatibility with current desktop icon themes" | ||
3 | DESCRIPTION = "A Perl script used for maintaining backwards \ | ||
4 | compatibility with current desktop icon themes, while migrating to the \ | ||
5 | names specified in the Icon Naming Specification. The Icon Naming \ | ||
6 | Utilities map the icon names used by the GNOME and KDE desktops to the \ | ||
7 | icon names proposed in the Icon Naming Specification, and generate the \ | ||
8 | icon files appropriate to the desktop environment you use. The Icon \ | ||
9 | Naming Specification provides a standard list of common icon contexts \ | ||
10 | and names that can be used to make icon themes work in a desktop \ | ||
11 | environment or application that implements the naming specification. " | ||
12 | LICENSE = "GPL-2.0-only" | ||
13 | DEPENDS = "libxml-simple-perl-native" | ||
14 | |||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
16 | |||
17 | SRC_URI = "${DEBIAN_MIRROR}/main/i/icon-naming-utils/icon-naming-utils_${PV}.orig.tar.gz" | ||
18 | SRC_URI[sha256sum] = "044ab2199ed8c6a55ce36fd4fcd8b8021a5e21f5bab028c0a7cdcf52a5902e1c" | ||
19 | |||
20 | inherit autotools allarch perlnative | ||
21 | |||
22 | do_configure:append() { | ||
23 | # Make sure we use our nativeperl wrapper. | ||
24 | sed -i -e "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/icon-name-mapping.pl.in | ||
25 | } | ||
26 | |||
27 | FILES:${PN} += "${datadir}/dtds" | ||
28 | |||
29 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb new file mode 100644 index 0000000000..1ebbf010f3 --- /dev/null +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | SUMMARY = "Sato icon theme" | ||
2 | HOMEPAGE = "https://www.yoctoproject.org/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "CC-BY-SA-3.0" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2" | ||
7 | SECTION = "x11" | ||
8 | |||
9 | DEPENDS = "icon-naming-utils-native libxml-simple-perl-native" | ||
10 | |||
11 | SRC_URI = "git://git.yoctoproject.org/sato-icon-theme.git;protocol=https;branch=master" | ||
12 | SRCREV = "d23f04ecb0328f655bf195df8eb04c1b734d53a9" | ||
13 | UPSTREAM_CHECK_COMMITS = "1" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | inherit autotools pkgconfig allarch gtk-icon-cache perlnative | ||
18 | |||
19 | # The configure script uses pkg-config to find native binaries to execute, so | ||
20 | # tell it to use our pkg-config-native wrapper. | ||
21 | export PKG_CONFIG = "pkg-config-native" | ||
22 | |||
23 | FILES:${PN} += "${datadir}/icons/Sato" | ||
24 | |||
25 | do_install:append() { | ||
26 | find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \; | ||
27 | find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \; | ||
28 | find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \; | ||
29 | } | ||
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 2b1f513f1c..de4ab82484 100644 --- a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Ultra-simple screen capture utility, aimed at handheld devices" | |||
2 | HOMEPAGE = "http://www.o-hand.com" | 2 | HOMEPAGE = "http://www.o-hand.com" |
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | 3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" |
4 | 4 | ||
5 | LICENSE = "GPLv2 & GPLv2+" | 5 | LICENSE = "GPL-2.0-only & GPL-2.0-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
7 | file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \ | 7 | file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \ |
8 | file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" | 8 | file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" |
@@ -11,16 +11,16 @@ DEPENDS = "matchbox-panel-2 gtk+3" | |||
11 | 11 | ||
12 | # SRCREV tagged 0.3 | 12 | # SRCREV tagged 0.3 |
13 | SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756" | 13 | SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756" |
14 | SRC_URI = "git://git.yoctoproject.org/screenshot" | 14 | SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master;protocol=https" |
15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
19 | inherit autotools pkgconfig features_check | 19 | inherit autotools pkgconfig features_check |
20 | 20 | ||
21 | FILES_${PN} += "${libdir}/matchbox-panel/*.so" | 21 | FILES:${PN} += "${libdir}/matchbox-panel/*.so" |
22 | 22 | ||
23 | do_install_append () { | 23 | do_install:append () { |
24 | rm -f ${D}${libdir}/matchbox-panel/*.la | 24 | rm -f ${D}${libdir}/matchbox-panel/*.la |
25 | } | 25 | } |
26 | 26 | ||
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 d01177f9b9..fb00de9bc9 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,7 +1,7 @@ | |||
1 | SUMMARY = "Provides a bridge between gconf and xsettings" | 1 | SUMMARY = "Provides a bridge between gconf and xsettings" |
2 | HOMEPAGE = "https://git.yoctoproject.org/cgit/cgit.cgi/xsettings-daemon/" | 2 | HOMEPAGE = "https://git.yoctoproject.org/cgit/cgit.cgi/xsettings-daemon/" |
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | 3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" |
4 | LICENSE = "MIT-style" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | 5 | LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ |
6 | file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" | 6 | file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" |
7 | DEPENDS = "gconf glib-2.0 gtk+3" | 7 | DEPENDS = "gconf glib-2.0 gtk+3" |
@@ -9,7 +9,7 @@ SECTION = "x11" | |||
9 | 9 | ||
10 | # SRCREV tagged 0.0.2 | 10 | # SRCREV tagged 0.0.2 |
11 | SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" | 11 | SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" |
12 | SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ | 12 | SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=https \ |
13 | file://addsoundkeys.patch \ | 13 | file://addsoundkeys.patch \ |
14 | file://70settings-daemon.sh \ | 14 | file://70settings-daemon.sh \ |
15 | " | 15 | " |
@@ -19,12 +19,12 @@ S = "${WORKDIR}/git" | |||
19 | 19 | ||
20 | inherit autotools pkgconfig gconf features_check | 20 | inherit autotools pkgconfig gconf features_check |
21 | 21 | ||
22 | FILES_${PN} = "${bindir}/* ${sysconfdir}" | 22 | FILES:${PN} = "${bindir}/* ${sysconfdir}" |
23 | 23 | ||
24 | # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES | 24 | # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES |
25 | REQUIRED_DISTRO_FEATURES = "x11" | 25 | REQUIRED_DISTRO_FEATURES = "x11" |
26 | 26 | ||
27 | do_install_append () { | 27 | do_install:append () { |
28 | install -d ${D}/${sysconfdir}/X11/Xsession.d | 28 | install -d ${D}/${sysconfdir}/X11/Xsession.d |
29 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 29 | install -m 755 ${UNPACKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
30 | } | 30 | } |
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb index 28d5096023..766f574b25 100644 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb | |||
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 | |||
4 | 4 | ||
5 | SRC_URI = "file://shutdown.desktop" | 5 | SRC_URI = "file://shutdown.desktop" |
6 | 6 | ||
7 | PR = "r1" | ||
8 | 7 | ||
9 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
10 | 9 | ||
@@ -15,7 +14,7 @@ do_install() { | |||
15 | sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' | 14 | sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' |
16 | } | 15 | } |
17 | 16 | ||
18 | pkg_postinst_${PN} () { | 17 | pkg_postinst:${PN} () { |
19 | grep -q qemuarm $D${sysconfdir}/hostname && \ | 18 | grep -q qemuarm $D${sysconfdir}/hostname && \ |
20 | sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \ | 19 | sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \ |
21 | || true | 20 | || true |
diff --git a/meta/recipes-sato/webkit/libwpe_1.8.0.bb b/meta/recipes-sato/webkit/libwpe_1.16.0.bb index 164831be39..57f91ce87e 100644 --- a/meta/recipes-sato/webkit/libwpe_1.8.0.bb +++ b/meta/recipes-sato/webkit/libwpe_1.16.0.bb | |||
@@ -2,19 +2,16 @@ SUMMARY = "General-purpose library specifically developed for the WPE-flavored p | |||
2 | HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" | 2 | HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" |
3 | BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" | 3 | BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" |
4 | 4 | ||
5 | LICENSE = "BSD" | 5 | LICENSE = "BSD-2-Clause" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" |
7 | DEPENDS = "virtual/egl libxkbcommon" | 7 | DEPENDS = "virtual/egl libxkbcommon" |
8 | 8 | ||
9 | # Workaround build issue with RPi userland EGL libraries. | 9 | inherit cmake features_check pkgconfig |
10 | CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" | ||
11 | |||
12 | inherit cmake features_check | ||
13 | 10 | ||
14 | REQUIRED_DISTRO_FEATURES = "opengl" | 11 | REQUIRED_DISTRO_FEATURES = "opengl" |
15 | 12 | ||
16 | SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" | 13 | SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" |
17 | SRC_URI[sha256sum] = "a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2" | 14 | SRC_URI[sha256sum] = "c7f3a3c6b3d006790d486dc7cceda2b6d2e329de07f33bc47dfc53f00f334b2a" |
18 | 15 | ||
19 | # This is a tweak of upstream-version-is-even needed because | 16 | # This is a tweak of upstream-version-is-even needed because |
20 | # ipstream directory contains tarballs for other components as well. | 17 | # ipstream directory contains tarballs for other components as well. |
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch b/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch new file mode 100644 index 0000000000..a819e22127 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | From 575b848a3b3c14280679db80d0d518922c83d62a Mon Sep 17 00:00:00 2001 | ||
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Fri, 11 Aug 2023 14:20:48 +0800 | ||
4 | Subject: [PATCH] Add a variable to control macro | ||
5 | __PAS_ALWAYS_INLINE_BUT_NOT_INLINE | ||
6 | https://bugs.webkit.org/show_bug.cgi?id=260065 | ||
7 | |||
8 | Reviewed by NOBODY (OOPS!). | ||
9 | |||
10 | It fails to compile webkitgtk with option `-Og` of gcc/g++: | ||
11 | |||
12 | | In file included from Source/bmalloc/libpas/src/libpas/pas_heap_page_provider.h:30, | ||
13 | | from Source/bmalloc/libpas/src/libpas/pas_bootstrap_heap_page_provider.h:29, | ||
14 | | from Source/bmalloc/libpas/src/libpas/pas_large_heap_physical_page_sharing_cache.h:29, | ||
15 | | from Source/bmalloc/libpas/src/libpas/pas_basic_heap_page_caches.h:29, | ||
16 | | from Source/bmalloc/libpas/src/libpas/pas_heap_config_utils.h:32, | ||
17 | | from Source/bmalloc/libpas/src/libpas/bmalloc_heap_config.h:34, | ||
18 | | from Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:34, | ||
19 | | from Source/bmalloc/bmalloc/bmalloc.h:39, | ||
20 | | from Source/bmalloc/bmalloc/bmalloc.cpp:26: | ||
21 | | In function 'pas_allocation_result pas_local_allocator_try_allocate(pas_local_allocator*, size_t, size_t, pas_heap_config, pas_allocator_counts*, pas_allocation_result_filter)', | ||
22 | | inlined from 'pas_allocation_result pas_try_allocate_common_impl_fast(pas_heap_config, pas_allocator_counts*, pas_allocation_result_filter, pas_local_allocator*, size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_try_allocate_common.h:85:46, | ||
23 | | inlined from 'pas_allocation_result bmalloc_try_allocate_with_alignment_impl_impl_fast(pas_local_allocator*, size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:59:1, | ||
24 | | inlined from 'pas_allocation_result pas_try_allocate_intrinsic_impl_casual_case(__pas_heap*, size_t, size_t, pas_intrinsic_heap_support*, pas_heap_config, pas_try_allocate_common_fast, pas_try_allocate_common_slow, pas_intrinsic_heap_designation_mode)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_try_allocate_intrinsic.h:167:44, | ||
25 | | inlined from 'pas_allocation_result bmalloc_try_allocate_with_alignment_impl_casual_case(size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:59:1: | ||
26 | | webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_allocation_result.h:76:1: error: inlining failed in call to 'always_inline' 'pas_allocation_result pas_allocation_result_identity(pas_allocation_result)': function not considered for inlining | ||
27 | | 76 | pas_allocation_result_identity(pas_allocation_result result) | ||
28 | | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
29 | |||
30 | Add an variable `WEBKIT_NO_INLINE_HINTS` to control macro | ||
31 | __PAS_ALWAYS_INLINE_BUT_NOT_INLINE whether includes function attribute | ||
32 | `always_inline`. It could set the variable to make compilation pass when | ||
33 | gcc option `-Og` is used. | ||
34 | |||
35 | * Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h: | ||
36 | * Source/cmake/WebKitCompilerFlags.cmake: | ||
37 | |||
38 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/16601] | ||
39 | |||
40 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
41 | --- | ||
42 | Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h | 2 +- | ||
43 | Source/cmake/WebKitCompilerFlags.cmake | 7 +++++++ | ||
44 | 2 files changed, 8 insertions(+), 1 deletion(-) | ||
45 | |||
46 | diff --git a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h | ||
47 | index 5d5fb38c..a554f700 100644 | ||
48 | --- a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h | ||
49 | +++ b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h | ||
50 | @@ -44,7 +44,7 @@ __PAS_BEGIN_EXTERN_C; | ||
51 | #define __SUSPICIOUS__ | ||
52 | #define __BROKEN__ | ||
53 | |||
54 | -#ifdef __OPTIMIZE__ | ||
55 | +#if defined(__OPTIMIZE__) && !defined(WEBKIT_NO_INLINE_HINTS) | ||
56 | #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE __attribute__((__always_inline__)) | ||
57 | #else | ||
58 | #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE | ||
59 | diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake | ||
60 | index 9b2fecf9..7cdc2b6a 100644 | ||
61 | --- a/Source/cmake/WebKitCompilerFlags.cmake | ||
62 | +++ b/Source/cmake/WebKitCompilerFlags.cmake | ||
63 | @@ -453,3 +453,10 @@ endif () | ||
64 | |||
65 | # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438> | ||
66 | set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON) | ||
67 | + | ||
68 | +# It fails to compile with `gcc -Og` | ||
69 | +set(WEBKIT_NO_INLINE_HINTS OFF CACHE BOOL "Disable funtion attribute always_inline for WebKit") | ||
70 | + | ||
71 | +if (WEBKIT_NO_INLINE_HINTS) | ||
72 | + add_definitions(-DWEBKIT_NO_INLINE_HINTS) | ||
73 | +endif () | ||
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 deleted file mode 100644 index ca7b1bca48..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From b145ab4273c59f4f908cdaff9e267241bd970e93 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 3 Feb 2020 17:06:27 -0800 | ||
4 | Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG | ||
5 | |||
6 | Fixes build failures on risv64 | ||
7 | |||
8 | Taken from https://trac.webkit.org/changeset/231843/webkit | ||
9 | |||
10 | Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of | ||
11 | -lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to | ||
12 | missing atomic primitives. | ||
13 | |||
14 | Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | --- | ||
18 | Source/cmake/OptionsGTK.cmake | 1 + | ||
19 | Source/cmake/OptionsJSCOnly.cmake | 1 + | ||
20 | 2 files changed, 2 insertions(+) | ||
21 | |||
22 | diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake | ||
23 | index 8732e935..9b4fbae7 100644 | ||
24 | --- a/Source/cmake/OptionsGTK.cmake | ||
25 | +++ b/Source/cmake/OptionsGTK.cmake | ||
26 | @@ -32,6 +32,7 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") | ||
27 | if (USER_AGENT_BRANDING) | ||
28 | add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}") | ||
29 | endif () | ||
30 | +set(THREADS_PREFER_PTHREAD_FLAG ON) | ||
31 | |||
32 | find_package(Cairo 1.14.0 REQUIRED) | ||
33 | find_package(Fontconfig 2.8.0 REQUIRED) | ||
34 | diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake | ||
35 | index 316c6240..2f712602 100644 | ||
36 | --- a/Source/cmake/OptionsJSCOnly.cmake | ||
37 | +++ b/Source/cmake/OptionsJSCOnly.cmake | ||
38 | @@ -1,3 +1,4 @@ | ||
39 | +set(THREADS_PREFER_PTHREAD_FLAG ON) | ||
40 | find_package(Threads REQUIRED) | ||
41 | |||
42 | if (MSVC) | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch index fae3b0b2e5..8e29ce17ed 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch | |||
@@ -1,27 +1,29 @@ | |||
1 | From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001 | 1 | From 6348f91c29e2350ad3fec5264aa57dd4994d4583 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 27 Oct 2015 16:02:19 +0200 | 3 | Date: Tue, 27 Oct 2015 16:02:19 +0200 |
4 | Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained | 4 | Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained |
5 | from pkg-config with PKG_CONFIG_SYSROOT_DIR | 5 | from pkg-config with PKG_CONFIG_SYSROOT_DIR |
6 | 6 | ||
7 | Upstream-Status: Pending [review on oe-core list] | 7 | See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for |
8 | reasons why this is not approproiate for upstream submission. | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | --- | 12 | --- |
10 | Source/cmake/FindGObjectIntrospection.cmake | 1 + | 13 | Source/cmake/FindGI.cmake | 3 +++ |
11 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 3 insertions(+) |
12 | 15 | ||
13 | diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake | 16 | diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake |
14 | index e1f49b4..03a4446 100644 | 17 | index fdc56b21..d42eca52 100644 |
15 | --- a/Source/cmake/FindGObjectIntrospection.cmake | 18 | --- a/Source/cmake/FindGI.cmake |
16 | +++ b/Source/cmake/FindGObjectIntrospection.cmake | 19 | +++ b/Source/cmake/FindGI.cmake |
17 | @@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args) | 20 | @@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND) |
18 | else () | ||
19 | string(REGEX REPLACE "[\r\n]" " " _result "${_result}") | ||
20 | string(REGEX REPLACE " +$" "" _result "${_result}") | ||
21 | + string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}") | ||
22 | separate_arguments(_result) | ||
23 | set(${_outvar} ${_result} CACHE INTERNAL "") | ||
24 | endif () | 21 | endif () |
25 | -- | 22 | endif () |
26 | 2.1.4 | 23 | |
27 | 24 | +set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}") | |
25 | +set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}") | ||
26 | + | ||
27 | find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner) | ||
28 | find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler) | ||
29 | |||
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 6dcb52956c..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From 828a500d5be62ba6fc94bd4fac3fe4bf1b1d4f6d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 6 Oct 2017 17:00:08 +0300 | ||
4 | Subject: [PATCH] Fix build with musl | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- | ||
11 | Source/WTF/wtf/PlatformHave.h | 2 +- | ||
12 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h | ||
15 | index c5052527..95ef98b5 100644 | ||
16 | --- a/Source/JavaScriptCore/runtime/MachineContext.h | ||
17 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h | ||
18 | @@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) | ||
19 | #error Unknown Architecture | ||
20 | #endif | ||
21 | |||
22 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
23 | +#elif defined(__linux__) | ||
24 | |||
25 | #if CPU(X86) | ||
26 | return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); | ||
27 | @@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) | ||
28 | #error Unknown Architecture | ||
29 | #endif | ||
30 | |||
31 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
32 | +#elif defined(__linux__) | ||
33 | |||
34 | // The following sequence depends on glibc's sys/ucontext.h. | ||
35 | #if CPU(X86) | ||
36 | @@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) | ||
37 | #error Unknown Architecture | ||
38 | #endif | ||
39 | |||
40 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
41 | +#elif defined(__linux__) | ||
42 | |||
43 | // The following sequence depends on glibc's sys/ucontext.h. | ||
44 | #if CPU(X86) | ||
45 | @@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) | ||
46 | #error Unknown Architecture | ||
47 | #endif | ||
48 | |||
49 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
50 | +#elif defined(__linux__) | ||
51 | |||
52 | // The following sequence depends on glibc's sys/ucontext.h. | ||
53 | #if CPU(X86) | ||
54 | @@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) | ||
55 | #error Unknown Architecture | ||
56 | #endif | ||
57 | |||
58 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | ||
59 | +#elif defined(__linux__) | ||
60 | |||
61 | // The following sequence depends on glibc's sys/ucontext.h. | ||
62 | #if CPU(X86) | ||
63 | diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h | ||
64 | index daca20fe..53eae6ba 100644 | ||
65 | --- a/Source/WTF/wtf/PlatformHave.h | ||
66 | +++ b/Source/WTF/wtf/PlatformHave.h | ||
67 | @@ -222,7 +222,7 @@ | ||
68 | #define HAVE_HOSTED_CORE_ANIMATION 1 | ||
69 | #endif | ||
70 | |||
71 | -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | ||
72 | +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | ||
73 | #define HAVE_MACHINE_CONTEXT 1 | ||
74 | #endif | ||
75 | |||
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 deleted file mode 100644 index 0c31c5fa21..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 | ||
4 | Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | Source/WebKit/PlatformGTK.cmake | 9 +++++---- | ||
11 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | ||
14 | index a069c5f6..ea2f542b 100644 | ||
15 | --- a/Source/WebKit/PlatformGTK.cmake | ||
16 | +++ b/Source/WebKit/PlatformGTK.cmake | ||
17 | @@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION) | ||
18 | set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}") | ||
19 | endif () | ||
20 | |||
21 | - add_custom_command( | ||
22 | - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
23 | + # This is a target and not a command because it's used to build another .gir | ||
24 | + # and a .typelib, which would trigger two racy parallel builds when using command | ||
25 | + add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
26 | DEPENDS WebKit | ||
27 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
28 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
29 | @@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION) | ||
30 | add_custom_command( | ||
31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | ||
32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
33 | - DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
34 | + DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
35 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | ||
36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | ||
37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
38 | @@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION) | ||
39 | |||
40 | add_custom_command( | ||
41 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | ||
42 | - DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
43 | + DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
44 | COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | ||
45 | ) | ||
46 | |||
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 deleted file mode 100644 index 866e9d9d09..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 1c7e7a385387d7febf633bbb6d2b99ece523e719 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 | ||
4 | Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under | ||
5 | OpenEmbedded build system | ||
6 | |||
7 | This requires setting a few environment variables so that the transient | ||
8 | binary is build and linked correctly, and disabling the tweaks to RUN | ||
9 | variable from gtkdoc.py script so that our qemu wrapper is taken into use. | ||
10 | |||
11 | Upstream-Status: Inappropriate [oe-specific] | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | |||
14 | --- | ||
15 | Source/cmake/GtkDoc.cmake | 2 +- | ||
16 | Tools/gtkdoc/gtkdoc.py | 4 ++-- | ||
17 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake | ||
20 | index 18e86448..102c873a 100644 | ||
21 | --- a/Source/cmake/GtkDoc.cmake | ||
22 | +++ b/Source/cmake/GtkDoc.cmake | ||
23 | @@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) | ||
24 | add_custom_command( | ||
25 | OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" | ||
26 | DEPENDS ${DocumentationDependencies} | ||
27 | - 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} | ||
28 | + 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} | ||
29 | COMMAND touch ${_stamp_name} | ||
30 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | ||
31 | VERBATIM | ||
32 | diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py | ||
33 | index 054cafa1..416de7d1 100644 | ||
34 | --- a/Tools/gtkdoc/gtkdoc.py | ||
35 | +++ b/Tools/gtkdoc/gtkdoc.py | ||
36 | @@ -320,9 +320,9 @@ class GTKDoc(object): | ||
37 | additional_ldflags = '%s %s' % (additional_ldflags, arg) | ||
38 | ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags | ||
39 | current_ld_library_path = env.get('LD_LIBRARY_PATH') | ||
40 | - if current_ld_library_path: | ||
41 | + if current_ld_library_path and 'RUN' not in env: | ||
42 | env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path) | ||
43 | - else: | ||
44 | + elif 'RUN' not in env: | ||
45 | env['LD_LIBRARY_PATH'] = self.library_path | ||
46 | |||
47 | if ldflags: | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch deleted file mode 100644 index 3e03aa968c..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 | ||
4 | Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the | ||
5 | compiler flags. | ||
6 | |||
7 | g-ir-compiler is using a C compiler internally, so it needs to set | ||
8 | the proper flags for it. | ||
9 | |||
10 | Upstream-Status: Pending [review on oe-core list] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | |||
13 | --- | ||
14 | Source/JavaScriptCore/PlatformGTK.cmake | 2 +- | ||
15 | Source/WebKit/PlatformGTK.cmake | 4 ++-- | ||
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake | ||
19 | index 0b2968d2..2742ad80 100644 | ||
20 | --- a/Source/JavaScriptCore/PlatformGTK.cmake | ||
21 | +++ b/Source/JavaScriptCore/PlatformGTK.cmake | ||
22 | @@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION) | ||
23 | add_custom_command( | ||
24 | OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
25 | DEPENDS JavaScriptCore | ||
26 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= | ||
27 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
28 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
29 | ${INTROSPECTION_SCANNER} | ||
30 | --quiet | ||
31 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | ||
32 | index e36e4c35..943f9794 100644 | ||
33 | --- a/Source/WebKit/PlatformGTK.cmake | ||
34 | +++ b/Source/WebKit/PlatformGTK.cmake | ||
35 | @@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION) | ||
36 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
37 | DEPENDS WebKit | ||
38 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
39 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= | ||
40 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
41 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
42 | ${INTROSPECTION_SCANNER} | ||
43 | --quiet | ||
44 | @@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION) | ||
45 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | ||
46 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
47 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
48 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations | ||
49 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | ||
50 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | ||
51 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
52 | ${INTROSPECTION_SCANNER} | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch new file mode 100644 index 0000000000..76bcb3df99 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Devoogdt <thomas.devoogdt@barco.com> | ||
3 | Date: Mon, 16 Jan 2023 17:03:30 +0100 | ||
4 | Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix | ||
5 | |||
6 | !ENABLE(WEBASSEMBLY_B3JIT) | ||
7 | |||
8 | https://bugs.webkit.org/show_bug.cgi?id=250681 | ||
9 | |||
10 | Reviewed by NOBODY (OOPS!). | ||
11 | |||
12 | WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT). | ||
13 | Also, toB3Type and simdScalarType are not defined if it is included. | ||
14 | |||
15 | Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> | ||
16 | |||
17 | Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798] | ||
18 | |||
19 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
20 | --- | ||
21 | Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++--- | ||
22 | 1 file changed, 9 insertions(+), 3 deletions(-) | ||
23 | |||
24 | diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp | ||
25 | index eaaa3749..1d089783 100644 | ||
26 | --- a/Source/JavaScriptCore/b3/B3Validate.cpp | ||
27 | +++ b/Source/JavaScriptCore/b3/B3Validate.cpp | ||
28 | @@ -47,6 +47,12 @@ | ||
29 | #include <wtf/StringPrintStream.h> | ||
30 | #include <wtf/text/CString.h> | ||
31 | |||
32 | +#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT) | ||
33 | +#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type)) | ||
34 | +#else | ||
35 | +#define simdScalarTypeToB3Type(type) B3::Type() | ||
36 | +#endif | ||
37 | + | ||
38 | namespace JSC { namespace B3 { | ||
39 | |||
40 | namespace { | ||
41 | @@ -454,7 +460,7 @@ public: | ||
42 | case VectorExtractLane: | ||
43 | VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); | ||
44 | VALIDATE(value->numChildren() == 1, ("At ", *value)); | ||
45 | - VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); | ||
46 | + VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); | ||
47 | VALIDATE(value->child(0)->type() == V128, ("At ", *value)); | ||
48 | break; | ||
49 | case VectorReplaceLane: | ||
50 | @@ -462,7 +468,7 @@ public: | ||
51 | VALIDATE(value->numChildren() == 2, ("At ", *value)); | ||
52 | VALIDATE(value->type() == V128, ("At ", *value)); | ||
53 | VALIDATE(value->child(0)->type() == V128, ("At ", *value)); | ||
54 | - VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); | ||
55 | + VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); | ||
56 | break; | ||
57 | case VectorDupElement: | ||
58 | VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); | ||
59 | @@ -484,7 +490,7 @@ public: | ||
60 | VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); | ||
61 | VALIDATE(value->numChildren() == 1, ("At ", *value)); | ||
62 | VALIDATE(value->type() == V128, ("At ", *value)); | ||
63 | - VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); | ||
64 | + VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); | ||
65 | break; | ||
66 | |||
67 | case VectorPopcnt: | ||
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 @@ | |||
1 | Added missing include for std::array | ||
2 | |||
3 | Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197085] | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | --- webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp.org 2019-04-18 18:03:50.226231691 -0700 | ||
7 | +++ webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp 2019-04-18 18:07:28.569153989 -0700 | ||
8 | @@ -31,6 +31,7 @@ | ||
9 | #include <elf.h> | ||
10 | #include <fcntl.h> | ||
11 | #include <mutex> | ||
12 | +#include <array> | ||
13 | #include <sys/mman.h> | ||
14 | #include <sys/stat.h> | ||
15 | #include <sys/syscall.h> | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch deleted file mode 100644 index f770b381ce..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Since | ||
2 | https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 | ||
3 | it uses XVisualInfo which is defined in Xutil.h | ||
4 | |||
5 | Without this the build fails with: | ||
6 | 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'? | ||
7 | 132 | XVisualInfo visualTemplate; | ||
8 | | ^~~~~~~~~~~ | ||
9 | | VisualID | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | |||
14 | diff -uNr webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | ||
15 | --- webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-08-12 09:17:55.000000000 +0000 | ||
16 | +++ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-11-06 03:11:40.379913528 +0000 | ||
17 | @@ -30,6 +30,7 @@ | ||
18 | |||
19 | #if PLATFORM(X11) | ||
20 | #include <X11/Xlib.h> | ||
21 | +#include <X11/Xutil.h> | ||
22 | #include <X11/extensions/Xcomposite.h> | ||
23 | #if PLATFORM(GTK) | ||
24 | #include <X11/extensions/Xdamage.h> | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch new file mode 100644 index 0000000000..8ce37a01cc --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From a9c874f7418cefbe78f7cd26505ae495cb59bbcf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 12 Jan 2024 09:21:39 -0800 | ||
4 | Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL | ||
5 | |||
6 | This causes clang-17 to crash see [1] | ||
7 | this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit | ||
8 | |||
9 | [1] https://github.com/llvm/llvm-project/issues/67767 | ||
10 | [2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35 | ||
11 | |||
12 | Upstream-Status: Inappropriate [work around to avoid clang compiler crash] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | Source/WTF/wtf/Compiler.h | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h | ||
19 | index 0ea5cb76..c5480dbc 100644 | ||
20 | --- a/Source/WTF/wtf/Compiler.h | ||
21 | +++ b/Source/WTF/wtf/Compiler.h | ||
22 | @@ -284,7 +284,7 @@ | ||
23 | /* MUST_TAIL_CALL */ | ||
24 | |||
25 | #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) | ||
26 | -#if __has_cpp_attribute(clang::musttail) | ||
27 | +#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) | ||
28 | #define MUST_TAIL_CALL [[clang::musttail]] | ||
29 | #endif | ||
30 | #endif | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch new file mode 100644 index 0000000000..93a431a0b1 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From d096b945113ddecaf33062296e20b6d5a007cab3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Mon, 3 Jan 2022 14:18:34 +0000 | ||
4 | Subject: [PATCH] webkitgtk: Add reproducibility fix | ||
5 | |||
6 | Injection a year based on the current date isn't reproducible. Hack this | ||
7 | to a specific year for now for reproducibilty and to avoid autobuilder failures. | ||
8 | |||
9 | The correct fix would be to use SOURCE_DATE_EPOCH from the environment and | ||
10 | then this could be submitted upstream, sadly my ruby isn't up to that. | ||
11 | |||
12 | Upstream-Status: Pending [could be reworked] | ||
13 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
14 | --- | ||
15 | Source/JavaScriptCore/generator/GeneratedFile.rb | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/Source/JavaScriptCore/generator/GeneratedFile.rb b/Source/JavaScriptCore/generator/GeneratedFile.rb | ||
19 | index 6ed2b6e4..86a28286 100644 | ||
20 | --- a/Source/JavaScriptCore/generator/GeneratedFile.rb | ||
21 | +++ b/Source/JavaScriptCore/generator/GeneratedFile.rb | ||
22 | @@ -25,7 +25,7 @@ require 'date' | ||
23 | require 'digest' | ||
24 | |||
25 | $LICENSE = <<-EOF | ||
26 | -Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. | ||
27 | +Copyright (C) 2021 Apple Inc. All rights reserved. | ||
28 | |||
29 | Redistribution and use in source and binary forms, with or without | ||
30 | modification, are permitted provided that the following conditions | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch b/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch new file mode 100644 index 0000000000..d4720e4f28 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Catanzaro <mcatanzaro@redhat.com> | ||
3 | Date: Mon, 5 Feb 2024 11:00:49 -0600 | ||
4 | Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= | ||
5 | =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= | ||
6 | =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= | ||
7 | =?UTF-8?q?=3D268739?= | ||
8 | MIME-Version: 1.0 | ||
9 | Content-Type: text/plain; charset=UTF-8 | ||
10 | Content-Transfer-Encoding: 8bit | ||
11 | |||
12 | Unreviewed build fix. Seems a backport went badly, and we didn't notice | ||
13 | because the code is architecture-specific. | ||
14 | |||
15 | * Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: | ||
16 | (JSC::CLoop::execute): | ||
17 | |||
18 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff] | ||
19 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
20 | --- | ||
21 | Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- | ||
22 | 1 file changed, 2 deletions(-) | ||
23 | |||
24 | diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | ||
25 | index 5064ead6cd2e7..9a2e2653b1219 100644 | ||
26 | --- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | ||
27 | +++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | ||
28 | @@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, | ||
29 | UNUSED_VARIABLE(t2); | ||
30 | UNUSED_VARIABLE(t3); | ||
31 | UNUSED_VARIABLE(t5); | ||
32 | - UNUSED_VARIABLE(t6); | ||
33 | - UNUSED_VARIABLE(t7); | ||
34 | |||
35 | struct StackPointerScope { | ||
36 | StackPointerScope(CLoopStack& stack) | ||
37 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb deleted file mode 100644 index 2928b8e55b..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb +++ /dev/null | |||
@@ -1,147 +0,0 @@ | |||
1 | SUMMARY = "WebKit web rendering engine for the GTK+ platform" | ||
2 | HOMEPAGE = "https://www.webkitgtk.org/" | ||
3 | BUGTRACKER = "https://bugs.webkit.org/" | ||
4 | |||
5 | LICENSE = "BSD & LGPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ | ||
7 | file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ | ||
8 | file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ | ||
9 | file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ | ||
10 | " | ||
11 | |||
12 | SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | ||
13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ | ||
14 | file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ | ||
15 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ | ||
16 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ | ||
17 | file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ | ||
18 | file://0001-Fix-build-with-musl.patch \ | ||
19 | file://include_array.patch \ | ||
20 | file://include_xutil.patch \ | ||
21 | " | ||
22 | SRC_URI[sha256sum] = "7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f" | ||
23 | |||
24 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc | ||
25 | |||
26 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
27 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" | ||
28 | |||
29 | CVE_PRODUCT = "webkitgtk webkitgtk\+" | ||
30 | |||
31 | DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ | ||
32 | gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ | ||
33 | pango icu bison-native gawk intltool-native libwebp \ | ||
34 | atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \ | ||
35 | ruby-native libnotify gstreamer1.0-plugins-bad \ | ||
36 | gettext-native glib-2.0 glib-2.0-native libtasn1 \ | ||
37 | " | ||
38 | |||
39 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ | ||
40 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ | ||
41 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ | ||
42 | enchant \ | ||
43 | libsecret \ | ||
44 | " | ||
45 | |||
46 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" | ||
47 | PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" | ||
48 | PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" | ||
49 | PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" | ||
50 | PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" | ||
51 | PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" | ||
52 | PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" | ||
53 | PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" | ||
54 | PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" | ||
55 | PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" | ||
56 | PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" | ||
57 | PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" | ||
58 | |||
59 | # webkitgtk is full of /usr/bin/env python, particular for generating docs | ||
60 | do_configure[postfuncs] += "setup_python_link" | ||
61 | setup_python_link() { | ||
62 | if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then | ||
63 | ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python | ||
64 | fi | ||
65 | } | ||
66 | |||
67 | EXTRA_OECMAKE = " \ | ||
68 | -DPORT=GTK \ | ||
69 | -DCMAKE_BUILD_TYPE=Release \ | ||
70 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ | ||
71 | ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ | ||
72 | -DENABLE_MINIBROWSER=ON \ | ||
73 | -DPYTHON_EXECUTABLE=`which python3` \ | ||
74 | -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ | ||
75 | " | ||
76 | |||
77 | # Javascript JIT is not supported on ARC | ||
78 | EXTRA_OECMAKE_append_arc = " -DENABLE_JIT=OFF " | ||
79 | # By default 25-bit "medium" calls are used on ARC | ||
80 | # which is not enough for binaries larger than 32 MiB | ||
81 | CFLAGS_append_arc = " -mlong-calls" | ||
82 | CXXFLAGS_append_arc = " -mlong-calls" | ||
83 | |||
84 | # Javascript JIT is not supported on powerpc | ||
85 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " | ||
86 | EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " | ||
87 | |||
88 | # ARM JIT code does not build on ARMv4/5/6 anymore | ||
89 | EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF " | ||
90 | EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " | ||
91 | EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " | ||
92 | |||
93 | EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " | ||
94 | EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " | ||
95 | |||
96 | # JIT and gold linker does not work on RISCV | ||
97 | EXTRA_OECMAKE_append_riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" | ||
98 | EXTRA_OECMAKE_append_riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" | ||
99 | |||
100 | # JIT not supported on MIPS either | ||
101 | EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " | ||
102 | |||
103 | # JIT not supported on X32 | ||
104 | # An attempt was made to upstream JIT support for x32 in | ||
105 | # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as | ||
106 | # unresolved due to limited X32 adoption. | ||
107 | EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " | ||
108 | |||
109 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" | ||
110 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" | ||
111 | |||
112 | FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" | ||
113 | |||
114 | RRECOMMENDS_${PN} += "ca-certificates shared-mime-info" | ||
115 | |||
116 | # http://errors.yoctoproject.org/Errors/Details/20370/ | ||
117 | ARM_INSTRUCTION_SET_armv4 = "arm" | ||
118 | ARM_INSTRUCTION_SET_armv5 = "arm" | ||
119 | ARM_INSTRUCTION_SET_armv6 = "arm" | ||
120 | |||
121 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 | ||
122 | # https://bugs.webkit.org/show_bug.cgi?id=159880 | ||
123 | # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. | ||
124 | # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). | ||
125 | ARM_INSTRUCTION_SET_armv7a = "thumb" | ||
126 | ARM_INSTRUCTION_SET_armv7r = "thumb" | ||
127 | ARM_INSTRUCTION_SET_armv7ve = "thumb" | ||
128 | |||
129 | # introspection inside qemu-arm hangs forever on musl/arm builds | ||
130 | # therefore disable GI_DATA | ||
131 | GI_DATA_ENABLED_libc-musl_armv7a = "False" | ||
132 | GI_DATA_ENABLED_libc-musl_armv7ve = "False" | ||
133 | |||
134 | # Can't be built with ccache | ||
135 | CCACHE_DISABLE = "1" | ||
136 | |||
137 | PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" | ||
138 | src_package_preprocess () { | ||
139 | # Trim build paths from comments in generated sources to ensure reproducibility | ||
140 | sed -i -e "s,${WORKDIR},,g" \ | ||
141 | ${B}/DerivedSources/webkit2gtk/webkit2/*.cpp \ | ||
142 | ${B}/DerivedSources/ForwardingHeaders/JavaScriptCore/*.h \ | ||
143 | ${B}/DerivedSources/JavaScriptCore/*.h \ | ||
144 | ${B}/DerivedSources/JavaScriptCore/yarr/*.h \ | ||
145 | ${B}/DerivedSources/MiniBrowser/*.c | ||
146 | } | ||
147 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb new file mode 100644 index 0000000000..29e12bb8c5 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb | |||
@@ -0,0 +1,186 @@ | |||
1 | SUMMARY = "WebKit web rendering engine for the GTK+ platform" | ||
2 | HOMEPAGE = "https://www.webkitgtk.org/" | ||
3 | BUGTRACKER = "https://bugs.webkit.org/" | ||
4 | |||
5 | LICENSE = "BSD-2-Clause & LGPL-2.0-or-later" | ||
6 | LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ | ||
7 | file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ | ||
8 | file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ | ||
9 | file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ | ||
10 | " | ||
11 | |||
12 | SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | ||
13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ | ||
14 | file://reproducibility.patch \ | ||
15 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ | ||
16 | file://no-musttail-arm.patch \ | ||
17 | file://t6-not-declared.patch \ | ||
18 | file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ | ||
19 | " | ||
20 | SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" | ||
21 | |||
22 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | ||
23 | |||
24 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
25 | REQUIRED_DISTRO_FEATURES = "opengl" | ||
26 | |||
27 | CVE_PRODUCT = "webkitgtk webkitgtk\+" | ||
28 | |||
29 | DEPENDS += " \ | ||
30 | ruby-native \ | ||
31 | gperf-native \ | ||
32 | unifdef-native \ | ||
33 | cairo \ | ||
34 | harfbuzz \ | ||
35 | jpeg \ | ||
36 | atk \ | ||
37 | libwebp \ | ||
38 | gtk4 \ | ||
39 | libxslt \ | ||
40 | libtasn1 \ | ||
41 | libnotify \ | ||
42 | gstreamer1.0 \ | ||
43 | gstreamer1.0-plugins-base \ | ||
44 | glib-2.0-native \ | ||
45 | gettext-native \ | ||
46 | " | ||
47 | |||
48 | PACKAGECONFIG_SOUP ?= "soup3" | ||
49 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ | ||
50 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ | ||
51 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ | ||
52 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ | ||
53 | enchant \ | ||
54 | libsecret \ | ||
55 | ${PACKAGECONFIG_SOUP} \ | ||
56 | " | ||
57 | |||
58 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" | ||
59 | PACKAGECONFIG[angle] = "-DUSE_ANGLE_WEBGL=ON,-DUSE_ANGLE_WEBGL=OFF" | ||
60 | PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" | ||
61 | PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" | ||
62 | PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" | ||
63 | PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" | ||
64 | PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" | ||
65 | PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl" | ||
66 | PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" | ||
67 | PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" | ||
68 | PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" | ||
69 | PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" | ||
70 | PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" | ||
71 | PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" | ||
72 | PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," | ||
73 | PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" | ||
74 | PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" | ||
75 | PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" | ||
76 | PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" | ||
77 | PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" | ||
78 | PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" | ||
79 | PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" | ||
80 | PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace" | ||
81 | PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" | ||
82 | |||
83 | EXTRA_OECMAKE = " \ | ||
84 | -DPORT=GTK \ | ||
85 | ${@oe.utils.vartrue('GI_DATA_ENABLED', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ | ||
86 | ${@oe.utils.vartrue('GIDOCGEN_ENABLED', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ | ||
87 | ${@oe.utils.vartrue('DEBUG_BUILD', '-DWEBKIT_NO_INLINE_HINTS=ON', '-DWEBKIT_NO_INLINE_HINTS=OFFF', d)} \ | ||
88 | -DENABLE_MINIBROWSER=ON \ | ||
89 | -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ | ||
90 | -DUSE_GTK4=ON \ | ||
91 | -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ | ||
92 | " | ||
93 | |||
94 | # Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the | ||
95 | # debug symbols (4.3GB to 700M at time of writing) | ||
96 | DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" | ||
97 | |||
98 | # Javascript JIT is not supported on ARC | ||
99 | EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " | ||
100 | # By default 25-bit "medium" calls are used on ARC | ||
101 | # which is not enough for binaries larger than 32 MiB | ||
102 | CFLAGS:append:arc = " -mlong-calls" | ||
103 | CXXFLAGS:append:arc = " -mlong-calls" | ||
104 | |||
105 | # Needed for non-mesa graphics stacks when x11 is disabled | ||
106 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" | ||
107 | |||
108 | # Javascript JIT is not supported on powerpc | ||
109 | EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " | ||
110 | EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " | ||
111 | |||
112 | # ARM JIT code does not build on ARMv4/5/6 anymore | ||
113 | EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " | ||
114 | EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " | ||
115 | EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " | ||
116 | |||
117 | # And for armv7* don't enable it for softfp, because after: | ||
118 | # https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918 | ||
119 | # https://bugs.webkit.org/show_bug.cgi?id=242172 | ||
120 | # softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets | ||
121 | # explicitly disabled causing: | ||
122 | # http://errors.yoctoproject.org/Errors/Details/734587/ | ||
123 | # PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled | ||
124 | # https://github.com/WebKit/WebKit/pull/17447 | ||
125 | EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
126 | EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
127 | EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
128 | |||
129 | EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " | ||
130 | EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " | ||
131 | |||
132 | # JIT and gold linker does not work on RISCV | ||
133 | EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" | ||
134 | EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF" | ||
135 | |||
136 | # JIT not supported on MIPS either | ||
137 | EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " | ||
138 | |||
139 | # JIT not supported on X32 | ||
140 | # An attempt was made to upstream JIT support for x32 in | ||
141 | # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as | ||
142 | # unresolved due to limited X32 adoption. | ||
143 | EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " | ||
144 | |||
145 | SECURITY_CFLAGS:remove:aarch64 = "-fpie" | ||
146 | SECURITY_CFLAGS:append:aarch64 = " -fPIE" | ||
147 | |||
148 | FILES:${PN} += "${libdir}/webkitgtk-*/injected-bundle/*.so" | ||
149 | |||
150 | RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" | ||
151 | |||
152 | # http://errors.yoctoproject.org/Errors/Details/20370/ | ||
153 | ARM_INSTRUCTION_SET:armv4 = "arm" | ||
154 | ARM_INSTRUCTION_SET:armv5 = "arm" | ||
155 | ARM_INSTRUCTION_SET:armv6 = "arm" | ||
156 | |||
157 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 | ||
158 | # https://bugs.webkit.org/show_bug.cgi?id=159880 | ||
159 | # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. | ||
160 | # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). | ||
161 | ARM_INSTRUCTION_SET:armv7a = "thumb" | ||
162 | ARM_INSTRUCTION_SET:armv7r = "thumb" | ||
163 | ARM_INSTRUCTION_SET:armv7ve = "thumb" | ||
164 | |||
165 | # ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 | ||
166 | COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" | ||
167 | |||
168 | # introspection inside qemu-arm hangs forever on musl/arm builds | ||
169 | # therefore disable GI_DATA | ||
170 | GI_DATA_ENABLED:libc-musl:armv7a = "False" | ||
171 | GI_DATA_ENABLED:libc-musl:armv7ve = "False" | ||
172 | |||
173 | # Can't be built with ccache | ||
174 | CCACHE_DISABLE = "1" | ||
175 | |||
176 | PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" | ||
177 | src_package_preprocess () { | ||
178 | # Trim build paths from comments in generated sources to ensure reproducibility | ||
179 | sed -i -e "s,${WORKDIR},,g" \ | ||
180 | ${B}/JavaScriptCore/DerivedSources/*.h \ | ||
181 | ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ | ||
182 | ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ | ||
183 | ${B}/WebCore/DerivedSources/*.cpp \ | ||
184 | ${B}/WebKitGTK/DerivedSources/webkit/*.cpp | ||
185 | } | ||
186 | |||
diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.8.0.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.14.2.bb index 344aa9717c..b3d7b229c8 100644 --- a/meta/recipes-sato/webkit/wpebackend-fdo_1.8.0.bb +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.14.2.bb | |||
@@ -2,18 +2,22 @@ SUMMARY = "WPE's backend based on a freedesktop.org stack." | |||
2 | HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" | 2 | HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" |
3 | BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" | 3 | BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" |
4 | 4 | ||
5 | LICENSE = "BSD" | 5 | LICENSE = "BSD-2-Clause" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" |
7 | DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" | 7 | DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" |
8 | 8 | ||
9 | DEPENDS_append_class-target = " wayland-native" | 9 | DEPENDS:append:class-target = " wayland-native" |
10 | 10 | ||
11 | inherit meson features_check | 11 | inherit meson features_check pkgconfig |
12 | 12 | ||
13 | REQUIRED_DISTRO_FEATURES = "opengl" | 13 | REQUIRED_DISTRO_FEATURES = "opengl" |
14 | 14 | ||
15 | SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" | 15 | SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" |
16 | SRC_URI[sha256sum] = "9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253" | 16 | SRC_URI[sha256sum] = "93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38" |
17 | |||
18 | # Especially helps compiling with clang which enable this as error when | ||
19 | # using c++11 | ||
20 | CXXFLAGS += "-Wno-c++11-narrowing" | ||
17 | 21 | ||
18 | # This is a tweak of upstream-version-is-even needed because | 22 | # This is a tweak of upstream-version-is-even needed because |
19 | # ipstream directory contains tarballs for other components as well. | 23 | # ipstream directory contains tarballs for other components as well. |