All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0
@ 2022-11-26 23:03 Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 02/14] geocode-glib: build with libsoup-3.0 Markus Volk
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

- use gtk4
- build with libsoup-3.0

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...w-building-gir-in-cross-environments.patch | 21 +++++++------------
 ...eather4_4.0.0.bb => libgweather4_4.2.0.bb} |  6 +++---
 2 files changed, 10 insertions(+), 17 deletions(-)
 rename meta-gnome/recipes-gnome/libgweather/{libgweather4_4.0.0.bb => libgweather4_4.2.0.bb} (82%)

diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch b/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch
index 6c6a643ed..3a075de65 100644
--- a/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch
@@ -11,23 +11,16 @@ For us this works perfectly fine
 Upstream-Status: Inappropriate [OE-specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- libgweather/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
 
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index 08311af..ef554f2 100644
---- a/libgweather/meson.build
-+++ b/libgweather/meson.build
-@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4',
- )
+--- a/meson.build	2022-09-18 14:48:53.000000000 +0200
++++ b/meson.build	2022-11-26 14:05:13.302487232 +0100
+@@ -51,7 +51,7 @@
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
  
  g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'))
 -build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
 +build_gir = get_option('introspection') and g_ir_scanner.found()
+ build_docs = get_option('gtk_doc') and build_gir
  
- enable_vala = get_option('enable_vala')
- vapigen = find_program('vapigen', required: enable_vala == 'true')
--- 
-2.34.1
-
+ schemas_srcdir = meson.project_source_root() / 'schemas'
diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb
similarity index 82%
rename from meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb
rename to meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb
index 708d27a61..34d259ff3 100644
--- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb
@@ -10,15 +10,15 @@ S = "${WORKDIR}/${GNOMEBN}-${PV}"
 inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala
 
 SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch"
-SRC_URI[archive.sha256sum] = "440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c"
+SRC_URI[archive.sha256sum] = "af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 
 DEPENDS = " \
     geocode-glib \
-    gtk+3 \
+    gtk4 \
     json-glib \
-    libsoup-2.4 \
+    libsoup-3.0 \
     python3-pygobject-native \
 "
 
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 02/14] geocode-glib: build with libsoup-3.0
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 03/14] evolution-data-server: update 3.44.2 -> 3.46.1 Markus Volk
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb
index 2b1ecad97..42659d0f6 100644
--- a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb
+++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb
@@ -11,9 +11,9 @@ inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even
 
 DEPENDS = " \
     json-glib \
-    libsoup-2.4 \
+    libsoup-3.0 \
 "
 
 SRC_URI[archive.sha256sum] = "2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa"
 
-EXTRA_OEMESON = "-Denable-installed-tests=false"
+EXTRA_OEMESON = "-Denable-installed-tests=false -Dsoup2=false"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 03/14] evolution-data-server: update 3.44.2 -> 3.46.1
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 02/14] geocode-glib: build with libsoup-3.0 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 04/14] gjs: update 1.72.2 -> 1.75.1 Markus Volk
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

- build with libsoup-3.0
- dont add gtk4 exclusively, because some projects still stick to gcr3

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../evolution-data-server.bb                    | 17 +++++++++--------
 .../evolution-data-server.inc                   |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index 64774b0fe..681ff677a 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -2,8 +2,8 @@ require ${BPN}.inc
 
 DEPENDS = " \
     ${BPN}-native intltool-native gperf-native \
-    glib-2.0 gtk+3 libgdata libxml2 icu \
-    dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
+    glib-2.0 gtk+3 gtk4 libgdata libxml2 icu \
+    dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
 "
 
 inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative vala
@@ -24,10 +24,6 @@ LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF"
 
 EXTRA_OECMAKE = " \
     -DSYSCONF_INSTALL_DIR=${sysconfdir} \
-    -DWITH_KRB5=OFF \
-    -DENABLE_GOA=OFF \
-    -DENABLE_GOOGLE_AUTH=OFF \
-    -DENABLE_WEATHER=OFF \
     -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \
     ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
     -D${LKSTRFTIME} \
@@ -37,13 +33,18 @@ EXTRA_OECMAKE = " \
 EXTRA_OECMAKE:append:class-target = " -DG_IR_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper"
 EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper"
 
+PACKAGECONFIG ?= "oauth"
+
 PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
+# ENABLE_OAUTH2_WEBKITGTK4 would require webkit to be built with gtk4
+PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib"
 PACKAGECONFIG[goa]    = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts"
-
+PACKAGECONFIG[kerberos]    = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5"
 # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
 # searching for openldap-libs
 PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
+PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather4"
+
 
 # -ldb needs this on some platforms
 LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
index 78efee004..e3c09f211 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
 
 inherit gnomebase upstream-version-is-even
 
-SRC_URI[archive.sha256sum] = "2ed72afe4d6bb170f8728faea0907fee10212dfde7a9fab82fbcc83d0f22f028"
-PV = "3.44.2"
+SRC_URI[archive.sha256sum] = "c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb"
+PV = "3.46.1"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 04/14] gjs: update 1.72.2 -> 1.75.1
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 02/14] geocode-glib: build with libsoup-3.0 Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 03/14] evolution-data-server: update 3.44.2 -> 3.46.1 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 05/14] libgdata: use gcr3 Markus Volk
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

