[meta-lts-mixins][scarthgap/rust][PATCH 20/35] librsvg: consolidate PACKAGECONFIG

From: Ross Burton <[email protected]>

Explictly appending PACKAGECONFIG makes it harder to directly control
PACKAGECONFIG, merge the assignments to keep it simple.

This does not change the behaviour of native builds as G-I is disabled
in native.

Signed-off-by: Ross Burton <[email protected]>
Signed-off-by: Mathieu Dubois-Briand <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
(adapted from oe-core commit 8c240544896f32bf55499cfcd2e4471c505ed669)
Signed-off-by: Scott Murray <[email protected]>
---
 recipes-gnome/librsvg/librsvg_2.61.3.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-gnome/librsvg/librsvg_2.61.3.bb b/recipes-gnome/librsvg/librsvg_2.61.3.bb
index 1dbfab3..e9a14c6 100644
--- a/recipes-gnome/librsvg/librsvg_2.61.3.bb
+++ b/recipes-gnome/librsvg/librsvg_2.61.3.bb
@@ -56,8 +56,9 @@ LDFLAGS += " -L${B}/rsvg"
 # needed on ubuntu 20.04/debian 11 to avoid 'undefined reference to `dlsym'' errors
 BUILD_LDFLAGS += " -ldl"
 
-PACKAGECONFIG ??= "gdkpixbuf ${@bb.utils.contains('PTEST_ENABLED', '1', 'apitest', '', d)}"
-PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vala', '', d)}"
+PACKAGECONFIG ??= "gdkpixbuf \
+                   ${@bb.utils.contains('PTEST_ENABLED', '1', 'apitest', '', d)} \
+                   ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vala', '', d)}"
 # The gdk-pixbuf loader
 PACKAGECONFIG[gdkpixbuf] = "-Dpixbuf-loader=enabled,-Dpixbuf-loader=disabled,gdk-pixbuf-native"
 PACKAGECONFIG[vala] = "-Dvala=enabled,-Dvala=disabled"
-- 
2.55.0