summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-07-27 16:36:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-30 09:16:50 +0100
commit6a300f48e783ee95ccad52fd47ad4e7d88279e4e (patch)
tree85c4bbb5ae514772c085fa5caec08229b207b4f6
parentc25df21f40c15cf087ec14f47ccbc7c3b5c84de2 (diff)
downloadopenembedded-core-6a300f48e783ee95ccad52fd47ad4e7d88279e4e.tar.gz
epiphany: upgrade 43.1 -> 44.5
With this version, epiphany has transitioned to gtk4, and requires webkit built with gtk4 support (there is no choice, it's a hard break). Adjust the webkit recipe accordingly. There's also a new requirement for gcr 4.x and libadwaita. Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_44.5.bb (renamed from meta/recipes-gnome/epiphany/epiphany_43.1.bb)5
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.40.2.bb5
2 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_43.1.bb b/meta/recipes-gnome/epiphany/epiphany_44.5.bb
index c97ede459d..f92d149c88 100644
--- a/meta/recipes-gnome/epiphany/epiphany_43.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_44.5.bb
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = " \
webkitgtk \
- gcr3 \
+ gcr \
gsettings-desktop-schemas \
nettle \
json-glib \
+ libadwaita \
libarchive \
libdazzle \
libhandy \
@@ -31,7 +32,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] = "3c475e04ed2a0f410cb44b96937563697079193ac9b7a50c91485fb9b08315ab"
# Developer mode enables debugging
PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb
index 8bef0b1605..a9391bfc99 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb
@@ -35,7 +35,7 @@ DEPENDS += " \
jpeg \
atk \
libwebp \
- gtk+3 \
+ gtk4 \
libxslt \
libtasn1 \
libnotify \
@@ -84,6 +84,7 @@ EXTRA_OECMAKE = " \
-DENABLE_MINIBROWSER=ON \
-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
-DENABLE_GAMEPAD=OFF \
+ -DUSE_GTK4=ON \
"
# Javascript JIT is not supported on ARC
@@ -124,7 +125,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-*/injected-bundle/*.so"
RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"