From patchwork Tue Mar 28 10:31:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 21863 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F8D4C77B60 for ; Tue, 28 Mar 2023 10:32:45 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web11.62881.1679999555111889306 for ; Tue, 28 Mar 2023 03:32:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd74.dcpf.telekom.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout01.t-online.de (Postfix) with SMTP id CA66211470 for ; Tue, 28 Mar 2023 12:32:32 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.35.166]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ph6cx-17U9EP0; Tue, 28 Mar 2023 12:32:31 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv5 1/8] glib-2.0: update 2.74.6 -> 2.76.1 Date: Tue, 28 Mar 2023 12:31:37 +0200 Message-Id: <20230328103144.5757-1-f_L_K@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1679999551-8556AC08-58DF2612/0/0 CLEAN NORMAL X-TOI-MSGID: 22c1694a-5bdf-4d86-b9fc-30748c79f193 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 28 Mar 2023 10:32:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179224 From: Markus Volk --- ...-info-don-t-assume-million-in-one-ev.patch | 50 ------------ ...build-do-not-use-can_run_host_binari.patch | 48 ------------ .../glib-2.0/glib-2.0/cpp-null.patch | 77 ------------------- .../glib-2.0/glib-2.0/cpp-null2.patch | 31 -------- .../glib-2.0/glib-2.0/relocate-modules.patch | 11 ++- ...{glib-2.0_2.74.6.bb => glib-2.0_2.76.1.bb} | 6 +- 6 files changed, 8 insertions(+), 215 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.74.6.bb => glib-2.0_2.76.1.bb} (87%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch deleted file mode 100644 index 57ada66907..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3c56ff21b9a5fe18f9cec9b97ae1788fdf5d563e Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 6 Jul 2021 19:26:03 +0100 -Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2990] -Signed-off-by: Ross Burton - - don't happen - -The access and creation time tests create a file, gets the time in -seconds, then gets the time in microseconds and assumes that the -difference between the two has to be above 0. - -As rare as this may be, it can happen: - -$ stat g-file-info-test-50A450 -c %y -2021-07-06 18:24:56.000000767 +0100 - -Change the test to simply assert that the difference not negative to -handle this case. - -This is the same fix as 289f8b, but that was just modification time. - ---- - gio/tests/g-file-info.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c -index d9ad045..c9b12b0 100644 ---- a/gio/tests/g-file-info.c -+++ b/gio/tests/g-file-info.c -@@ -307,7 +307,7 @@ test_g_file_info_access_time (void) - g_assert_nonnull (dt_usecs); - - ts = g_date_time_difference (dt_usecs, dt); -- g_assert_cmpint (ts, >, 0); -+ g_assert_cmpint (ts, >=, 0); - g_assert_cmpint (ts, <, G_USEC_PER_SEC); - - /* Try again with nanosecond precision. */ -@@ -442,7 +442,7 @@ test_g_file_info_creation_time (void) - g_assert_nonnull (dt_usecs); - - ts = g_date_time_difference (dt_usecs, dt); -- g_assert_cmpint (ts, >, 0); -+ g_assert_cmpint (ts, >=, 0); - g_assert_cmpint (ts, <, G_USEC_PER_SEC); - - /* Try again with nanosecond precision. */ diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch deleted file mode 100644 index db08b5af55..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fdbffaea2fa85c203cc6aacb5734acac65aeaa19 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 11 Nov 2022 13:12:42 +0100 -Subject: [PATCH] tests/meson.build: do not use can_run_host_binaries() - -can_run_host_binaries() returns true even when cross compiling, -if there is an executable wrapper defined that can run -cross-binaries under some kind of emulation. - -Unfortunately, custom_target() will not use the wrapper -and will attempt to execute the command directly. Until -this is addressed in meson upstream, we have to disable -these targets in cross scenarios. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3067] -Signed-off-by: Alexander Kanavin - ---- - gio/tests/meson.build | 2 +- - glib/tests/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 49cfa25ce..ea59656f9 100644 ---- a/gio/tests/meson.build -+++ b/gio/tests/meson.build -@@ -652,7 +652,7 @@ if installed_tests_enabled - endforeach - endif - --if meson.can_run_host_binaries() -+if not meson.is_cross_build() - - compiler_type = '--compiler=@0@'.format(cc.get_id()) - -diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 69508178e..e4f75f302 100644 ---- a/glib/tests/meson.build -+++ b/glib/tests/meson.build -@@ -411,7 +411,7 @@ executable('testing-helper', 'testing-helper.c', - ) - - # some testing of gtester functionality --if meson.can_run_host_binaries() and host_system != 'windows' -+if not meson.is_cross_build() and host_system != 'windows' - xmllint = find_program('xmllint', required: false) - if xmllint.found() - tmpsample_xml = custom_target('tmpsample.xml', diff --git a/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch b/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch deleted file mode 100644 index 63cbf90ab2..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0ca5254c5d92aec675b76b4bfa72a6885cde6066 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Sat, 29 Oct 2022 04:30:52 +0200 -Subject: [PATCH] glib/gmacros: Always define NULL as nullptr in C++11 and - newer - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066] -Signed-off-by: Alexander Kanavin ---- - glib/gmacros.h | 9 ++++++++- - glib/tests/cxx.cpp | 13 ------------- - 2 files changed, 8 insertions(+), 14 deletions(-) - -diff --git a/glib/gmacros.h b/glib/gmacros.h -index 5302841105..9fe8270822 100644 ---- a/glib/gmacros.h -+++ b/glib/gmacros.h -@@ -870,10 +870,17 @@ - */ - #ifndef NULL - # ifdef __cplusplus --# define NULL (0L) -+# if __cplusplus >= 201103L -+# define NULL (nullptr) -+# else -+# define NULL (0L) -+# endif /* __cplusplus >= 201103L */ - # else /* !__cplusplus */ - # define NULL ((void*) 0) - # endif /* !__cplusplus */ -+#elif defined (__cplusplus) && __cplusplus >= 201103L -+# undef NULL -+# define NULL (nullptr) - #endif - - #ifndef FALSE -diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp -index 6ac60791c8..045457c6e2 100644 ---- a/glib/tests/cxx.cpp -+++ b/glib/tests/cxx.cpp -@@ -34,21 +34,12 @@ test_typeof (void) - MyObject *obj3 = g_atomic_pointer_get (&obj2); - g_assert_true (obj3 == obj); - --#if __cplusplus >= 201103L -- MyObject *obj4 = nullptr; --#else - MyObject *obj4 = NULL; --#endif - g_atomic_pointer_set (&obj4, obj3); - g_assert_true (obj4 == obj); - --#if __cplusplus >= 201103L -- MyObject *obj5 = nullptr; -- g_atomic_pointer_compare_and_exchange (&obj5, nullptr, obj4); --#else - MyObject *obj5 = NULL; - g_atomic_pointer_compare_and_exchange (&obj5, NULL, obj4); --#endif - g_assert_true (obj5 == obj); - - MyObject *obj6 = g_steal_pointer (&obj5); -@@ -195,11 +186,7 @@ test_steal_pointer (void) - int - main (int argc, char *argv[]) - { --#if __cplusplus >= 201103L -- g_test_init (&argc, &argv, nullptr); --#else - g_test_init (&argc, &argv, NULL); --#endif - - g_test_add_func ("/C++/typeof", test_typeof); - g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); --- -GitLab - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch b/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch deleted file mode 100644 index 763d5ce539..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7dc19632f3115e3f517c6bc80436fe72c1dcdeb4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Sat, 29 Oct 2022 04:16:00 +0200 -Subject: [PATCH] glib/tests/cxx: Ensure NULL is always casted to a pointer - type - -Otherwise it may not be recognized as valid sentinel -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4] -Signed-off-by: Alexander Kanavin ---- - glib/tests/cxx.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp -index 045457c6e2..aa5e0cb576 100644 ---- a/glib/tests/cxx.cpp -+++ b/glib/tests/cxx.cpp -@@ -186,7 +186,11 @@ test_steal_pointer (void) - int - main (int argc, char *argv[]) - { -+#if __cplusplus >= 201103L - g_test_init (&argc, &argv, NULL); -+#else -+ g_test_init (&argc, &argv, static_cast(NULL)); -+#endif - - g_test_add_func ("/C++/typeof", test_typeof); - g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); --- -GitLab diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index ae6881b61e..4a2eb3b1a7 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -14,6 +14,9 @@ Signed-off-by: Ross Burton Port patch to 2.48 Signed-off-by: Jussi Kukkonen +Port patch to 2.75 +Signed-off-by: Markus Volk + --- gio/giomodule.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) @@ -31,7 +34,7 @@ index f5dbb45..c926e77 100644 #endif #include -@@ -1261,7 +1263,15 @@ get_gio_module_dir (void) +@@ -1270,7 +1272,15 @@ NULL); g_free (install_dir); #else @@ -45,6 +48,6 @@ index f5dbb45..c926e77 100644 + } else { + module_dir = g_strdup (GIO_MODULE_DIR); + } - #endif - } - + #ifdef __APPLE__ + #include "TargetConditionals.h" + #if TARGET_OS_OSX diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.76.1.bb similarity index 87% rename from meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.76.1.bb index 5b79ae481c..1238b57c70 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.76.1.bb @@ -14,14 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch \ - file://0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch \ - file://cpp-null.patch \ - file://cpp-null2.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "069cf7e51cd261eb163aaf06c8d1754c6835f31252180aff5814e5afc7757fbc" +SRC_URI[sha256sum] = "43dc0f6a126958f5b454136c4398eab420249c16171a769784486e25f2fda19f" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. From patchwork Tue Mar 28 10:31:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 21860 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F7B9C761A6 for ; Tue, 28 Mar 2023 10:32:45 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web10.62743.1679999554987920784 for ; Tue, 28 Mar 2023 03:32:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd74.dcpf.telekom.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout01.t-online.de (Postfix) with SMTP id D948511471 for ; Tue, 28 Mar 2023 12:32:32 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.35.166]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ph6cx-17U9EQ0; Tue, 28 Mar 2023 12:32:31 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv5 2/8] gtk4: update 4.10.0 -> 4.10.1 Date: Tue, 28 Mar 2023 12:31:38 +0200 Message-Id: <20230328103144.5757-2-f_L_K@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328103144.5757-1-f_L_K@t-online.de> References: <20230328103144.5757-1-f_L_K@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1679999551-8556AC08-8C7CA558/0/0 CLEAN NORMAL X-TOI-MSGID: 3a3cd19b-9ff3-49f9-96c1-8d756aa8b03a List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 28 Mar 2023 10:32:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179221 From: Markus Volk Overview of Changes in 4.10.1, 14-03-2023 ========================================= * GtkFileChooser - Improve search performance - Be safe against pathless files - Fix memory leaks - Only show local files in recent files - Show most recent files first - Make files non-selectable in selet_folder mode * GtkListView / GtkColumnView / GtkGridView - Fix scrolling problems - Support CSS border-spacing * GtkComboBox - Fix a size allocation problem * gtk - Size allocation fixes * Accessibility - Miscellaneous property fixes and improvements * Wayland - Fix an ordering problem in surface disposal * Windows - Fix Visual Studio build with older GLib * Translation updates Basque Bulgarian Catalan Czech Danish Finnish Friulian Galician Georgian Hungarian Lithuanian Polish Portuguese Swedish Turkish Ukrainian Signed-off-by: Markus Volk --- meta/recipes-gnome/gtk+/{gtk4_4.10.0.bb => gtk4_4.10.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-gnome/gtk+/{gtk4_4.10.0.bb => gtk4_4.10.1.bb} (98%) diff --git a/meta/recipes-gnome/gtk+/gtk4_4.10.0.bb b/meta/recipes-gnome/gtk+/gtk4_4.10.1.bb similarity index 98% rename from meta/recipes-gnome/gtk+/gtk4_4.10.0.bb rename to meta/recipes-gnome/gtk+/gtk4_4.10.1.bb index d58fe149ec..d28630ad0b 100644 --- a/meta/recipes-gnome/gtk+/gtk4_4.10.0.bb +++ b/meta/recipes-gnome/gtk+/gtk4_4.10.1.bb @@ -37,7 +37,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" UPSTREAM_CHECK_REGEX = "gtk-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" -SRC_URI[sha256sum] = "8dc1e7c3b3a46772f0fa416a8ca3fd21d0d0b3b03fb307d2e7327ebee69626e4" +SRC_URI[sha256sum] = "e8fcac04bc7715b9da667c911a5ee8f262e200d1d6a50adf23645ca8cfcd0311" S = "${WORKDIR}/gtk-${PV}" From patchwork Tue Mar 28 10:31:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 21859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0261C77B62 for ; Tue, 28 Mar 2023 10:32:45 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web10.62744.1679999555215460391 for ; Tue, 28 Mar 2023 03:32:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd74.dcpf.telekom.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout01.t-online.de (Postfix) with SMTP id DCCAA1A11A for ; Tue, 28 Mar 2023 12:32:32 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.35.166]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ph6cx-17U9ER0; Tue, 28 Mar 2023 12:32:31 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv5 3/8] glib-networking: update 2.74.0 -> 2.76.0 Date: Tue, 28 Mar 2023 12:31:39 +0200 Message-Id: <20230328103144.5757-3-f_L_K@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328103144.5757-1-f_L_K@t-online.de> References: <20230328103144.5757-1-f_L_K@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1679999551-8556AC08-CBB03DB4/0/0 CLEAN NORMAL X-TOI-MSGID: c1bf589c-dcbf-4fed-bcba-f1e135b84de3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 28 Mar 2023 10:32:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179223 From: Markus Volk Signed-off-by: Markus Volk --- .../{glib-networking_2.74.0.bb => glib-networking_2.76.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/glib-networking/{glib-networking_2.74.0.bb => glib-networking_2.76.0.bb} (93%) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.76.0.bb similarity index 93% rename from meta/recipes-core/glib-networking/glib-networking_2.74.0.bb rename to meta/recipes-core/glib-networking/glib-networking_2.76.0.bb index dc0be23357..c1dc0bcbde 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.76.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "glib-2.0-native glib-2.0" -SRC_URI[archive.sha256sum] = "1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b" +SRC_URI[archive.sha256sum] = "149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a" PACKAGECONFIG ??= "openssl ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" From patchwork Tue Mar 28 10:31:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 21861 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CB6FC76196 for ; Tue, 28 Mar 2023 10:32:45 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web10.62747.1679999556550034105 for ; Tue, 28 Mar 2023 03:32:36 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd74.dcpf.telekom.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout01.t-online.de (Postfix) with SMTP id DFFFB1A11B for ; Tue, 28 Mar 2023 12:32:32 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.35.166]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ph6cx-17U9ES0; Tue, 28 Mar 2023 12:32:31 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv5 4/8] gsettings-desktop-schemas: update 43.0 -> 44.0 Date: Tue, 28 Mar 2023 12:31:40 +0200 Message-Id: <20230328103144.5757-4-f_L_K@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328103144.5757-1-f_L_K@t-online.de> References: <20230328103144.5757-1-f_L_K@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1679999551-8556AC08-EBBF798D/0/0 CLEAN NORMAL X-TOI-MSGID: 7895a6e9-0e90-4567-9e87-ebf11da8e6e4 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 28 Mar 2023 10:32:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179226 From: Markus Volk Signed-off-by: Markus Volk --- ...esktop-schemas_43.0.bb => gsettings-desktop-schemas_44.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_43.0.bb => gsettings-desktop-schemas_44.0.bb} (85%) diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_43.0.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_44.0.bb similarity index 85% rename from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_43.0.bb rename to meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_44.0.bb index 966a67fead..8e30d5e524 100644 --- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_43.0.bb +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_44.0.bb @@ -13,4 +13,4 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext -SRC_URI[archive.sha256sum] = "5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe" +SRC_URI[archive.sha256sum] = "eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e" From patchwork Tue Mar 28 10:31:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 21864 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91083C76195 for ; Tue, 28 Mar 2023 10:32:45 +0000 (UTC) Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by mx.groups.io with SMTP id smtpd.web10.62742.1679999554883509700 for ; Tue, 28 Mar 2023 03:32:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.84, mailfrom: f_l_k@t-online.de) Received: from fwd74.dcpf.telekom.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout09.t-online.de (Postfix) with SMTP id DC3E61C45E for ; Tue, 28 Mar 2023 12:32:32 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.35.166]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ph6cy-17U9EU0; Tue, 28 Mar 2023 12:32:32 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv5 6/8] webkitgtk: update 2.38.5 -> 2.40.0 Date: Tue, 28 Mar 2023 12:31:42 +0200 Message-Id: <20230328103144.5757-6-f_L_K@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328103144.5757-1-f_L_K@t-online.de> References: <20230328103144.5757-1-f_L_K@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1679999552-8556AC08-3BB696E6/0/0 CLEAN NORMAL X-TOI-MSGID: 1ab21cb5-d141-4890-8f3c-fcce6b686d02 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 28 Mar 2023 10:32:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179222 From: Markus Volk - added PACKAGECONFIGs for av1 support, gamepad and sandboxing - cmake tries to find where bwrap and xdg-dbus-proxy are located on target and reads the path from ${STAGING_BINDIR_NATIVE}. This breaks reproducibility and runtime. Fix by adding the needed paths manually. - ccache seems to be working well now. Enable by default. It significantly improves buildtime on rebuilds. - webkitgtk can be built with both, gtk+3 and gtk4 but it cant be built with support for both at once. there are still some packages that require the gtk3 variant, nameably surf, gnome-online-accounts and wxwidgets while ephiphany for example has a hard dependency on webkitgtk built with gtk4. This is why we need to provide recipes for both variants. If built with gtk+3 webkitgtk provides the 4.0 api, if built with gtk4 it'll provide the 6.0 api. The only conflicting file between those two is the WebKitWebDriver binary. This was renamed for the gtk3 variant so both variants can be installed into the same image. - update dependencies - wpebackend-fdo: update - add fixes that have been sent by kai.kang@eng.windriver.com - add fix for riscv64 that has been sent by raj.khem@gmail.com Signed-off-by: Markus Volk --- meta/conf/distro/include/maintainers.inc | 1 + ...spection.cmake-prefix-variables-obta.patch | 0 ...ibGcrypt.cmake-check-PC_GCRYPT_FOUND.patch | 34 ++++ ...44e17d258106617b0e6d783d073b188a2548.patch | 32 +++- .../webkit/files/disable_wasm_riscv64.patch | 24 +++ .../reproducibility.patch | 0 .../recipes-sato/webkit/webkitgtk-3_2.40.0.bb | 173 ++++++++++++++++++ ...bb461f040b90453bc4e100dcf967243ecd98.patch | 30 --- ...ebkitgtk_2.38.5.bb => webkitgtk_2.40.0.bb} | 78 ++++---- ...fdo_1.14.0.bb => wpebackend-fdo_1.14.1.bb} | 2 +- 10 files changed, 296 insertions(+), 78 deletions(-) rename meta/recipes-sato/webkit/{webkitgtk => files}/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch (100%) create mode 100644 meta/recipes-sato/webkit/files/0001-FindLibGcrypt.cmake-check-PC_GCRYPT_FOUND.patch rename meta/recipes-sato/webkit/{webkitgtk => files}/0d3344e17d258106617b0e6d783d073b188a2548.patch (87%) create mode 100644 meta/recipes-sato/webkit/files/disable_wasm_riscv64.patch rename meta/recipes-sato/webkit/{webkitgtk => files}/reproducibility.patch (100%) create mode 100644 meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb delete mode 100644 meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch rename meta/recipes-sato/webkit/{webkitgtk_2.38.5.bb => webkitgtk_2.40.0.bb} (71%) rename meta/recipes-sato/webkit/{wpebackend-fdo_1.14.0.bb => wpebackend-fdo_1.14.1.bb} (90%) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 682ec2cfdf..2ad209ad0e 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -826,6 +826,7 @@ RECIPE_MAINTAINER:pn-wayland = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-wayland-protocols = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-wayland-utils = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-webkitgtk = "Alexander Kanavin " +RECIPE_MAINTAINER:pn-webkitgtk-3 = "Markus Volk " RECIPE_MAINTAINER:pn-weston = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-weston-init = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-wget = "Yi Zhao " diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch similarity index 100% rename from meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch rename to meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch diff --git a/meta/recipes-sato/webkit/files/0001-FindLibGcrypt.cmake-check-PC_GCRYPT_FOUND.patch b/meta/recipes-sato/webkit/files/0001-FindLibGcrypt.cmake-check-PC_GCRYPT_FOUND.patch new file mode 100644 index 0000000000..dc56bbb92c --- /dev/null +++ b/meta/recipes-sato/webkit/files/0001-FindLibGcrypt.cmake-check-PC_GCRYPT_FOUND.patch @@ -0,0 +1,34 @@ +Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/11913] + +Signed-off-by: Kai Kang + +From de30f1a1caf81902d254e046e382f9cf9cd62c58 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Fri, 24 Mar 2023 17:58:29 +0800 +Subject: [PATCH] FindLibGcrypt.cmake: check PC_GCRYPT_FOUND + +After `pkg_check_modules(PC_GCRYPT QUIET libgcrypt)` in +FindLibGcrypt.cmake, PC_GCRYPT_FOUND will be set but PC_GCRYPT is kept +empty. So check PC_GCRYPT_FOUND instead. + +Signed-off-by: Kai Kang +--- + Source/cmake/FindLibGcrypt.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/cmake/FindLibGcrypt.cmake b/Source/cmake/FindLibGcrypt.cmake +index 8bee72963902..2e84cfc4e9b1 100644 +--- a/Source/cmake/FindLibGcrypt.cmake ++++ b/Source/cmake/FindLibGcrypt.cmake +@@ -49,7 +49,7 @@ if (PkgConfig_FOUND) + set(LibGcrypt_VERSION ${PC_GCRYPT_VERSION}) + endif () + +-if (LIBGCRYPTCONFIG_SCRIPT AND NOT PC_GCRYPT) ++if (LIBGCRYPTCONFIG_SCRIPT AND NOT PC_GCRYPT_FOUND) + execute_process( + COMMAND "${LIBGCRYPTCONFIG_SCRIPT}" --prefix + RESULT_VARIABLE CONFIGSCRIPT_RESULT +-- +2.34.1 + diff --git a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch b/meta/recipes-sato/webkit/files/0d3344e17d258106617b0e6d783d073b188a2548.patch similarity index 87% rename from meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch rename to meta/recipes-sato/webkit/files/0d3344e17d258106617b0e6d783d073b188a2548.patch index 32f92f7ff5..d47e7ac419 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch +++ b/meta/recipes-sato/webkit/files/0d3344e17d258106617b0e6d783d073b188a2548.patch @@ -35,14 +35,16 @@ Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] Signed-off-by: Khem Raj .../cpu/arm/filters/FELightingNEON.cpp | 4 +- - .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- + .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 7 files changed, 57 insertions(+), 36 deletions(-) + 7 files changed, 56 insertions(+), 35 deletions(-) +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +index f6ff8c20..42a97ffc 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() @@ -63,6 +65,8 @@ Signed-off-by: Khem Raj { // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +index b17c603d..e4629cda 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ @@ -104,7 +108,7 @@ Signed-off-by: Khem Raj 0, 0, 0, -@@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeo +@@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set light source arguments. floatArguments.constOne = 1; @@ -133,7 +137,7 @@ Signed-off-by: Khem Raj floatArguments.lightX = spotLightSource.position().x(); floatArguments.lightY = spotLightSource.position().y(); floatArguments.lightZ = spotLightSource.position().z(); -@@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeo +@@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS if (spotLightSource.specularExponent() == 1) neonData.flags |= FLAG_CONE_EXPONENT_IS_1; } else { @@ -142,7 +146,7 @@ Signed-off-by: Khem Raj floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); -@@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeo +@@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set lighting arguments. floatArguments.surfaceScale = data.surfaceScale; floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; @@ -192,16 +196,18 @@ Signed-off-by: Khem Raj } parallelJobs.execute(); return; -@@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeo +@@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS } // namespace WebCore #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) - -#endif // FELightingNEON_h +diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h +index 70c6512f..b032c82e 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -@@ -25,6 +25,10 @@ - #include "LightSource.h" +@@ -26,6 +26,10 @@ + #include #include +namespace WTF { @@ -211,6 +217,8 @@ Signed-off-by: Khem Raj namespace WebCore { class DistantLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h +index 53beb596..e78a9354 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ @@ -222,7 +230,7 @@ Signed-off-by: Khem Raj class FELighting : public FilterEffect { public: const Color& lightingColor() const { return m_lightingColor; } -@@ -67,11 +65,6 @@ protected: +@@ -64,11 +62,6 @@ protected: std::unique_ptr createSoftwareApplier() const override; @@ -234,6 +242,8 @@ Signed-off-by: Khem Raj Color m_lightingColor; float m_surfaceScale; float m_diffuseConstant; +diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h +index 3a5723f0..675d63f5 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ @@ -247,6 +257,8 @@ Signed-off-by: Khem Raj namespace WebCore { class PointLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h +index 684626f7..dea58389 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ @@ -260,6 +272,8 @@ Signed-off-by: Khem Raj namespace WebCore { class SpotLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +index c974d921..e2896660 100644 --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ diff --git a/meta/recipes-sato/webkit/files/disable_wasm_riscv64.patch b/meta/recipes-sato/webkit/files/disable_wasm_riscv64.patch new file mode 100644 index 0000000000..eac942fddc --- /dev/null +++ b/meta/recipes-sato/webkit/files/disable_wasm_riscv64.patch @@ -0,0 +1,24 @@ +Provide a way to override enabling wasm from CMake +by setting -DENABLE_WEBASSEMBLY=OFF for RISCV64 + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=254553] +Signed-off-by: Khem Raj + +--- a/Source/WTF/wtf/PlatformEnable.h ++++ b/Source/WTF/wtf/PlatformEnable.h +@@ -613,13 +613,14 @@ + #endif + + #if CPU(RISCV64) +-#undef ENABLE_WEBASSEMBLY ++#if !defined(ENABLE_WEBASSEMBLY) + #define ENABLE_WEBASSEMBLY 1 + #undef ENABLE_WEBASSEMBLY_B3JIT + #define ENABLE_WEBASSEMBLY_B3JIT 0 + #undef ENABLE_WEBASSEMBLY_BBQJIT + #define ENABLE_WEBASSEMBLY_BBQJIT 0 + #endif ++#endif + + #if !defined(ENABLE_C_LOOP) + #if ENABLE(JIT) || CPU(X86_64) || CPU(ARM64) diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/meta/recipes-sato/webkit/files/reproducibility.patch similarity index 100% rename from meta/recipes-sato/webkit/webkitgtk/reproducibility.patch rename to meta/recipes-sato/webkit/files/reproducibility.patch diff --git a/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb b/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb new file mode 100644 index 0000000000..a9d6af2626 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb @@ -0,0 +1,173 @@ +SUMMARY = "WebKit web rendering engine for the GTK+ platform" +HOMEPAGE = "https://www.webkitgtk.org/" +BUGTRACKER = "https://bugs.webkit.org/" + +LICENSE = "BSD-2-Clause & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + " + +SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ + file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ + file://0001-FindLibGcrypt.cmake-check-PC_GCRYPT_FOUND.patch \ + file://reproducibility.patch \ + file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ + file://disable_wasm_riscv64.patch \ + " +SRC_URI[sha256sum] = "a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393" + +S = "${WORKDIR}/webkitgtk-${PV}" + +inherit ccache cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen mime-xdg + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +CVE_PRODUCT = "webkitgtk webkitgtk\+" + +DEPENDS += " \ + atk \ + cairo \ + gperf-native \ + gstreamer1.0 \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-bad \ + ${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'gstreamer1.0-libav', '', d)} \ + gtk+3 \ + harfbuzz \ + jpeg \ + libnotify \ + libsoup \ + libtasn1 \ + libwebp \ + libxslt \ + ruby-native \ + unifdef-native \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 opengl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl gst-gl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'webgl gles2 gst-gl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'journald', '', d)} \ + enchant \ + libsecret \ + " + +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland wayland-native libwpe wpebackend-fdo" +PACKAGECONFIG[angle] = "-DUSE_ANGLE_EGL=ON,-DUSE_ANGLE_EGL=OFF,virtual/egl" +PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,bubblewrap-native libseccomp xdg-dbus-proxy-native,bubblewrap xdg-dbus-proxy" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" +PACKAGECONFIG[libavif] = "-DUSE_AVIF=ON,-DUSE_AVIF=OFF,libavif" +PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" +PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" +PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" +PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" +PACKAGECONFIG[opengl] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF,virtual/egl libepoxy" +PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" +PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" +PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," +PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" +PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" +PACKAGECONFIG[gst-gl] ="-DUSE_GSTREAMER_GL=ON,-DUSE_GSTREAMER_GL=OFF" +PACKAGECONFIG[gst-transcoder] ="-DUSE_GSTREAMER_TRANSCODER=ON,-DUSE_GSTREAMER_TRANSCODER=OFF,gstreamer1.0-plugins-bad" + +# webkitgtk is full of /usr/bin/env python, particular for generating docs +do_configure[postfuncs] += "setup_python_link" +setup_python_link() { + if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + fi +} + +EXTRA_OECMAKE = " \ + -DENABLE_2022_GLIB_API=OFF \ + -DPORT=GTK \ + -DUSE_GTK4=OFF \ + -DUSE_XDGMIME=ON \ + -DBWRAP_EXECUTABLE=${bindir}/bwrap \ + -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ + ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ + -DENABLE_MINIBROWSER=ON \ + -DPYTHON_EXECUTABLE=`which python3` \ + " + +# Javascript JIT is not supported on ARC +EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " +# By default 25-bit "medium" calls are used on ARC +# which is not enough for binaries larger than 32 MiB +CFLAGS:append:arc = " -mlong-calls" +CXXFLAGS:append:arc = " -mlong-calls" + +# Needed for non-mesa graphics stacks when x11 is disabled +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + +# Javascript JIT is not supported on powerpc +EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " + +# ARM JIT code does not build on ARMv4/5/6 anymore +EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " + +EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " + +# JIT and WASM does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF -DENABLE_WEBASSEMBLY=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DENABLE_JIT=OFF -DENABLE_WEBASSEMBLY=OFF" + +# JIT not supported on MIPS either +EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " + +# JIT not supported on X32 +# An attempt was made to upstream JIT support for x32 in +# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as +# unresolved due to limited X32 adoption. +EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " + +SECURITY_CFLAGS:remove:aarch64 = "-fpie" +SECURITY_CFLAGS:append:aarch64 = " -fPIE" + +FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle" + +RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" + +# http://errors.yoctoproject.org/Errors/Details/20370/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" + +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET:armv7a = "thumb" +ARM_INSTRUCTION_SET:armv7r = "thumb" +ARM_INSTRUCTION_SET:armv7ve = "thumb" + +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED:libc-musl:armv7a = "False" +GI_DATA_ENABLED:libc-musl:armv7ve = "False" + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${WORKDIR},,g" \ + ${B}/JavaScriptCore/DerivedSources/*.h \ + ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ + ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ + ${B}/WebKitGTK/DerivedSources/webkit/*.cpp \ + ${B}/WebKitGTK/DerivedSources/webkit/*.h +} + +do_install:append() { + # webkitwebdriver conflicts between webkitgtk and webkitgtk-3 ... move + mv ${D}${bindir}/WebKitWebDriver ${D}${bindir}/WebKitWebDriver-3 +} diff --git a/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch b/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch deleted file mode 100644 index 1ff9dcea7e..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 16 Jan 2023 16:55:26 -0800 -Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in - ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689 - -Unreviewed build fix. - -* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h: - -Canonical link: https://commits.webkit.org/258968@main - -Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=250689] -Signed-off-by: Khem Raj ---- - Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h -index 94cb93e01fc0..ec7bda372f30 100644 ---- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h -+++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h -@@ -12,6 +12,7 @@ - - #include - #include -+#include - #include - #include - diff --git a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb similarity index 71% rename from meta/recipes-sato/webkit/webkitgtk_2.38.5.bb rename to meta/recipes-sato/webkit/webkitgtk_2.40.0.bb index e52920883a..e219cbf6d4 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb @@ -11,64 +11,69 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ + file://0001-FindLibGcrypt.cmake-check-PC_GCRYPT_FOUND.patch \ file://reproducibility.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ - file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \ + file://disable_wasm_riscv64.patch \ " -SRC_URI[sha256sum] = "40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7" +SRC_URI[sha256sum] = "a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393" -inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen +inherit cmake ccache pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen mime-xdg ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" +REQUIRED_DISTRO_FEATURES = "opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" DEPENDS += " \ - ruby-native \ - gperf-native \ + atk \ cairo \ + gperf-native \ + gstreamer1.0 \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-bad \ + ${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'gstreamer1.0-libav', '', d)} \ harfbuzz \ jpeg \ - atk \ + libnotify \ + libsoup \ + libtasn1 \ libwebp \ - gtk+3 \ libxslt \ - libtasn1 \ - libnotify \ - gstreamer1.0 \ - gstreamer1.0-plugins-base \ + ruby-native \ + unifdef-native \ " -PACKAGECONFIG_SOUP ?= "soup3" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 opengl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl gst-gl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'webgl gles2 gst-gl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'journald', '', d)} \ + gtk4 \ enchant \ libsecret \ - ${PACKAGECONFIG_SOUP} \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" -PACKAGECONFIG[angle] = "-DUSE_ANGLE_WEBGL=ON,-DUSE_ANGLE_WEBGL=OFF" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland wayland-native libwpe wpebackend-fdo" +PACKAGECONFIG[angle] = "-DUSE_ANGLE_EGL=ON,-DUSE_ANGLE_EGL=OFF,virtual/egl" +PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,bubblewrap-native libseccomp xdg-dbus-proxy-native,bubblewrap xdg-dbus-proxy" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" +PACKAGECONFIG[libavif] = "-DUSE_AVIF=ON,-DUSE_AVIF=OFF,libavif" +PACKAGECONFIG[gtk4] = "-DUSE_GTK4=ON,-DUSE_GTK4=OFF,gtk4" +PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" -PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl" -PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" +PACKAGECONFIG[opengl] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF,virtual/egl libepoxy" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" -PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," 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" PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" +PACKAGECONFIG[gst-gl] ="-DUSE_GSTREAMER_GL=ON,-DUSE_GSTREAMER_GL=OFF" +PACKAGECONFIG[gst-transcoder] ="-DUSE_GSTREAMER_TRANSCODER=ON,-DUSE_GSTREAMER_TRANSCODER=OFF,gstreamer1.0-plugins-bad" # webkitgtk is full of /usr/bin/env python, particular for generating docs do_configure[postfuncs] += "setup_python_link" @@ -79,13 +84,15 @@ setup_python_link() { } EXTRA_OECMAKE = " \ + -DENABLE_2022_GLIB_API=ON \ -DPORT=GTK \ + -DUSE_XDGMIME=ON \ + -DBWRAP_EXECUTABLE=${bindir}/bwrap \ + -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ -DENABLE_MINIBROWSER=ON \ -DPYTHON_EXECUTABLE=`which python3` \ - -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ - -DENABLE_GAMEPAD=OFF \ " # Javascript JIT is not supported on ARC @@ -110,9 +117,9 @@ EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " -# JIT and gold linker does not work on RISCV -EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" -EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +# JIT and WASM does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF -DENABLE_WEBASSEMBLY=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DENABLE_JIT=OFF -DENABLE_WEBASSEMBLY=OFF" # JIT not supported on MIPS either EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " @@ -126,7 +133,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " SECURITY_CFLAGS:remove:aarch64 = "-fpie" SECURITY_CFLAGS:append:aarch64 = " -fPIE" -FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" +FILES:${PN} += "${libdir}/webkitgtk-6.*/injected-bundle" RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" @@ -148,9 +155,6 @@ ARM_INSTRUCTION_SET:armv7ve = "thumb" GI_DATA_ENABLED:libc-musl:armv7a = "False" GI_DATA_ENABLED:libc-musl:armv7ve = "False" -# Can't be built with ccache -CCACHE_DISABLE = "1" - PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" src_package_preprocess () { # Trim build paths from comments in generated sources to ensure reproducibility @@ -158,8 +162,6 @@ src_package_preprocess () { ${B}/JavaScriptCore/DerivedSources/*.h \ ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ - ${B}/WebKit2Gtk/DerivedSources/webkit2/*.cpp \ - ${B}/WebKit2Gtk/DerivedSources/webkit2/*.h - + ${B}/WebKitGTK/DerivedSources/webkit/*.cpp \ + ${B}/WebKitGTK/DerivedSources/webkit/*.h } - diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.14.0.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.14.1.bb similarity index 90% rename from meta/recipes-sato/webkit/wpebackend-fdo_1.14.0.bb rename to meta/recipes-sato/webkit/wpebackend-fdo_1.14.1.bb index 708201043b..9f2ea0b7de 100644 --- a/meta/recipes-sato/webkit/wpebackend-fdo_1.14.0.bb +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.14.1.bb @@ -13,7 +13,7 @@ inherit meson features_check pkgconfig REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "e75b0cb2c7145448416e8696013d8883f675c66c11ed750e06865efec5809155" +SRC_URI[sha256sum] = "01938dd93c62b3a47b18dd13c70d50490a8b8a6caec23c8550a3dbdbcc6bbb50" # Especially helps compiling with clang which enable this as error when # using c++11 From patchwork Tue Mar 28 10:31:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 21862 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A07BFC77B61 for ; Tue, 28 Mar 2023 10:32:45 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web10.62746.1679999556427229838 for ; Tue, 28 Mar 2023 03:32:36 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd74.dcpf.telekom.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout01.t-online.de (Postfix) with SMTP id EBD691A11E for ; Tue, 28 Mar 2023 12:32:32 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.35.166]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ph6cy-17U9EW0; Tue, 28 Mar 2023 12:32:32 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv5 8/8] epiphany: update 43.1 -> 44.0 Date: Tue, 28 Mar 2023 12:31:44 +0200 Message-Id: <20230328103144.5757-8-f_L_K@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328103144.5757-1-f_L_K@t-online.de> References: <20230328103144.5757-1-f_L_K@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1679999552-8556AC08-8FC3BD3E/0/0 CLEAN NORMAL X-TOI-MSGID: 7d2bdd8b-38e9-4834-896d-1a2a760d4c32 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 28 Mar 2023 10:32:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179225 From: Markus Volk Signed-off-by: Markus Volk --- .../{epiphany_43.1.bb => epiphany_44.0.bb} | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) rename meta/recipes-gnome/epiphany/{epiphany_43.1.bb => epiphany_44.0.bb} (72%) diff --git a/meta/recipes-gnome/epiphany/epiphany_43.1.bb b/meta/recipes-gnome/epiphany/epiphany_44.0.bb similarity index 72% rename from meta/recipes-gnome/epiphany/epiphany_43.1.bb rename to meta/recipes-gnome/epiphany/epiphany_44.0.bb index ea22723a97..f10b818a06 100644 --- a/meta/recipes-gnome/epiphany/epiphany_43.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_44.0.bb @@ -7,20 +7,27 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ - webkitgtk \ - gcr3 \ - gsettings-desktop-schemas \ - nettle \ - json-glib \ - libarchive \ - libdazzle \ - libhandy \ - libportal \ - libsoup \ - glib-2.0-native \ - coreutils-native \ - desktop-file-utils-native \ - " + appstream-glib-native \ + coreutils-native \ + desktop-file-utils-native \ + gcr \ + glib-2.0-native \ + gsettings-desktop-schemas \ + gstreamer1.0 \ + iso-codes \ + json-glib \ + libadwaita \ + libarchive \ + libdazzle \ + libhandy \ + libportal \ + libsecret \ + libsoup \ + libxml2 \ + nettle \ + sqlite3 \ + webkitgtk \ +" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings features_check gettext mime-xdg gtk-icon-cache @@ -31,7 +38,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN file://migrator.patch \ file://distributor.patch \ " -SRC_URI[archive.sha256sum] = "e86ead27cb9982815150664de3bf20faf375f77b8065b02b31180c65b6bbebb4" +SRC_URI[archive.sha256sum] = "aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1" # Developer mode enables debugging PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"