adwaita-icon-theme: drop librsvg-native DEPENDS
PATCH 1/2 adwaita-icon-theme: drop librsvg-native DEPENDS
librsvg-native was previously used[1] because the install used gtk-encode-symbolic-svg. However, since adwaita moved to Meson this tool is no longer used.
[1] oe-core f109bb56f48 ("adwaita-icon-theme: depend on librsvg")
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-gnome/gnome/adwaita-icon-theme_51.0.bb | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-gnome/gnome/adwaita-icon-theme_51.0.bb +0 -2
@@ -14,8 +14,6 @@ inherit gnomebase allarch gtk-icon-cache SRC_URI[archive.sha256sum] = "ba561cf3c96305a47179fa5605856ad695c9238ea07f7093aebd9ba80c4e323b" -DEPENDS += "librsvg-native" - PACKAGES =+ "${PN}-cursors ${PN}-symbolic" RREPLACES:${PN} = "gnome-icon-theme"
Signature · 1 line
2.43.0
PATCH 2/2 gtk+3: add PACKAGECONFIG for demos and examples
Instead of explicitly enabling the examples and demos by default and disabling them in native builds, add a PACKAGECONFIG and enable it only in target builds.
This removes the demos from the nativesdk build, and more interestingly removes the unneeded librsvg-native dependency from the gtk+3-native build.
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-gnome/gtk+/gtk+3_3.24.52.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-gnome/gtk+/gtk+3_3.24.52.bb +3 -2
@@ -43,9 +43,9 @@ do_configure:prepend() { GTKDOC_MESON_OPTION = 'gtk_doc' EXTRA_OEMESON = "-Dxinerama=no -Dtests=false" -EXTRA_OEMESON:append:class-native = " -Ddemos=false -Dexamples=false" PACKAGECONFIG ??= " \ + examples \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'wayland', '', d)} \ "
@@ -60,6 +60,7 @@ PACKAGECONFIG[cups] = ",,cups,cups gtk3-printbackend-cups" PACKAGECONFIG[colord] = "-Dcolord=yes,-Dcolord=no,colord" PACKAGECONFIG[cloudproviders] = "-Dcloudproviders=true,-Dcloudproviders=false,libcloudproviders" PACKAGECONFIG[tracker3] = "-Dtracker3=true,-Dtracker3=false,tinysparql,localsearch" +PACKAGECONFIG[examples] = "-Ddemos=true -Dexamples=true,-Ddemos=false -Dexamples=false" prepare_gtk_scripts() { mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0
@@ -140,7 +141,7 @@ GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" -RDEPENDS:${PN}-demo += "librsvg-gtk" +RDEPENDS:${PN}-demo += "${@bb.utils.contains("PACKAGECONFIG", "examples", "librsvg-gtk", "", d)} " PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*"
Signature · 1 line
2.43.0