- build with mozjs-102

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-gnome/recipes-gnome/gjs/{gjs_1.72.2.bb => gjs_1.75.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gjs/{gjs_1.72.2.bb => gjs_1.75.1.bb} (90%)

diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.72.2.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.75.1.bb
similarity index 90%
rename from meta-gnome/recipes-gnome/gjs/gjs_1.72.2.bb
rename to meta-gnome/recipes-gnome/gjs/gjs_1.75.1.bb
index 317034156..b2c2b583b 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.72.2.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.75.1.bb
@@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48"
 
 GNOMEBASEBUILDCLASS = "meson"
 
-DEPENDS = "mozjs-91 cairo"
+DEPENDS = "mozjs-102 cairo"
 
 inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig
 
-SRC_URI[archive.sha256sum] = "ddee379bdc5a7d303a5d894be2b281beb8ac54508604e7d3f20781a869da3977"
+SRC_URI[archive.sha256sum] = "81dcdf49d2665d08fa7e251700ea36466d77877418e9186d3a7e7efcd31aa960"
 SRC_URI += " \
     file://0001-Support-cross-builds-a-bit-better.patch \
     file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 05/14] libgdata: use gcr3
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (2 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 04/14] gjs: update 1.72.2 -> 1.75.1 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 06/14] mutter: update 42.0 -> 43.1 Markus Volk
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
index bd9180e8a..126ef712d 100644
--- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
+++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
                     file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \
                     file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef"
 
-DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib"
+DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr3 json-glib"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 GNOMEBASEBUILDCLASS = "meson"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 06/14] mutter: update 42.0 -> 43.1
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (3 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 05/14] libgdata: use gcr3 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 07/14] gnome-shell: " Markus Volk
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

- build with gtk4

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../mutter/{mutter_42.0.bb => mutter_43.1.bb}            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 rename meta-gnome/recipes-gnome/mutter/{mutter_42.0.bb => mutter_43.1.bb} (92%)

diff --git a/meta-gnome/recipes-gnome/mutter/mutter_42.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_43.1.bb
similarity index 92%
rename from meta-gnome/recipes-gnome/mutter/mutter_42.0.bb
rename to meta-gnome/recipes-gnome/mutter/mutter_43.1.bb
index 785536280..9b764c666 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_42.0.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_43.1.bb
@@ -7,7 +7,7 @@ DEPENDS = " \
     wayland-native \
     virtual/libx11 \
     graphene \
-    gtk+3 \
+    gtk4 \
     gdk-pixbuf \
     cairo \
     pango \
@@ -17,7 +17,7 @@ DEPENDS = " \
     gnome-settings-daemon \
     libxtst \
     libxkbfile \
-    xinerama \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \
     xwayland \
 "
 
@@ -25,7 +25,7 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings gobject-introspection gettext features_check
 
-SRC_URI[archive.sha256sum] = "d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5"
+SRC_URI[archive.sha256sum] = "f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264"
 
 # x11 is still manadatory - see meson.build
 REQUIRED_DISTRO_FEATURES = "wayland x11 polkit"
@@ -60,7 +60,7 @@ PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm"
 PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
 PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
 
-MUTTER_API_NAME = "mutter-10"
+MUTTER_API_NAME = "mutter-11"
 
 do_install:append() {
     # Add gir links in standard paths. That makes dependents life much easier
@@ -78,6 +78,7 @@ PACKAGES =+ "${PN}-tests ${PN}-gsettings"
 
 FILES:${PN} += " \
     ${datadir}/gnome-control-center \
+    ${datadir}/gir-1.0 \
     ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \
     ${libdir}/${MUTTER_API_NAME}/*.typelib \
     ${libdir}/${MUTTER_API_NAME}/plugins \
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 07/14] gnome-shell: update 42.0 -> 43.1
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (4 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 06/14] mutter: update 42.0 -> 43.1 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 08/14] gnome-settings-daemon: update 42.1 -> 43.0 Markus Volk
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

- build with gtk4

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...42.0.bb => gnome-shell-extensions_43.1.bb} |  0
 ...s-gjs_path-to-optionally-set-path-to.patch | 27 ++++++++++---------
 ...nome-shell_42.0.bb => gnome-shell_43.1.bb} |  9 ++++---
 3 files changed, 21 insertions(+), 15 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell-extensions_42.0.bb => gnome-shell-extensions_43.1.bb} (100%)
 rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell_42.0.bb => gnome-shell_43.1.bb} (88%)

diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb
similarity index 100%
rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb
rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
index 4a3662518..b583199e9 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
@@ -1,4 +1,4 @@
-From 3bf597b16e23cd2ce0ee3b05c23b46add5e26cd4 Mon Sep 17 00:00:00 2001
+From 9f11c9e53d91b23113202b40500540242bcabdb0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Thu, 28 Oct 2021 18:57:24 +0200
 Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs
@@ -6,9 +6,15 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
 ---
  js/dbusServices/meson.build                  | 2 +-
  meson.build                                  | 6 +++++-
@@ -19,10 +25,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  6 files changed, 25 insertions(+), 4 deletions(-)
 
 diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build
-index eb941ed..16efaeb 100644
+index 48b7f89..700b590 100644
 --- a/js/dbusServices/meson.build
 +++ b/js/dbusServices/meson.build
-@@ -27,7 +27,7 @@ foreach service, dir : dbus_services
+@@ -22,7 +22,7 @@ foreach service, dir : dbus_services
  
    serviceconf = configuration_data()
    serviceconf.set('service', service)
