diff options
Diffstat (limited to 'poky/meta/recipes-sato')
28 files changed, 87 insertions, 327 deletions
diff --git a/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb b/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb index f19d03896b..50f6da24f3 100644 --- a/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb +++ b/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "gtk+3 intltool-native gettext-native" PV = "0.8.18.1.11+git${SRCPV}" -SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git" +SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master;protocol=https" SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch b/poky/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch new file mode 100644 index 0000000000..d3a458f100 --- /dev/null +++ b/poky/meta/recipes-sato/libptytty/libptytty/0001-CMakeLists.txt-do-not-run-cross-binary.patch @@ -0,0 +1,24 @@ +From 989ae1f3651686c1f1046fe1c1596d564c3f452d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 13 Dec 2021 14:33:01 +0100 +Subject: [PATCH] CMakeLists.txt: do not run cross-binary + +Upstream-Status: Inappropriate [issue reported at https://github.com/yusiwen/libptytty/issues/2] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1ad6c0..3bd4d97 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -271,7 +271,7 @@ if(NOT HAVE_UNIX_FDPASS) + message(FATAL_ERROR "libptytty requires unix-compliant filehandle passing ability") + endif() + +-check_c_source_runs( ++check_c_source_compiles( + " + #include <grp.h> + #include <sys/stat.h> diff --git a/poky/meta/recipes-sato/libptytty/libptytty_2.0.bb b/poky/meta/recipes-sato/libptytty/libptytty_2.0.bb new file mode 100644 index 0000000000..85e3a36fba --- /dev/null +++ b/poky/meta/recipes-sato/libptytty/libptytty_2.0.bb @@ -0,0 +1,13 @@ +SUMMARY = " OS independent and secure pty/tty and utmp/wtmp/lastlog handling" +HOMEPAGE = "http://software.schmorp.de/pkg/libptytty.html" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +SRC_URI = "http://dist.schmorp.de/libptytty/libptytty-${PV}.tar.gz \ + file://0001-CMakeLists.txt-do-not-run-cross-binary.patch \ + " +SRC_URI[sha256sum] = "8033ed3aadf28759660d4f11f2d7b030acf2a6890cb0f7926fb0cfa6739d31f7" + +inherit cmake + +EXTRA_OECMAKE:append:libc-musl = " -DWTMP_SUPPORT=OFF" diff --git a/poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index d5fe9b5dce..8f3151bfc9 100644 --- a/poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +++ b/poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb @@ -11,7 +11,7 @@ RDEPENDS:${PN} = "settings-daemon" # SRCREV tagged 0.2 SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" -SRC_URI = "git://git.yoctoproject.org/${BPN} \ +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ file://no-handed.patch" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" diff --git a/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb index 79ccb0391b..c85f0440b1 100644 --- a/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +++ b/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb @@ -13,7 +13,7 @@ SECTION = "x11/wm" # SRCREV tagged 2.2 SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" -SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ +SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \ file://vfolders/ \ " diff --git a/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb index c6de14e34e..49f9fdbb36 100644 --- a/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb +++ b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb @@ -23,7 +23,7 @@ RPROVIDES:${PN} = "matchbox-panel" RREPLACES:${PN} = "matchbox-panel" RCONFLICTS:${PN} = "matchbox-panel" -SRC_URI = "git://git.yoctoproject.org/${BPN} \ +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ " diff --git a/poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb index 9f00281dde..e2e81c2905 100644 --- a/poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +++ b/poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb @@ -11,7 +11,7 @@ SECTION = "x11/utils" #SRCREV tagged 0.2 SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5" -SRC_URI = "git://git.yoctoproject.org/${BPN}" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb index 7a043d3447..bc4024736f 100644 --- a/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb +++ b/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb @@ -2,7 +2,7 @@ require matchbox-theme-sato.inc # SRCREV tagged 0.2 SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78" -SRC_URI = "git://git.yoctoproject.org/matchbox-sato" +SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-sato/puzzles/files/0001-malloc-Check-for-excessive-values-to-malloc.patch b/poky/meta/recipes-sato/puzzles/files/0001-malloc-Check-for-excessive-values-to-malloc.patch deleted file mode 100644 index 66af6afa2f..0000000000 --- a/poky/meta/recipes-sato/puzzles/files/0001-malloc-Check-for-excessive-values-to-malloc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1c01a5bc9ac7f8aaa484b1a8e0e74aa5f8899d0e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 8 Nov 2020 11:17:59 -0800 -Subject: [PATCH] malloc: Check for excessive values to malloc - -with whole program optimizers like lto smalloc() -is inlined the excessive constant argument is propagated to -malloc() and ultimately triggers the warning. - -malloc.c:15:9: error: argument 1 range [18446744065119617024, 18446744073709551580] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=] - -therefore add a check before excessive constant argument before calling -malloc - -Note that this will not happen with normal compile since they happen to -be in different translation units and compiler can not semantically -analyze as much - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - malloc.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/malloc.c b/malloc.c -index a7fa7c5..520377c 100644 ---- a/malloc.c -+++ b/malloc.c -@@ -2,6 +2,7 @@ - * malloc.c: safe wrappers around malloc, realloc, free, strdup - */ - -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - #include "puzzles.h" -@@ -12,6 +13,8 @@ - */ - void *smalloc(size_t size) { - void *p; -+ if (size > PTRDIFF_MAX) -+ fatal("exceeds maximum object size"); - p = malloc(size); - if (!p) - fatal("out of memory"); --- -2.29.2 - diff --git a/poky/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch b/poky/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch deleted file mode 100644 index a02d8732ab..0000000000 --- a/poky/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3d78d4cffcdc1242892b6c21c26d1c96938c48d1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 27 Feb 2021 10:02:43 -0800 -Subject: [PATCH] map: Fix stringop-overflow warning - -Fixes - -../git/map.c: In function 'new_game_desc': -../git/map.c:1663:23: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] - 1663 | ret[retlen++] = ','; - | ~~~~~~~~~~~~~~^~~~~ -../git/./map.c: In function 'new_game_desc': -../git/./map.c:1663:23: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] - 1663 | ret[retlen++] = ','; - | ~~~~~~~~~~~~~~^~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - map.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/map.c b/map.c -index 412305c..fa0c493 100644 ---- a/map.c -+++ b/map.c -@@ -1659,8 +1659,10 @@ static char *new_game_desc(const game_params *params, random_state *rs, - } - } - -- ret[retlen++] = 'a'-1 + run; -- ret[retlen++] = ','; -+ if(ret != NULL) { -+ ret[retlen++] = 'a'-1 + run; -+ ret[retlen++] = ','; -+ } - - run = 0; - for (i = 0; i < n; i++) { --- -2.30.1 - diff --git a/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch b/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch deleted file mode 100644 index 143e898a51..0000000000 --- a/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 453587d714473b806473b309727f865b673cbc06 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jan 2016 23:10:19 -0800 -Subject: [PATCH] palisade: Fix warnings with clang on arm - -ARM treats 'char' as unsigned char when 'char' is not qualified with -'signed' or 'unsigned' explicitly. - -This results in warnings e.g. - -palisade.c:531:22: error: comparison of constant -1 with expression of -type 'clue' (aka 'char') is always false -[-Werror,-Wtautological-constant-out-of-range-compare] - if (clues[i] == EMPTY) continue; - -Therefore, typcast the contant to char in such places to be explicit - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Submitted ---- - palisade.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/palisade.c b/palisade.c -index 6ffbf2d..8b54d42 100644 ---- a/palisade.c -+++ b/palisade.c -@@ -304,11 +304,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx) - * If p = q = 3 then the region has size exactly 2. */ - - for (i = 0; i < wh; ++i) { -- if (ctx->clues[i] == EMPTY) continue; -+ if (ctx->clues[i] == (char)EMPTY) continue; - for (dir = 0; dir < 4; ++dir) { - int j = i + dx[dir] + w*dy[dir]; - if (disconnected(ctx, i, j, dir)) continue; -- if (ctx->clues[j] == EMPTY) continue; -+ if (ctx->clues[j] == (char)EMPTY) continue; - if ((8 - ctx->clues[i] - ctx->clues[j] > ctx->params->k) || - (ctx->clues[i] == 3 && ctx->clues[j] == 3 && - ctx->params->k != 2)) -@@ -326,7 +326,7 @@ static bool solver_number_exhausted(solver_ctx *ctx) - bool changed = false; - - for (i = 0; i < wh; ++i) { -- if (ctx->clues[i] == EMPTY) continue; -+ if (ctx->clues[i] == (char)EMPTY) continue; - - if (bitcount[(ctx->borders[i] & BORDER_MASK)] == ctx->clues[i]) { - for (dir = 0; dir < 4; ++dir) { -@@ -538,7 +538,7 @@ static bool is_solved(const game_params *params, clue *clues, - for (i = 0; i < wh; ++i) { - if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, true); - if (dsf_size(dsf, i) != k) goto error; -- if (clues[i] == EMPTY) continue; -+ if (clues[i] == (char)EMPTY) continue; - if (clues[i] != bitcount[border[i] & BORDER_MASK]) goto error; - } - -@@ -685,7 +685,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, - p = numbers; - r = 0; - for (i = 0; i < wh; ++i) { -- if (numbers[i] != EMPTY) { -+ if (numbers[i] != (char)EMPTY) { - while (r) { - while (r > 26) { - *p++ = 'z'; diff --git a/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch b/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch deleted file mode 100644 index 7ca582fe5d..0000000000 --- a/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3af5a1e579e3324a13ba1f892c7befb3ab32d899 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 7 Mar 2019 21:56:57 -0800 -Subject: [PATCH] pattern.c: Change string lenght parameter to be size_t in - do_row() - -This fixes below error on some architectures e.g. RISC-V - -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); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - pattern.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pattern.c b/pattern.c -index ffadd3f..4e5f187 100644 ---- a/pattern.c -+++ b/pattern.c -@@ -428,7 +428,7 @@ static bool do_row(unsigned char *known, unsigned char *deduced, - unsigned char *row, - unsigned char *minpos_done, unsigned char *maxpos_done, - unsigned char *minpos_ok, unsigned char *maxpos_ok, -- unsigned char *start, int len, int step, int *data, -+ unsigned char *start, size_t len, int step, int *data, - unsigned int *changed - #ifdef STANDALONE_SOLVER - , const char *rowcol, int index, int cluewid --- -2.17.1 - diff --git a/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch deleted file mode 100644 index 28040523d4..0000000000 --- a/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 876c6ff1e20f51b0921acda99861f476b6423f26 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 11 Aug 2014 12:39:53 +0800 -Subject: [PATCH] gtk.c: fix compiling failure with option -g -O - -There were compiling failure with option -g -O -... -././gtk.c: In function 'configure_area': -././gtk.c:397:2: error: 'cr' may be used uninitialized in this function [-Werror=maybe-uninitialized] - cairo_set_source_rgb(cr, - ^ -././gtk.c:384:14: note: 'cr' was declared here - cairo_t *cr; - ^ -././gtk.c: In function 'main': -././gtk.c:2911:6: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized] - fprintf(stderr, "%s: %s\n", pname, error); - ^ -cc1: all warnings being treated as errors -... - -Initialized pointer 'cr' and 'error' with NULL - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - gtk.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk.c b/gtk.c -index 4565836..5e83b48 100644 ---- a/gtk.c -+++ b/gtk.c -@@ -2944,7 +2944,7 @@ static void list_presets_from_menu(struct preset_menu *menu) - int main(int argc, char **argv) - { - char *pname = argv[0]; -- char *error; -+ char *error = NULL; - int ngenerate = 0, px = 1, py = 1; - bool print = false; - bool time_generation = false, test_solve = false, list_presets = false; diff --git a/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch b/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch deleted file mode 100644 index 7218d620ec..0000000000 --- a/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch +++ /dev/null @@ -1,25 +0,0 @@ -puzzles: avoid compiler unitialized variable error - -The compiler does not realize that we must go through the while() -loop at least once, so we replace it with a for() loop. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- a/tree234.c -+++ b/tree234.c -@@ -326,8 +326,11 @@ static void *add234_internal(tree234 *t, - return orig_e; - } - -- n = t->root; -- while (n) { -+ /* -+ * We know t->root is not NULL. The logic -+ * to break out of this is at the end of the loop. -+ */ -+ for (n = t->root;;) { - LOG((" node %p: %p/%d \"%s\" %p/%d \"%s\" %p/%d \"%s\" %p/%d\n", - n, - n->kids[0], n->counts[0], n->elems[0], diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb index 1355630cf4..0bf878fc96 100644 --- a/poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -7,17 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=6e7d24cf1c949887ee9447a1e2a4a24c" # gtk support includes a bunch of x11 headers REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main \ - file://fix-compiling-failure-with-option-g-O.patch \ - file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ - file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \ - file://fix-ki-uninitialized.patch \ - file://0001-malloc-Check-for-excessive-values-to-malloc.patch \ - file://0001-map-Fix-stringop-overflow-warning.patch \ - " +SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main" UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "ad1c6ade2af0e681fb964a17cc3a031951047068" +SRCREV = "229d062d6ce63f0a5e00d2de62ee0fb389ccfdb6" PE = "2" PV = "0.0+git${SRCPV}" diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 69b8a659ed..e7d520ebef 100644 --- a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -6,7 +6,7 @@ terminal emulator rxvt, modified to store text in Unicode \ output. It also supports mixing multiple fonts at the \ same time, including Xft fonts." HOMEPAGE = "https://rxvt.org/" -DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu" +DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch \ @@ -22,7 +22,6 @@ ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" CFLAGS:append = " -fpermissive" EXTRA_OECONF = "--enable-xim \ - --enable-utmp --enable-wtmp --enable-lastlog \ --with-term=rxvt --enable-keepscrolling \ --enable-xft --with-name=rxvt --enable-frills \ --enable-swapscreen --enable-transparency \ @@ -31,8 +30,6 @@ EXTRA_OECONF = "--enable-xim \ --enable-combining --disable-perl \ --with-x=${STAGING_DIR_HOST}${prefix}" -EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" - PACKAGECONFIG ??= "" PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.26.bb b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.30.bb index 3fe69a543f..0133029e0a 100644 --- a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.26.bb +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.30.bb @@ -4,5 +4,5 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/main.C;beginline=1;endline=31;md5=d3600d7ee1062667fcd1193fbe6485f6" -SRC_URI[sha256sum] = "643116b9a25d29ad29f4890131796d42e6d2d21312282a613ef66c80c5b8c98b" +SRC_URI[sha256sum] = "fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d" diff --git a/poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb b/poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb index b2913b4ed5..7fd9272bf4 100644 --- a/poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +++ b/poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb @@ -11,7 +11,7 @@ DEPENDS = "matchbox-panel-2 gtk+3" # SRCREV tagged 0.3 SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756" -SRC_URI = "git://git.yoctoproject.org/screenshot" +SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index 742364f699..77ecd3fe9f 100644 --- a/poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb @@ -9,7 +9,7 @@ SECTION = "x11" # SRCREV tagged 0.0.2 SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" -SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ +SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master \ file://addsoundkeys.patch \ file://70settings-daemon.sh \ " diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch index fae3b0b2e5..54d34b1c69 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch @@ -4,7 +4,7 @@ Date: Tue, 27 Oct 2015 16:02:19 +0200 Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained from pkg-config with PKG_CONFIG_SYSROOT_DIR -Upstream-Status: Pending [review on oe-core list] +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232933] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- Source/cmake/FindGObjectIntrospection.cmake | 1 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch index e4c7d77ccd..09256951f4 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch @@ -16,7 +16,7 @@ Subject: [PATCH] Fix build without opengl-or-es but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was enabled only inside if (USE_OPENGL_OR_ES) -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232934] --- .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- .../DrawingAreaProxyCoordinatedGraphics.h | 2 +- diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch index 0c31c5fa21..e06607ba2b 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch @@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 29 Aug 2016 16:38:11 +0300 Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232935] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch index 3e03aa968c..9e2bf09dd7 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch @@ -7,7 +7,7 @@ Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the g-ir-compiler is using a C compiler internally, so it needs to set the proper flags for it. -Upstream-Status: Pending [review on oe-core list] +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232936] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/poky/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch deleted file mode 100644 index e7a4cc25ad..0000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2cc9d445b4c8eb70c2ab6c1723dfd208218f103e Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Fri, 6 Nov 2020 04:38:13 +0100 -Subject: [PATCH] webkitgtk: fix build with x11 enabled - -Since -https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 -it uses XVisualInfo which is defined in Xutil.h - -Without this the build fails with: -webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: 'XVisualInfo' was not declared in this scope; did you mean 'VisualID'? - 132 | XVisualInfo visualTemplate; - | ^~~~~~~~~~~ - | VisualID - -Upstream-Status: Pending -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - ---- - Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -index bad56eba..fc141f98 100644 ---- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -@@ -31,6 +31,7 @@ - #if PLATFORM(X11) - #include <X11/Xatom.h> - #include <X11/Xlib.h> -+#include <X11/Xutil.h> - #include <X11/extensions/Xcomposite.h> - #if PLATFORM(GTK) - #include <X11/Xutil.h> diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch b/poky/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch index aa11c131d2..907d36c4cd 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch @@ -3,7 +3,7 @@ From: Alberto Garcia <berto@igalia.com> Date: Sun, 25 Apr 2021 18:45:13 +0000 Subject: [PATCH] Reduce memory usage when not using the Gold linker -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232938] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/poky/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch new file mode 100644 index 0000000000..e866a1a193 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch @@ -0,0 +1,22 @@ +Injection a year based on the current date isn't reproducible. Hack this +to a specific year for now for reproducibilty and to avoid autobuilder failures. + +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and +then this could be submitted upstream, sadly my ruby isn't up to that. + +Upstream-Status: Pending [could be reworked] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +=================================================================== +--- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb ++++ webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +@@ -25,7 +25,7 @@ require 'date' + require 'digest' + + $LICENSE = <<-EOF +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. ++Copyright (C) 2021 Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.34.3.bb index 4e2562df14..4b3d89ad82 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.34.3.bb @@ -15,13 +15,13 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ - file://include_xutil.patch \ file://reduce-memory-overheads.patch \ file://musl-lower-stack-usage.patch \ file://0001-Fix-build-without-opengl-or-es.patch \ + file://reproducibility.patch \ " -SRC_URI[sha256sum] = "443c1316705de024741748e85fe32324d299d9ee68e6feb340b89e4a04073dee" +SRC_URI[sha256sum] = "0d2f37aa32e21a36e4dd5a5ce7ae5ce27435c29d6803b962b8c90cb0cc49c52d" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc @@ -39,7 +39,6 @@ DEPENDS = " \ atk \ libwebp \ gtk+3 \ - libsoup \ libxslt \ libtasn1 \ libnotify \ @@ -47,12 +46,14 @@ DEPENDS = " \ gstreamer1.0-plugins-base \ " +PACKAGECONFIG_SOUP ?= "soup2" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ enchant \ libsecret \ + ${PACKAGECONFIG_SOUP} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" @@ -71,6 +72,8 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" # webkitgtk is full of /usr/bin/env python, particular for generating docs do_configure[postfuncs] += "setup_python_link" @@ -125,7 +128,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " SECURITY_CFLAGS:remove:aarch64 = "-fpie" SECURITY_CFLAGS:append:aarch64 = " -fPIE" -FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so" +FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" diff --git a/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb b/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb index ba6c54412a..4a18467ea4 100644 --- a/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb +++ b/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb @@ -15,6 +15,10 @@ REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "6239c9c15523410798d66315de6b491712ab30009ba180f3e0dd076d9b0074ac" +# Especially helps compiling with clang which enable this as error when +# using c++11 +CXXFLAGS += "-Wno-c++11-narrowing" + # This is a tweak of upstream-version-is-even needed because # ipstream directory contains tarballs for other components as well. UPSTREAM_CHECK_REGEX = "wpebackend-fdo-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" |