summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/images/core-image-sato-dev.bb1
-rw-r--r--meta/recipes-sato/images/core-image-sato-ptest-fast.bb1
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk-ptest.bb1
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk.bb1
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb2
-rw-r--r--meta/recipes-sato/l3afpad/l3afpad_git.bb6
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb2
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb3
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb1
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb4
-rw-r--r--meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb2
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb2
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb2
-rw-r--r--meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb1
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb3
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc1
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-libev-remove-deprecated-throw-specification.patch30
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb4
-rw-r--r--meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb2
-rw-r--r--meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb2
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch31
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch66
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch15
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.28.4.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.28.2.bb)6
24 files changed, 161 insertions, 28 deletions
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
index 7fa69d0997..f45a83273c 100644
--- a/meta/recipes-sato/images/core-image-sato-dev.bb
+++ b/meta/recipes-sato/images/core-image-sato-dev.bb
@@ -3,5 +3,6 @@ require core-image-sato.bb
3DESCRIPTION = "Image with Sato for development work. It includes everything \ 3DESCRIPTION = "Image with Sato for development work. It includes everything \
4within core-image-sato plus a native toolchain, application development and \ 4within core-image-sato plus a native toolchain, application development and \
5testing libraries, profiling and debug symbols." 5testing libraries, profiling and debug symbols."
6HOMEPAGE = "https://www.yoctoproject.org/"
6 7
7IMAGE_FEATURES += "dev-pkgs" 8IMAGE_FEATURES += "dev-pkgs"
diff --git a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb b/meta/recipes-sato/images/core-image-sato-ptest-fast.bb
index 4f08d6eb64..d37ad00cf8 100644
--- a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb
+++ b/meta/recipes-sato/images/core-image-sato-ptest-fast.bb
@@ -7,6 +7,7 @@ require conf/distro/include/ptest-packagelists.inc
7IMAGE_INSTALL += "${PTESTS_FAST}" 7IMAGE_INSTALL += "${PTESTS_FAST}"
8 8
9DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." 9DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA."
10HOMEPAGE = "https://www.yoctoproject.org/"
10 11
11# This image is sufficiently large (~1.8GB) that it can't actually fit in a live 12# This image is sufficiently large (~1.8GB) that it can't actually fit in a live
12# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the 13# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
index 4d59c9536b..eea89a5d6c 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
@@ -5,6 +5,7 @@ require core-image-sato-sdk.bb
5require conf/distro/include/ptest-packagelists.inc 5require conf/distro/include/ptest-packagelists.inc
6 6
7DESCRIPTION += "Also includes ptest packages." 7DESCRIPTION += "Also includes ptest packages."
8HOMEPAGE = "https://www.yoctoproject.org/"
8 9
9PROVIDES += "core-image-sato-ptest" 10PROVIDES += "core-image-sato-ptest"
10 11
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index d7cc52b52b..b52de0def0 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -3,6 +3,7 @@ require core-image-sato.bb
3DESCRIPTION = "Image with Sato support that includes everything within \ 3DESCRIPTION = "Image with Sato support that includes everything within \
4core-image-sato plus meta-toolchain, development headers and libraries to \ 4core-image-sato plus meta-toolchain, development headers and libraries to \
5form a standalone SDK." 5form a standalone SDK."
6HOMEPAGE = "https://www.yoctoproject.org/"
6 7
7IMAGE_FEATURES += "dev-pkgs tools-sdk \ 8IMAGE_FEATURES += "dev-pkgs tools-sdk \
8 tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" 9 tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 673106eb6d..300d8e0d43 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -1,6 +1,7 @@
1DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ 1DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
2mobile devices. The image supports X11 with a Sato theme, Pimlico \ 2mobile devices. The image supports X11 with a Sato theme, Pimlico \
3applications, and contains terminal, editor, and file manager." 3applications, and contains terminal, editor, and file manager."
4HOMEPAGE = "https://www.yoctoproject.org/"
4 5
5IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs" 6IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs"
6 7
@@ -12,4 +13,5 @@ TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0"
12TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" 13TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0"
13 14
14QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' 15QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}'
16QB_MEM_qemuarmv5 = "-m 256"
15QB_MEM_qemumips = "-m 256" 17QB_MEM_qemumips = "-m 256"
diff --git a/meta/recipes-sato/l3afpad/l3afpad_git.bb b/meta/recipes-sato/l3afpad/l3afpad_git.bb
index 6fdcc3e392..4d5d299d47 100644
--- a/meta/recipes-sato/l3afpad/l3afpad_git.bb
+++ b/meta/recipes-sato/l3afpad/l3afpad_git.bb
@@ -1,4 +1,8 @@
1SUMMARY = "Simple GTK+ Text Editor" 1SUMMARY = "Simple GTK+ Text Editor"
2DESCRIPTION = "L3afpad is a simple GTK+ text editor that emphasizes simplicity. As development \
3focuses on keeping weight down to a minimum, only the most essential features \
4are implemented in the editor. L3afpad is simple to use, is easily compiled, \
5requires few libraries, and starts up quickly."
2HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad" 6HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad"
3 7
4# Note that COPYING seems to mistakenly contain LGPLv2.1. 8# Note that COPYING seems to mistakenly contain LGPLv2.1.
@@ -12,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
12DEPENDS = "gtk+3 intltool-native gettext-native" 16DEPENDS = "gtk+3 intltool-native gettext-native"
13 17
14PV = "0.8.18.1.11+git${SRCPV}" 18PV = "0.8.18.1.11+git${SRCPV}"
15SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git" 19SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master;protocol=https"
16SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff" 20SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff"
17 21
18S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
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..5733a36b12 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
@@ -11,7 +11,7 @@ RDEPENDS_${PN} = "settings-daemon"
11 11
12# SRCREV tagged 0.2 12# SRCREV tagged 0.2
13SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" 13SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa"
14SRC_URI = "git://git.yoctoproject.org/${BPN} \ 14SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
15 file://no-handed.patch" 15 file://no-handed.patch"
16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
17 17
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
index 5c23e85202..2a2eb24f57 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
@@ -1,4 +1,5 @@
1SUMMARY = "Matchbox Window Manager Desktop" 1SUMMARY = "Matchbox Window Manager Desktop"
2DESCRIPTION = "A lightweight windows manager for embedded systems. It uses the desktop background to provide an application launcher and allows modules to be loaded for additional functionality."
2HOMEPAGE = "http://matchbox-project.org/" 3HOMEPAGE = "http://matchbox-project.org/"
3BUGTRACKER = "http://bugzilla.yoctoproject.org/" 4BUGTRACKER = "http://bugzilla.yoctoproject.org/"
4 5
@@ -12,7 +13,7 @@ SECTION = "x11/wm"
12 13
13# SRCREV tagged 2.2 14# SRCREV tagged 2.2
14SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" 15SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777"
15SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ 16SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \
16 file://vfolders/* \ 17 file://vfolders/* \
17 " 18 "
18 19
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 dfc7fbad57..49e37bd77c 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb
@@ -1,4 +1,5 @@
1SUMMARY = "Matchbox virtual keyboard for X11" 1SUMMARY = "Matchbox virtual keyboard for X11"
2DESCRIPTION = "An on screen 'virtual' or 'software' keyboard."
2HOMEPAGE = "http://matchbox-project.org" 3HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.yoctoproject.org/" 4BUGTRACKER = "http://bugzilla.yoctoproject.org/"
4SECTION = "x11" 5SECTION = "x11"
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
index 2e6f5b7085..54fe578cd3 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
@@ -1,4 +1,6 @@
1SUMMARY = "Simple GTK+ based panel for handheld devices" 1SUMMARY = "Simple GTK+ based panel for handheld devices"
2DESCRIPTION = "A flexible always present 'window bar' for holding application \
3launchers and small 'applet' style applications"
2HOMEPAGE = "http://matchbox-project.org" 4HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.yoctoproject.org/" 5BUGTRACKER = "http://bugzilla.yoctoproject.org/"
4 6
@@ -21,7 +23,7 @@ RPROVIDES_${PN} = "matchbox-panel"
21RREPLACES_${PN} = "matchbox-panel" 23RREPLACES_${PN} = "matchbox-panel"
22RCONFLICTS_${PN} = "matchbox-panel" 24RCONFLICTS_${PN} = "matchbox-panel"
23 25
24SRC_URI = "git://git.yoctoproject.org/${BPN} \ 26SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
25 file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ 27 file://0001-applets-systray-Allow-icons-to-be-smaller.patch \
26 " 28 "
27 29
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..e2e81c2905 100644
--- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
@@ -11,7 +11,7 @@ SECTION = "x11/utils"
11 11
12#SRCREV tagged 0.2 12#SRCREV tagged 0.2
13SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5" 13SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5"
14SRC_URI = "git://git.yoctoproject.org/${BPN}" 14SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
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..bc4024736f 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
4SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78" 4SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78"
5SRC_URI = "git://git.yoctoproject.org/matchbox-sato" 5SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master"
6UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 6UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
7 7
8S = "${WORKDIR}/git" 8S = "${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 ed3f1a69a1..25725e078d 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -3,6 +3,8 @@
3# 3#
4 4
5SUMMARY = "Sato desktop" 5SUMMARY = "Sato desktop"
6DESCRIPTION = "Packagegroups provide a convenient mechanism of bundling a collection of packages."
7HOMEPAGE = "https://www.yoctoproject.org/"
6PR = "r33" 8PR = "r33"
7 9
8PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb
index 7885e0abae..153fbeb0b7 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb
@@ -1,4 +1,5 @@
1SUMMARY = "Fast lightweight tabbed filemanager" 1SUMMARY = "Fast lightweight tabbed filemanager"
2DESCRIPTION = "A free file manager application and the standard file manager of LXDE."
2HOMEPAGE = "http://pcmanfm.sourceforge.net/" 3HOMEPAGE = "http://pcmanfm.sourceforge.net/"
3 4
4LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+" 5LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+"
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 41b78d6fe1..3ee441998d 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -1,4 +1,5 @@
1SUMMARY = "Simon Tatham's Portable Puzzle Collection" 1SUMMARY = "Simon Tatham's Portable Puzzle Collection"
2DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games."
2HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" 3HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
3LICENSE = "MIT" 4LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a" 5LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a"
@@ -8,7 +9,7 @@ DEPENDS = "libxt"
8# The libxt requires x11 in DISTRO_FEATURES 9# The libxt requires x11 in DISTRO_FEATURES
9REQUIRED_DISTRO_FEATURES = "x11" 10REQUIRED_DISTRO_FEATURES = "x11"
10 11
11SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ 12SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main \
12 file://fix-compiling-failure-with-option-g-O.patch \ 13 file://fix-compiling-failure-with-option-g-O.patch \
13 file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ 14 file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
14 file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ 15 file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
index b568f04580..0e5bcbe480 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
@@ -5,6 +5,7 @@ terminal emulator rxvt, modified to store text in Unicode \
5(either UCS-2 or UCS-4) and to use locale-correct input and \ 5(either UCS-2 or UCS-4) and to use locale-correct input and \
6output. It also supports mixing multiple fonts at the \ 6output. It also supports mixing multiple fonts at the \
7same time, including Xft fonts." 7same time, including Xft fonts."
8HOMEPAGE = "https://rxvt.org/"
8DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu" 9DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu"
9 10
10SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ 11SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
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
new file mode 100644
index 0000000000..f10dca09d6
--- /dev/null
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-libev-remove-deprecated-throw-specification.patch
@@ -0,0 +1,30 @@
1From 9a8f1d73e7b7e183768a8379ef32429a84f0e5c2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 26 Feb 2021 18:11:56 -0800
4Subject: [PATCH] libev: remove deprecated throw specification
5
6removes the throw specifications that are deprecated since C++11:
7warning: dynamic exception specifications are deprecated in C++11 [-Wdeprecated]
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 libev/ev++.h | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/libev/ev++.h b/libev/ev++.h
16index 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--
292.30.1
30
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
index bfa8a614df..283e8d7751 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
@@ -4,5 +4,7 @@ LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 4LIC_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
7SRC_URI[md5sum] = "93782dec27494eb079467dacf6e48185" 7SRC_URI += "file://0001-libev-remove-deprecated-throw-specification.patch"
8
8SRC_URI[sha256sum] = "e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd" 9SRC_URI[sha256sum] = "e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd"
10
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..7e7612253d 100644
--- a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
@@ -11,7 +11,7 @@ DEPENDS = "matchbox-panel-2 gtk+3"
11 11
12# SRCREV tagged 0.3 12# SRCREV tagged 0.3
13SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756" 13SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756"
14SRC_URI = "git://git.yoctoproject.org/screenshot" 14SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master"
15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
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..19c4a73dc3 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
@@ -9,7 +9,7 @@ SECTION = "x11"
9 9
10# SRCREV tagged 0.0.2 10# SRCREV tagged 0.0.2
11SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" 11SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2"
12SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ 12SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master \
13 file://addsoundkeys.patch \ 13 file://addsoundkeys.patch \
14 file://70settings-daemon.sh \ 14 file://70settings-daemon.sh \
15 " 15 "
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch b/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
new file mode 100644
index 0000000000..528dec8c8b
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
@@ -0,0 +1,31 @@
1From dcf9ae0dc0b4510eddbeeea09e11edfb123f95af Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 2 May 2021 13:10:49 -0700
4Subject: [PATCH] MiniBrowser: Fix reproduciblity
5
6Do not emit references to source dir in generated sourcecode
7
8Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=225283]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 Tools/MiniBrowser/gtk/CMakeLists.txt | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
15index 93b62521..482d3b00 100644
16--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
17+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
18@@ -48,8 +48,8 @@ add_custom_command(
19 OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
20 ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
21 MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list
22- COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
23- COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
24+ COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body --skip-source > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
25+ COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header --skip-source > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
26 VERBATIM)
27
28 if (DEVELOPER_MODE)
29--
302.31.1
31
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch b/meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch
new file mode 100644
index 0000000000..d8bb8efb88
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch
@@ -0,0 +1,66 @@
1From cb929f59b527fe890376e47613dfe1434a320bc0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 11 Aug 2020 15:44:48 -0700
4Subject: [PATCH] [clang 11] fix build errors due to -WWc++11-narrowing
5
6https://bugs.webkit.org/show_bug.cgi?id=211193
7
8Reviewed by Adrian Perez de Castro.
9
10Fixes the following errors,
11
12Source/WebCore/html/MediaElementSession.cpp:1059:9: error: type 'WebCore::RenderMedia *' cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
13m_element.renderer(),
14^~~~~~~~~~~~~~~~~~~~
15
16Source/WebCore/style/StyleResolver.cpp:106:55: error: type 'const char [4]' cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
17m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
18 ^~~~~
19Source/WebCore/style/StyleResolver.cpp:106:55: note: insert an explicit cast to silence this issue
20m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
21 ^~~~~
22 static_cast<bool>( )
23
24* html/HTMLMediaElement.h:
25(WebCore::HTMLMediaElement::hasRenderer const):
26MediaElementSession was implicitly casting a pointer to a bool,
27which is not allowed with modern Clang checks. Add a helper method
28to encapsulate the now required static_cast<bool>.
29* html/MediaElementSession.cpp: Use the new helper method to see
30if the HTMLMediaElement has an associated renderer.
31(WebCore::MediaElementSession::updateMediaUsageIfChanged):
32* style/StyleResolver.cpp: This was calling MediaQueryEvaluator {
33"all" }; and seemingly expecting to cast a const char[] to a bool,
34or maybe String? It's confusing because of the MediaQueryEvaluator
35API. If it was implicitly converting to bool then that could be
36unintentional. Such casts are not allowed either now. The
37MediaQueryEvaluator's default constructor says it returns true for
38"all", which appears to be the original intent of this call, so I
39replaced it with that.
40(WebCore::Style::Resolver::Resolver):
41
42git-svn-id: http://svn.webkit.org/repository/webkit/trunk@260951 268f45cc-cd09-0410-ab3c-d52691b4dbfc
43
44Upstream-Status: Backport [https://github.com/WebKit/webkit/commit/c3cf651016e4cdcb4350598d4a586821071f91bf.patch]
45
46Signed-off-by: Khem Raj <raj.khem@gmail.com>
47---
48 Source/WebCore/style/StyleResolver.cpp | 2 +-
49 1 file changed, 1 insertion(+), 1 deletion(-)
50
51diff --git a/Source/WebCore/style/StyleResolver.cpp b/Source/WebCore/style/StyleResolver.cpp
52index 8bf371a0..34580ddb 100644
53--- a/Source/WebCore/style/StyleResolver.cpp
54+++ b/Source/WebCore/style/StyleResolver.cpp
55@@ -107,7 +107,7 @@ Resolver::Resolver(Document& document)
56 if (view)
57 m_mediaQueryEvaluator = MediaQueryEvaluator { view->mediaType() };
58 else
59- m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
60+ m_mediaQueryEvaluator = MediaQueryEvaluator { };
61
62 if (root) {
63 m_rootDefaultStyle = styleForElement(*root, m_document.renderStyle(), nullptr, RuleMatchingBehavior::MatchOnlyUserAgentRules).renderStyle;
64--
652.28.0
66
diff --git a/meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch b/meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch
deleted file mode 100644
index d8504c2b36..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport [https://trac.webkit.org/changeset/262368/webkit?format=diff&new=262368]
2CVE: CVE-2020-13753
3Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
4
5Index: a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
6===================================================================
7--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (revision 262367)
8+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (revision 262368)
9@@ -642,5 +642,5 @@
10 int r;
11 if (rule.arg)
12- r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 1, rule.arg);
13+ r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 1, *rule.arg);
14 else
15 r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 0);
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.28.4.bb
index cf6b2ffae7..2e3f0aa682 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.28.4.bb
@@ -19,10 +19,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
19 file://cross-compile.patch \ 19 file://cross-compile.patch \
20 file://0001-Fix-build-with-musl.patch \ 20 file://0001-Fix-build-with-musl.patch \
21 file://include_array.patch \ 21 file://include_array.patch \
22 file://CVE-2020-13753.patch \ 22 file://0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch \
23 file://0001-MiniBrowser-Fix-reproduciblity.patch \
23 " 24 "
24SRC_URI[md5sum] = "ec0ef870ca37e3a5ebbead2f268a28ec" 25SRC_URI[sha256sum] = "821952e8c9303ed752f1fb1d4283f612c25249d00d705d2b79c2db1bc49c9464"
25SRC_URI[sha256sum] = "b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd"
26 26
27inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc 27inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
28 28
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 21:05:28 +0000