@@ -32,10 +38,10 @@ index eb941ed..16efaeb 100644
  
    configure_file(
 diff --git a/meson.build b/meson.build
-index 8d7478f..7c9cc6a 100644
+index 252fb1e..250f722 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -138,7 +138,11 @@ endif
+@@ -125,7 +125,11 @@ endif
  
  mutter_typelibdir = mutter_dep.get_variable('typelibdir')
  python = find_program('python3')
@@ -49,11 +55,11 @@ index 8d7478f..7c9cc6a 100644
  cc = meson.get_compiler('c')
  
 diff --git a/meson_options.txt b/meson_options.txt
-index f0f2ecf..a45f2e4 100644
+index 46ca8e7..3e9a31f 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -45,3 +45,9 @@ option('soup2',
-   value: true,
+   value: false,
    description: 'Use Soup 2.4 instead of Soup 3. Must be in sync with libgweather'
  )
 +
@@ -76,10 +82,10 @@ index ce2a776..8f7bba4 100644
  configure_file(
    input: prgname + '.in',
 diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
-index c260d7a..c5b7554 100644
+index 66a39e9..331dc1d 100644
 --- a/subprojects/extensions-app/meson.build
 +++ b/subprojects/extensions-app/meson.build
-@@ -44,7 +44,12 @@ localedir = join_paths(datadir, 'locale')
+@@ -46,7 +46,12 @@ localedir = join_paths(datadir, 'locale')
  metainfodir = join_paths(datadir, 'metainfo')
  servicedir = join_paths(datadir, 'dbus-1', 'services')
  
@@ -107,6 +113,3 @@ index ca2eb41..2787785 100644
 +  value: '',
 +  description: 'Instead of searching gjs executable, configure path'
 +)
--- 
-2.34.1
-
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb
similarity index 88%
rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb
rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb
index f54d966c7..81d8dac48 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb
@@ -10,12 +10,14 @@ DEPENDS = " \
     gtk4 \
     mutter \
     evolution-data-server \
-    gcr \
+    gcr4 \
+    geocode-glib \
     gjs \
     gnome-autoar \
     polkit \
     libcroco \
-    startup-notification \
+    libsoup-3.0 \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'startup-notification', d)} \
     ibus \
     gsettings-desktop-schemas \
 "
@@ -31,7 +33,7 @@ GIR_MESON_OPTION = ""
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
 
-SRC_URI[archive.sha256sum] = "33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094"
+SRC_URI[archive.sha256sum] = "df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc"
 SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch"
 
 PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -44,6 +46,7 @@ EXTRA_OEMESON = " \
     -Dextensions-app:gjs_path=${bindir}/gjs \
     -Dtests=false \
     -Dman=false \
+    -Dsoup2=false \
 "
 
 do_install:append() {
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 08/14] gnome-settings-daemon: update 42.1 -> 43.0
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (5 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 07/14] gnome-shell: " Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 09/14] mozjs: update 98 -> 102 Markus Volk
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...ettings-daemon_42.1.bb => gnome-settings-daemon_43.0.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-settings-daemon/{gnome-settings-daemon_42.1.bb => gnome-settings-daemon_43.0.bb} (88%)

diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb
similarity index 88%
rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb
rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb
index 3d5913ac0..92cfbb2be 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb
@@ -9,7 +9,7 @@ inherit gnomebase gsettings gobject-introspection gettext features_check upstrea
 DEPENDS = " \
     colord \
     geocode-glib \
-    gcr \
+    gcr4 \
     gnome-desktop \
     libgweather4 \
     lcms \
@@ -25,7 +25,7 @@ DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data"
 GIR_MESON_OPTION = ""
 
-SRC_URI[archive.sha256sum] = "ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb"
+SRC_URI[archive.sha256sum] = "3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0"
 
 PACKAGECONFIG ??= " \
     cups nm \
@@ -42,5 +42,5 @@ PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland"
 
 FILES:${PN} += " \
     ${systemd_user_unitdir} \
-    ${libdir}/gnome-settings-daemon-42/libgsd.so \
+    /usr/lib/gnome-settings-daemon-43/libgsd.so \
 "
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 09/14] mozjs: update 98 -> 102
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (6 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 08/14] gnome-settings-daemon: update 42.1 -> 43.0 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 10/14] polkit: add recipe for v122 Markus Volk
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...001-Cargo.toml-do-not-abort-on-panic.patch |  11 +-
 ...-autoconf-s-config.sub-to-canonicali.patch |   7 +-
 ...rewrite-cargo-host-linker-in-python3.patch |  10 +-
 ...ix-one-occasionally-reproduced-confi.patch |  10 +-
 ...o-not-try-to-find-a-suitable-upstrea.patch |   9 +-
 .../0004-use-asm-sgidefs.h.patch              |   9 +-
 .../mozjs/mozjs-102/fix-musl-build.patch      |  27 ++++
 .../{mozjs-91 => mozjs-102}/py-3.11.patch     | 128 ++++--------------
 .../{mozjs-91 => mozjs-102}/riscv32.patch     |  27 +++-
 ...zjs-91_91.13.0.bb => mozjs-102_102.5.0.bb} |  15 +-
 ...nfigure-do-not-look-for-llvm-objdump.patch |  43 ------
 .../mozjs-91/0005-nojit-32bit-arch-fix.patch  |  21 ---
 .../mozjs-91/0006-Fix-build-on-powerpc.patch  |  36 -----
 .../mozjs/mozjs-91/fix-musl-build.patch       |  15 --
 14 files changed, 112 insertions(+), 256 deletions(-)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91 => mozjs-102}/0001-Cargo.toml-do-not-abort-on-panic.patch (74%)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91 => mozjs-102}/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch (84%)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91 => mozjs-102}/0001-rewrite-cargo-host-linker-in-python3.patch (92%)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91 => mozjs-102}/0001-util.configure-fix-one-occasionally-reproduced-confi.patch (91%)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91 => mozjs-102}/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch (91%)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91 => mozjs-102}/0004-use-asm-sgidefs.h.patch (79%)
 create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-102/fix-musl-build.patch
 rename meta-oe/recipes-extended/mozjs/{mozjs-91 => mozjs-102}/py-3.11.patch (59%)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91 => mozjs-102}/riscv32.patch (56%)
 rename meta-oe/recipes-extended/mozjs/{mozjs-91_91.13.0.bb => mozjs-102_102.5.0.bb} (82%)
 delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch
 delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch
 delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch
 delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch

diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-Cargo.toml-do-not-abort-on-panic.patch
similarity index 74%
rename from meta-oe/recipes-extended/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-102/0001-Cargo.toml-do-not-abort-on-panic.patch
index e09848f40..0dd936197 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-Cargo.toml-do-not-abort-on-panic.patch
@@ -1,4 +1,4 @@
-From 9e37248870b2b955293754933c789ca00bca06ef Mon Sep 17 00:00:00 2001
+From bb46a8a729cc4d66ad36db40c17e36a5111f19c3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 1 Oct 2021 13:00:24 +0200
 Subject: [PATCH] Cargo.toml: do not abort on panic
