From 2c916b400bc608512db790d97df010ca666b6dd2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Nov 2021 09:42:14 +0100 Subject: [PATCH] package/libglib2: update fourth patch Update fourth patch to add girdir in gio-2.0.pc. This will fix the following build failure with libnice raised since commit aade2fd293fc8a13bc5665fa70a4002ddac9aae6: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler nice/Nice-0.1.gir --output nice/Nice-0.1.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir Fixes: - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...irdir-to-gio-2.0.pc-and-glib-2.0.pc.patch} | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) rename package/libglib2/{0004-glib-meson.build-add-girdir-to-glib.2.0.pc.patch => 0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch} (53%) diff --git a/package/libglib2/0004-glib-meson.build-add-girdir-to-glib.2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch similarity index 53% rename from package/libglib2/0004-glib-meson.build-add-girdir-to-glib.2.0.pc.patch rename to package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index 7eeecbe336..a29587bd31 100644 --- a/package/libglib2/0004-glib-meson.build-add-girdir-to-glib.2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -1,21 +1,36 @@ -From 04bdfff007c91fc620ed0b7cd02fd2e1e83bdefc Mon Sep 17 00:00:00 2001 +From ff3db531608eb0f9de8a88c1bc34fe0f1d93121c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Nov 2021 18:01:05 +0100 -Subject: [PATCH] glib/meson.build: add girdir to glib.2.0.pc +Subject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc -Add girdir to glib-2.0.pc to fix the following build failure with atk: +Add girdir to gio-2.0.pc and glib-2.0.pc to fix the following build +failure with atk or libnice: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler atk/Atk-1.0.gir --output atk/Atk-1.0.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir Fixes: - http://autobuild.buildroot.org/results/2716929db638977e6bf665352a08bd580e1dd0ae + - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7 Signed-off-by: Fabrice Fontaine --- + gio/meson.build | 1 + glib/meson.build | 1 + - 1 file changed, 1 insertion(+) + 2 files changed, 2 insertions(+) +diff --git a/gio/meson.build b/gio/meson.build +index 29473d26b..112d4ada9 100644 +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -831,6 +831,7 @@ pkg.generate(libgio, + variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), + 'schemasdir=' + join_paths('${datadir}', schemas_subdir), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), ++ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), + 'giomoduledir=' + pkgconfig_giomodulesdir, + 'gio=' + join_paths('${bindir}', 'gio'), + 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), diff --git a/glib/meson.build b/glib/meson.build index f78f32969..6c5486699 100644 --- a/glib/meson.build