Skip to content

Commit

Permalink
xdg-dbus-proxy, bubblewrap: update recipes and fix build with webkit (#…
Browse files Browse the repository at this point in the history
…478)

 * Update recipes for xdg-dbus-proxy and bubblewrap and also remove
   the patches already merged (checked).

 * Pass the run-time paths to the wpewebkit and webkitgtk recipe which
   is needed when cross-building since https://commits.webkit.org/264244@main

 * Remove also the native recipes which are not needed for anything.
  • Loading branch information
clopez committed Aug 13, 2023
1 parent 46f42b8 commit b540e6f
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 109 deletions.
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ This layer optionally depends on:
If meta-qt5 is present, this layer will provide an opt-in Qt5 API as an
alternative to other Qt5 web-engines such as QtWebKit and QtWebEngine.

This layer also optionally depends on meta-security to enable web process
sandboxing for WebKit (`bubblewrap`):

URI: git://git.yoctoproject.org/meta-security
branch: main
revision: HEAD

**Warning**: The default branch has been renamed to `main` because
[#219](https://github.com/Igalia/meta-webkit/issues/219). The old default
branch (`master`) will still be kept as a mirror of the `main` until February
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/webkitgtk/webkitgtk_2.38.6.bb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ PACKAGECONFIG ??= " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)
"

PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,bubblewrap xdg-dbus-proxy bubblewrap-native xdg-dbus-proxy-native libseccomp"
PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,bubblewrap xdg-dbus-proxy libseccomp"
PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette"
PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/webkitgtk/webkitgtk_2.40.3.bb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ PACKAGECONFIG ??= " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)
"

PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,bubblewrap xdg-dbus-proxy bubblewrap-native xdg-dbus-proxy-native libseccomp"
PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,bubblewrap xdg-dbus-proxy libseccomp"
PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette"
PACKAGECONFIG[gbm] = "-DUSE_GBM=ON,-DUSE_GBM=OFF,libdrm"
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/wpewebkit/wpewebkit.inc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=R
# WPE features
PACKAGECONFIG[accessibility] = "-DENABLE_ACCESSIBILITY=ON,-DENABLE_ACCESSIBILITY=OFF,atk at-spi2-atk"
PACKAGECONFIG[avif] = "-DUSE_AVIF=ON,-DUSE_AVIF=OFF,libavif"
PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,bubblewrap xdg-dbus-proxy bubblewrap-native xdg-dbus-proxy-native libseccomp"
PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,bubblewrap xdg-dbus-proxy libseccomp"
PACKAGECONFIG[developer-mode] = "-DDEVELOPER_MODE=ON,-DDEVELOPER_MODE=OFF,wayland-native wayland-protocols wpebackend-fdo"
PACKAGECONFIG[deviceorientation] = "-DENABLE_DEVICE_ORIENTATION=ON,-DENABLE_DEVICE_ORIENTATION=OFF,"
PACKAGECONFIG[dfg-jit] = "-DENABLE_DFG_JIT=ON,-DENABLE_DFG_JIT=OFF,"
Expand Down
20 changes: 0 additions & 20 deletions recipes-flatpak/bubblewrap/bubblewrap_0.4.1.bb

This file was deleted.

16 changes: 16 additions & 0 deletions recipes-flatpak/bubblewrap/bubblewrap_0.8.0.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
DESCRIPTION = "Helper binary for running applications sandboxed"
HOMEPAGE = "https://github.com/containers/bubblewrap"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"

DEPENDS = "libcap"

SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz"
SRC_URI[sha256sum] = "957ad1149db9033db88e988b12bcebe349a445e1efc8a9b59ad2939a113d333a"

inherit meson pkgconfig

PACKAGECONFIG ??= ""
PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux"

EXTRA_OEMESON += "-Dman=disabled -Dbash_completion=disabled -Dzsh_completion=disabled -Dtests=false"

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions recipes-flatpak/xdg-dbus-proxy/xdg-dbus-proxy_0.1.2.bb

This file was deleted.

12 changes: 12 additions & 0 deletions recipes-flatpak/xdg-dbus-proxy/xdg-dbus-proxy_0.1.4.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
HOMEPAGE = "https://github.com/flatpak/xdg-dbus-proxy"
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"

DEPENDS = "glib-2.0"

SRC_URI = "https://github.com/flatpak/${BPN}/releases/download/${PV}/${BP}.tar.xz"
SRC_URI[sha256sum] = "1ec0eab53d1e49966d722352bcfd51ac402dce5190baedc749a8541e761670ab"

inherit meson pkgconfig

EXTRA_OEMESON += "-Dman=disabled -Dtests=false"

0 comments on commit b540e6f

Please sign in to comment.