@@ -7,13 +7,16 @@ OE's rust is configured to unwind, and this setting clashes with it/
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
 ---
- Cargo.toml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ Cargo.toml | 2 --
+ 1 file changed, 2 deletions(-)
 
+diff --git a/Cargo.toml b/Cargo.toml
+index f576534bf3..5ecc17c319 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -51,13 +51,11 @@ opt-level = 1
+@@ -56,13 +56,11 @@ opt-level = 1
  rpath = false
  lto = false
  debug-assertions = true
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
similarity index 84%
rename from meta-oe/recipes-extended/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-102/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
index a2ccf6b91..fe905fe4d 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
@@ -1,4 +1,4 @@
-From e5b95b3918588e2930c9af7ba304c57e871b2d55 Mon Sep 17 00:00:00 2001
+From c860dcbe63b0e393c95bfb0131238f91aaac11d3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Thu, 7 Oct 2021 12:44:18 +0200
 Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize'
@@ -9,15 +9,16 @@ target definitions, and the build fails.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
 ---
  build/moz.configure/init.configure | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
-index 3a164c6558..99dfc9054a 100644
+index 81f500a0b7..0b7a2ff60f 100644
 --- a/build/moz.configure/init.configure
 +++ b/build/moz.configure/init.configure
-@@ -823,7 +823,7 @@ def help_host_target(help, host, target):
+@@ -585,7 +585,7 @@ def help_host_target(help, host, target):
  
  def config_sub(shell, triplet):
      config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub")
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-rewrite-cargo-host-linker-in-python3.patch
similarity index 92%
rename from meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-102/0001-rewrite-cargo-host-linker-in-python3.patch
index 7b938179c..73bcffe94 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-rewrite-cargo-host-linker-in-python3.patch
@@ -1,4 +1,4 @@
-From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001
+From 8e318c4e7e732327dabf51027860de45b6fb731e Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 18 Nov 2021 07:16:39 +0000
 Subject: [PATCH] Rewrite cargo-host-linker in python3
@@ -18,12 +18,13 @@ rewrite cargo-host-linker in python3
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
 ---
- build/cargo-host-linker | 24 +++++++---
+ build/cargo-host-linker | 24 +++++++++++++++++++++---
  1 file changed, 21 insertions(+), 3 deletions(-)
 
 diff --git a/build/cargo-host-linker b/build/cargo-host-linker
-index cbd0472bf7..ccd8bffec1 100755
+index cbd0472bf7..87d43ce9ec 100755
 --- a/build/cargo-host-linker
 +++ b/build/cargo-host-linker
 @@ -1,3 +1,21 @@
@@ -51,6 +52,3 @@ index cbd0472bf7..ccd8bffec1 100755
 +        args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:]
 +
 +os.execvp(binary, args)
--- 
-2.33.1
-
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
similarity index 91%
rename from meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-102/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
index 5472eddbb..d732fdaf6 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
@@ -1,4 +1,4 @@
-From b13cad4abc53f816f64c8b0af70cb46820746c72 Mon Sep 17 00:00:00 2001
+From 2a6f66f39b4e623428b6d282bd4cb72dde67c1a6 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 11 Nov 2021 16:05:54 +0800
 Subject: [PATCH] util.configure: fix one occasionally reproduced configure
@@ -28,15 +28,16 @@ It should be another process that deleted this file by using
 Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
 ---
  build/moz.configure/util.configure | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure
-index 8f35e89c73..84e256647d 100644
+index 80c3a34522..0ac0c6b611 100644
 --- a/build/moz.configure/util.configure
 +++ b/build/moz.configure/util.configure
-@@ -222,7 +222,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None):
+@@ -216,7 +216,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None):
          "C++": ".cpp",
      }[language]
  
@@ -45,6 +46,3 @@ index 8f35e89c73..84e256647d 100644
      try:
          source = source.encode("ascii", "replace")
  
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
similarity index 91%
rename from meta-oe/recipes-extended/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
index c440bf178..e63b05356 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
@@ -1,4 +1,4 @@
-From 749ba11fd6a69c8180945d4866415d16ae06a9c0 Mon Sep 17 00:00:00 2001
+From 33ff25e2b126dd4135006139641d8b7f6e4da200 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 1 Oct 2021 13:02:17 +0200
 Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
@@ -7,15 +7,16 @@ OE is using custom targets and so this is bound to fail.
 
 Upstream-Status: Inapppropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
 ---
  build/moz.configure/rust.configure | 34 ++----------------------------
  1 file changed, 2 insertions(+), 32 deletions(-)
 
 diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index cd77d72bb7..4b6481cbe3 100644
+index e64dc5d5ec..edf21baca6 100644
 --- a/build/moz.configure/rust.configure
 +++ b/build/moz.configure/rust.configure
-@@ -459,33 +459,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
+@@ -471,33 +471,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
  def rust_host_triple(
      rustc, host, compiler_info, rustc_host, rust_supported_targets, arm_target
  ):
@@ -50,7 +51,7 @@ index cd77d72bb7..4b6481cbe3 100644
  
  
  @depends(
-@@ -495,11 +469,7 @@ def rust_host_triple(
+@@ -507,11 +481,7 @@ def rust_host_triple(
  def rust_target_triple(
      rustc, target, compiler_info, rust_supported_targets, arm_target
  ):
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0004-use-asm-sgidefs.h.patch
similarity index 79%
rename from meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-102/0004-use-asm-sgidefs.h.patch
index b56f0b95b..ff28654b5 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0004-use-asm-sgidefs.h.patch
@@ -1,4 +1,4 @@
-From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001
+From 0ec73937b01869a701ed9b60a6a84469e035ded4 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <amccurdy@gmail.com>
 Date: Sat, 30 Apr 2016 15:29:06 -0700
 Subject: [PATCH] use <asm/sgidefs.h>
@@ -18,13 +18,16 @@ Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
 ---
- gdb/mips-linux-nat.c | 2 +-
+ mfbt/RandomNum.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/mfbt/RandomNum.cpp b/mfbt/RandomNum.cpp
+index 23381db0cd..7f127c0715 100644
 --- a/mfbt/RandomNum.cpp
 +++ b/mfbt/RandomNum.cpp
-@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PV
+@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer,
  #  elif defined(__s390__)
  #    define GETRANDOM_NR 349
  #  elif defined(__mips__)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102/fix-musl-build.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/fix-musl-build.patch
new file mode 100644
index 000000000..f847979ea
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/fix-musl-build.patch
@@ -0,0 +1,27 @@
+From 1110483c6c06adf2d03ed9154a8957defc175c80 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 20 Oct 2021 16:21:14 -0700
+Subject: [PATCH] mozjs: Fix musl miscompiles with HAVE_THREAD_TLS_KEYWORD
+
+Upstream: No
+Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
+https://github.com/void-linux/void-packages/issues/2598
+
+---
+ js/src/old-configure.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+index 8dfd75c63d..c82e580428 100644
+--- a/js/src/old-configure.in
++++ b/js/src/old-configure.in
+@@ -839,6 +839,9 @@ if test "$ac_cv_thread_keyword" = yes; then
+     *-android*|*-linuxandroid*)
+       :
+       ;;
++    *-musl*)
++      :
++      ;;
+     *)
+       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
+       ;;
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/py-3.11.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/py-3.11.patch
similarity index 59%
rename from meta-oe/recipes-extended/mozjs/mozjs-91/py-3.11.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-102/py-3.11.patch
index 71da8225a..85af54709 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/py-3.11.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/py-3.11.patch
@@ -1,3 +1,7 @@
+From 1479dd9c75917d2be70ee840c9db141e59987e44 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 14 Sep 2022 14:03:10 +0200
+Subject: [PATCH] mozjs-91: backport a python 3.11 compatibility patch
 
 # HG changeset patch
 # User ahochheiden <ahochheiden@mozilla.com>
@@ -19,15 +23,20 @@ Differential Revision: https://phabricator.services.mozilla.com/D147721
 Upstream-Status: Backport [https://hg.mozilla.org/mozilla-central/rev/f54162b2c1f2fe52c6137ab2c3469a1944f58b27]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 
+---
+ dom/base/usecounters.py                                 | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py                | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py                | 6 +++---
+ python/mozbuild/mozbuild/util.py                        | 2 +-
+ python/mozbuild/mozpack/files.py                        | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
 diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2..7e2c7148ec 100644
 --- a/dom/base/usecounters.py
 +++ b/dom/base/usecounters.py
-@@ -3,17 +3,17 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- import collections
- import re
- 
+@@ -8,7 +8,7 @@ import re
  
  def read_conf(conf_filename):
      # Can't read/write from a single StringIO, so make a new one for reading.
@@ -36,20 +45,11 @@ diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
  
      def parse_counters(stream):
          for line_num, line in enumerate(stream):
-             line = line.rstrip("\n")
-             if not line or line.startswith("//"):
-                 # empty line or comment
-                 continue
-             m = re.match(r"method ([A-Za-z0-9]+)\.([A-Za-z0-9]+)$", line)
 diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26..aca59d0f05 100644
 --- a/python/mozbuild/mozbuild/action/process_define_files.py
 +++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -31,17 +31,17 @@ def process_define_file(output, input):
- 
-     config = PartialConfigEnvironment(topobjdir)
- 
-     if mozpath.basedir(
-         path, [mozpath.join(topsrcdir, "js/src")]
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
      ) and not config.substs.get("JS_STANDALONE"):
          config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
  
@@ -58,20 +58,11 @@ diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mo
          r = re.compile(
              "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
          )
-         for l in input:
-             m = r.match(l)
-             if m:
-                 cmd = m.group("cmd")
-                 name = m.group("name")
 diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d86..b64a709468 100644
 --- a/python/mozbuild/mozbuild/backend/base.py
 +++ b/python/mozbuild/mozbuild/backend/base.py
-@@ -267,17 +267,17 @@ class BuildBackend(LoggingMixin):
-         If an exception is raised, |mach build| will fail with a
-         non-zero exit code.
-         """
-         self._write_purgecaches(config)
- 
+@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin):
          return status
  
      @contextmanager
@@ -80,20 +71,11 @@ diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild
          """Context manager to write a file.
  
          This is a glorified wrapper around FileAvoidWrite with integration to
-         update the summary data on this instance.
- 
-         Example usage:
- 
-             with self._write_file('foo.txt') as fh:
 diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91..857f1a6c9b 100644
 --- a/python/mozbuild/mozbuild/preprocessor.py
 +++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -526,17 +526,17 @@ class Preprocessor:
-             if not options.output:
-                 raise Preprocessor.Error(
-                     self, "--depend doesn't work with stdout", None
-                 )
-             depfile = get_output_file(options.depend)
+@@ -531,7 +531,7 @@ class Preprocessor:
  
          if args:
              for f in args:
@@ -102,17 +84,7 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
                      self.processFile(input=input, output=out)
              if depfile:
                  mk = Makefile()
-                 mk.create_rule([six.ensure_text(options.output)]).add_dependencies(
-                     self.includes
-                 )
-                 mk.dump(depfile)
-                 depfile.close()
-@@ -855,17 +855,17 @@ class Preprocessor:
-         self.checkLineNumbers = False
-         if isName:
-             try:
-                 args = _to_text(args)
-                 if filters:
+@@ -860,7 +860,7 @@ class Preprocessor:
                      args = self.applyFilters(args)
                  if not os.path.isabs(args):
                      args = os.path.join(self.curdir, args)
@@ -121,17 +93,7 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
              except Preprocessor.Error:
                  raise
              except Exception:
-                 raise Preprocessor.Error(self, "FILE_NOT_FOUND", _to_text(args))
-         self.checkLineNumbers = bool(
-             re.search("\.(js|jsm|java|webidl)(?:\.in)?$", args.name)
-         )
-         oldFile = self.context["FILE"]
-@@ -909,17 +909,17 @@ class Preprocessor:
- 
-     def do_error(self, args):
-         raise Preprocessor.Error(self, "Error: ", _to_text(args))
- 
- 
+@@ -914,7 +914,7 @@ class Preprocessor:
  def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
      pp = Preprocessor(defines=defines, marker=marker)
      for f in includes:
@@ -140,20 +102,11 @@ diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild
              pp.processFile(input=input, output=output)
      return pp.includes
  
- 
- # Keep this module independently executable.
- if __name__ == "__main__":
-     pp = Preprocessor()
-     pp.handleCommandLine(None, True)
 diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f164698..4f1e0cdc5f 100644
 --- a/python/mozbuild/mozbuild/util.py
 +++ b/python/mozbuild/mozbuild/util.py
-@@ -231,17 +231,17 @@ class FileAvoidWrite(BytesIO):
-     enabled by default because it a) doesn't make sense for binary files b)
-     could add unwanted overhead to calls.
- 
-     Additionally, there is dry run mode where the file is not actually written
-     out, but reports whether the file was existing and would have been updated
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
      still occur, as well as diff capture if requested.
      """
  
@@ -162,20 +115,11 @@ diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
          BytesIO.__init__(self)
          self.name = filename
          assert type(capture_diff) == bool
-         assert type(dry_run) == bool
-         assert "r" in readmode
-         self._capture_diff = capture_diff
-         self._write_to_file = not dry_run
-         self.diff = None
 diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8..a295a67b5a 100644
 --- a/python/mozbuild/mozpack/files.py
 +++ b/python/mozbuild/mozpack/files.py
-@@ -549,17 +549,17 @@ class PreprocessedFile(BaseFile):
-         self.defines = defines
-         self.extra_depends = list(extra_depends or [])
-         self.silence_missing_directive_warnings = silence_missing_directive_warnings
- 
-     def inputs(self):
+@@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile):
          pp = Preprocessor(defines=self.defines, marker=self.marker)
          pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
  
@@ -184,17 +128,7 @@ diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
              with _open(os.devnull, "w") as output:
                  pp.processFile(input=input, output=output)
  
-         # This always yields at least self.path.
-         return pp.includes
- 
-     def copy(self, dest, skip_if_older=True):
-         """
-@@ -606,17 +606,17 @@ class PreprocessedFile(BaseFile):
-             return False
- 
-         deps_out = None
-         if self.depfile:
-             deps_out = FileAvoidWrite(self.depfile)
+@@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile):
          pp = Preprocessor(defines=self.defines, marker=self.marker)
          pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
  
@@ -203,9 +137,3 @@ diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
              pp.processFile(input=input, output=dest, depfile=deps_out)
  
          dest.close()
-         if self.depfile:
-             deps_out.close()
- 
-         return True
- 
-
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/riscv32.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/riscv32.patch
similarity index 56%
rename from meta-oe/recipes-extended/mozjs/mozjs-91/riscv32.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-102/riscv32.patch
index fe9c332a0..a6a0a9ede 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/riscv32.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/riscv32.patch
@@ -1,11 +1,22 @@
-Add RISCV32 support
+From 81385fe53ffde5e1636e9ace0736d914da8dbc0f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 24 Oct 2021 22:32:50 -0700
+Subject: [PATCH] Add RISCV32 support
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
+---
+ build/moz.configure/init.configure                             | 3 +++
+ python/mozbuild/mozbuild/configure/constants.py                | 2 ++
+ .../mozbuild/test/configure/test_toolchain_configure.py        | 1 +
+ 3 files changed, 6 insertions(+)
+
+diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
+index 0b7a2ff60f..54f8325b44 100644
 --- a/build/moz.configure/init.configure
 +++ b/build/moz.configure/init.configure
-@@ -765,6 +765,9 @@ def split_triplet(triplet, allow_msvc=Fa
+@@ -524,6 +524,9 @@ def split_triplet(triplet, allow_msvc=False, allow_wasi=False):
      elif cpu.startswith("aarch64"):
          canonical_cpu = "aarch64"
          endianness = "little"
@@ -15,9 +26,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
      elif cpu in ("riscv64", "riscv64gc"):
          canonical_cpu = "riscv64"
          endianness = "little"
+diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
+index c71460cb20..15bef93e19 100644
 --- a/python/mozbuild/mozbuild/configure/constants.py
 +++ b/python/mozbuild/mozbuild/configure/constants.py
-@@ -52,6 +52,7 @@ CPU_bitness = {
+@@ -53,6 +53,7 @@ CPU_bitness = {
      "mips64": 64,
      "ppc": 32,
      "ppc64": 64,
@@ -25,17 +38,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
      "riscv64": 64,
      "s390": 32,
      "s390x": 64,
-@@ -94,6 +95,7 @@ CPU_preprocessor_checks = OrderedDict(
+@@ -95,6 +96,7 @@ CPU_preprocessor_checks = OrderedDict(
          ("m68k", "__m68k__"),
          ("mips64", "__mips64"),
          ("mips32", "__mips__"),
 +        ("riscv32", "__riscv && __riscv_xlen == 32"),
          ("riscv64", "__riscv && __riscv_xlen == 64"),
+         ("loongarch64", "__loongarch64"),
          ("sh4", "__sh__"),
-         ("wasm32", "__wasm32__"),
+diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+index 059cde0139..4f9986eb31 100644
 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-@@ -1186,6 +1186,7 @@ class LinuxCrossCompileToolchainTest(Bas
+@@ -1192,6 +1192,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
          "m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1},
          "mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1},
          "mips-unknown-linux-gnu": big_endian + {"__mips__": 1},
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb
similarity index 82%
rename from meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb
rename to meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb
index 4c1aa3447..3df66f0e6 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-91_91.13.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb
@@ -5,25 +5,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf"
 
 SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \
            file://0001-Cargo.toml-do-not-abort-on-panic.patch \
-           file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \
            file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
            file://0004-use-asm-sgidefs.h.patch \
            file://fix-musl-build.patch \
            file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \
            file://riscv32.patch \
-           file://0005-nojit-32bit-arch-fix.patch \
-           file://0006-Fix-build-on-powerpc.patch \
            file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
            file://0001-rewrite-cargo-host-linker-in-python3.patch  \
            file://py-3.11.patch \
            "
-SRC_URI[sha256sum] = "53be2bcde0b5ee3ec106bd8ba06b8ae95e7d489c484e881dfbe5360e4c920762"
+SRC_URI[sha256sum] = "017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8"
 
-S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}"
+S = "${WORKDIR}/firefox-${PV}"
 
 inherit pkgconfig perlnative python3native rust
 
-DEPENDS += "zlib cargo-native python3 icu"
+DEPENDS += "zlib cargo-native python3 icu llvm-native"
 DEPENDS:remove:mipsarch = "icu"
 DEPENDS:remove:powerpc:toolchain-clang = "icu"
 
@@ -67,12 +64,12 @@ do_install() {
 
 inherit multilib_script multilib_header
 
-MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js91-config"
+MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config"
 
 do_install:append() {
-    oe_multilib_header mozjs-91/js-config.h
+    oe_multilib_header mozjs-102/js-config.h
     sed -e 's@${STAGING_DIR_HOST}@@g' \
-        -i ${D}${bindir}/js91-config
+        -i ${D}${bindir}/js102-config
     rm -f ${D}${libdir}/libjs_static.ajs
 }
 
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch
deleted file mode 100644
index 6ff83e3bb..000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0133ddb86eb6e0741e02b0032c41468db6438530 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 1 Oct 2021 13:01:10 +0200
-Subject: [PATCH] moz.configure: do not look for llvm-objdump
-
-This avoid dragging in a dependency that isn't even needed
-for js builds.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- moz.configure | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/moz.configure b/moz.configure
-index fc66b520d0..15de9a2ee0 100755
---- a/moz.configure
-+++ b/moz.configure
-@@ -994,15 +994,15 @@ def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):
-     return (llvm_objdump,)
- 
- 
--llvm_objdump = check_prog(
--    "LLVM_OBJDUMP",
--    llvm_objdump,
--    what="llvm-objdump",
--    when="--enable-compile-environment",
--    paths=clang_search_path,
--)
--
--add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump)
-+#llvm_objdump = check_prog(
-+#    "LLVM_OBJDUMP",
-+#    llvm_objdump,
-+#    what="llvm-objdump",
-+#    when="--enable-compile-environment",
-+#    paths=clang_search_path,
-+#)
-+
-+#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump)
- 
- 
- option("--enable-dtrace", help="Build with dtrace support")
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch b/meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch
deleted file mode 100644
index f308b4863..000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix build when JIT is disabled on 32bit systems
-
-This fixes a compile time assert
-js/src/wasm/WasmFrame.cpp:57:3: error: static_assert failed due to requirement '(__builtin_offsetof(js::wasm::DebugFrame, frame_) + sizeof(js::wasm::Frame)) % Alignment == 0' "Aligned after pushing DebugFrame"
-  static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0,
-  ^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---- a/js/src/wasm/WasmFrame.h
-+++ b/js/src/wasm/WasmFrame.h
-@@ -230,6 +230,8 @@ class DebugFrame {
-   // Avoid -Wunused-private-field warnings.
-  protected:
- #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \
-+    (defined(JS_CODEGEN_NONE) && \
-+     (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \
-     defined(JS_CODEGEN_X86) || defined(__wasi__)
-   // See alignmentStaticAsserts().  For MIPS32, ARM32 and X86 DebugFrame is only
-   // 4-byte aligned, so we add another word to get up to 8-byte
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch b/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch
deleted file mode 100644
index 80bf746e4..000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0e0548e3f95e22a39db8d5b934afe0672a3f801b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 1 Nov 2021 08:13:29 +0100
-Subject: [PATCH] Fix build on powerpc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Another fix for (this time JIT enabled)
-| <...>/irefox-91.2.0/js/src/wasm/WasmFrame.cpp:57:76: error: static assertion failed: Aligned after pushing DebugFrame
-|    57 |   static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0,
-|       |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- js/src/wasm/WasmFrame.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h
-index 893762e..2d90656 100644
---- a/js/src/wasm/WasmFrame.h
-+++ b/js/src/wasm/WasmFrame.h
-@@ -232,7 +232,7 @@ class DebugFrame {
- #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \
-     (defined(JS_CODEGEN_NONE) && \
-      (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \
--    defined(JS_CODEGEN_X86) || defined(__wasi__)
-+    defined(JS_CODEGEN_X86) || defined(__wasi__) || defined(__powerpc__)
-   // See alignmentStaticAsserts().  For MIPS32, ARM32 and X86 DebugFrame is only
-   // 4-byte aligned, so we add another word to get up to 8-byte
-   // alignment.
--- 
-2.31.1
-
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch b/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch
deleted file mode 100644
index c0834af58..000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream: No
-Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
-https://github.com/void-linux/void-packages/issues/2598
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1072,6 +1072,9 @@ if test "$ac_cv_thread_keyword" = yes; t
-     *-android*|*-linuxandroid*)
-       :
-       ;;
-+    *-musl*)
-+      :
-+      ;;
-     *)
-       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
-       ;;
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 10/14] polkit: add recipe for v122
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (7 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 09/14] mozjs: update 98 -> 102 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 11/14] gnome-online-accounts: use gcr3 Markus Volk
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

autotools buildsystem has been dropped

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-oe/recipes-extended/polkit/polkit_122.bb | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 meta-oe/recipes-extended/polkit/polkit_122.bb

diff --git a/meta-oe/recipes-extended/polkit/polkit_122.bb b/meta-oe/recipes-extended/polkit/polkit_122.bb
new file mode 100644
index 000000000..36977fb49
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit_122.bb
@@ -0,0 +1,49 @@
+SUMMARY = "PolicyKit Authorization Framework"
+DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes."
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb"
+
+SRC_URI = "git://github.com/freedesktop/polkit.git;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+SRCREV = "da87c5698019897dd731bb2cbb54ebd9c9481f52"
+
+DEPENDS = "expat glib-2.0"
+
+inherit meson pkgconfig useradd systemd gettext gobject-introspection features_check
+
+REQUIRED_DISTRO_FEATURES = "polkit"
+
+PACKAGECONFIG = " \
+	${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
+	${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
+	dbus \
+	mozjs \
+"
+PACKAGECONFIG[dbus] = ",,dbus"
+PACKAGECONFIG[gtk-doc] = "-Dgtk_doc=true,-Dgtk_doc=false,gtk-doc-native"
+PACKAGECONFIG[pam] = "-Dauthfw=pam,-Dauthfw=shadow,libpam,libpam"
+PACKAGECONFIG[systemd] = "-Dsession_tracking=libsystemd-login,-session_tracking=ConsoleKit,systemd"
+PACKAGECONFIG[consolekit] = ",,,consolekit"
+
+# Default to mozjs javascript library
+PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-102,,,duktape"
+# duktape javascript engine is much smaller and faster but is not compatible with
+# same javascript standards as mozjs. For example array.includes() function is not
+# supported. Test rule compatibility when switching to duktape.
+PACKAGECONFIG[duktape] = "-Djs_engine=duktape,,duktape,,,mozjs"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 --shell /bin/nologin polkitd"
+
+SYSTEMD_SERVICE:${PN} = "${BPN}.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
+do_install:append() {
+	#Fix up permissions on polkit rules.d to work with rpm4 constraints
+	chmod 700 ${D}/${datadir}/polkit-1/rules.d
+	chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
+}
+
+FILES:${PN} += "${libdir}/polkit-1 ${datadir}"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 11/14] gnome-online-accounts: use gcr3
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (8 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 10/14] polkit: add recipe for v122 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 12/14] gnome-keyring: " Markus Volk
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../gnome-online-accounts/gnome-online-accounts_3.46.0.bb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb
index 0603a2d89..80cf4969c 100644
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb
@@ -13,7 +13,7 @@ SRC_URI[archive.sha256sum] = "5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec878
 PACKAGECONFIG_SOUP ?= "soup3"
 PACKAGECONFIG ?= "kerberos owncloud lastfm google windows_live ${PACKAGECONFIG_SOUP}"
 
-PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr"
+PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr3"
 PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false"
 PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false"
 PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 12/14] gnome-keyring: use gcr3
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (9 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 11/14] gnome-online-accounts: use gcr3 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 13/14] libnma: update 1.8.38 -> 1.10.4 Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 14/14] geary: build with gcr3 Markus Volk
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb
index 5937e7442..241a94cd7 100644
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = " \
     glib-2.0-native \
     gtk+3 \
-    gcr \
+    gcr3 \
     libgcrypt \
     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
 "
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 13/14] libnma: update 1.8.38 -> 1.10.4
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (10 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 12/14] gnome-keyring: " Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 14/14] geary: build with gcr3 Markus Volk
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

Update to fix use with gcr4

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../libnma/{libnma_1.8.38.bb => libnma_1.10.4.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-connectivity/libnma/{libnma_1.8.38.bb => libnma_1.10.4.bb} (88%)

diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb
similarity index 88%
rename from meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb
rename to meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb
index 341e29c08..3abfe0b7e 100644
--- a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb
+++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb
@@ -10,10 +10,10 @@ inherit gnomebase gobject-introspection gtk-doc gettext vala features_check
 REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)} opengl"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-SRC_URI[archive.sha256sum] = "5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4"
+SRC_URI[archive.sha256sum] = "79e730dda19f9b34886f4064aa170f1a2326b08329d655d80b67e906c7f78b7c"
 
 PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
-PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
+PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr4"
 PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
 PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
 
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [meta-gnome][PATCHv2 14/14] geary: build with gcr3
  2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
                   ` (11 preceding siblings ...)
  2022-11-26 23:03 ` [meta-gnome][PATCHv2 13/14] libnma: update 1.8.38 -> 1.10.4 Markus Volk
@ 2022-11-26 23:03 ` Markus Volk
  12 siblings, 0 replies; 14+ messages in thread
From: Markus Volk @ 2022-11-26 23:03 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Markus Volk

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-gnome/recipes-connectivity/geary/geary_43.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
index 8dd0ea67d..03738c554 100644
--- a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
+++ b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
@@ -10,7 +10,7 @@ DEPENDS = " \
     enchant2 \
     evolution-data-server \
     folks \
-    gcr \
+    gcr3 \
     gmime \
     gnome-online-accounts \
     gsound \
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-11-26 23:04 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 02/14] geocode-glib: build with libsoup-3.0 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 03/14] evolution-data-server: update 3.44.2 -> 3.46.1 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 04/14] gjs: update 1.72.2 -> 1.75.1 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 05/14] libgdata: use gcr3 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 06/14] mutter: update 42.0 -> 43.1 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 07/14] gnome-shell: " Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 08/14] gnome-settings-daemon: update 42.1 -> 43.0 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 09/14] mozjs: update 98 -> 102 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 10/14] polkit: add recipe for v122 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 11/14] gnome-online-accounts: use gcr3 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 12/14] gnome-keyring: " Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 13/14] libnma: update 1.8.38 -> 1.10.4 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 14/14] geary: build with gcr3 Markus Volk

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.