[Buildroot] [PATCH 1/1] package/libglib2: drop unused 0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch

[Buildroot] [PATCH 1/1] package/libglib2: drop unused 0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch

[Fiona Klute via buildroot]

In 11aa1cfa5af9a77a0a9f726bd38f1b7db659c0bf the patch was accidentally
moved into a versioned directory with the wrong version (2.82.0
instead of 2.82.4) and thus not applied. However, there have been no
issues reported.

The patch description mentions being needed to fix build errors in
package/atk and package/libnice. It was originally added in
b094f88a4d501101bfba9b65491209e6a0fe0397, and amended for libnice in
2c916b400bc608512db790d97df010ca666b6dd2. package/atk was removed in
2c3ca7bea1de76163aeef432412eb14551ed0581, because atk has been merged
into at-spi2-core. Both at-spi2-core and libnice are Meson packages,
as was atk at the time of its removal.

Both current packages build with the following configuration (tested
using utils/test-pkg):

BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_GOBJECT_INTROSPECTION=y
BR2_PACKAGE_LIBNICE=y
BR2_PACKAGE_AT_SPI2_CORE=y

Evidently the patch is no longer needed, presumably because the
correct search path for GIR files is set by other means, and we can
remove it instead of fixing the version number of the patch directory.

Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
---
I admit it is a bit unsatisfying that it's unclear exactly *what*
fixed that search path. Another bit of evidence I have is that when
working on that libglib2 2.82.x and gobject-introspection 1.82.0
version bump it was primarily for package/python-gobject, which also
uses Meson, so it probably was either that bump or a Meson bump at
some point before.

TestPythonPy3NetworkmanagerGoi (accessing NM using python-gobject)
passes with this patch.

For stable branches it's probably easiest to verify at-spi2-core and
libnice build using test-pkg and the config snippet above.

 ...girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 53 -------------------
 package/libglib2/libglib2-bootstrap/2.82.0    |  1 -
 2 files changed, 54 deletions(-)
 delete mode 100644 package/libglib2/2.82.0/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
 delete mode 120000 package/libglib2/libglib2-bootstrap/2.82.0

diff --git a/package/libglib2/2.82.0/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/2.82.0/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
deleted file mode 100644
index c6135b15a1..0000000000
--- a/package/libglib2/2.82.0/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3fcd5f431dee9909b6bcbd9b8b61d4b1fe4b5f92 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 12 Nov 2021 18:01:05 +0100
-Subject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc
-
-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 <fontaine.fabrice@gmail.com>
-[Dario: make the patch to be applied with fuzz factor 0]
-Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
-[Fiona: refresh for glib 2.80.4]
-Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
-Upstream: Never submitted
----
- gio/meson.build  | 1 +
- glib/meson.build | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/gio/meson.build b/gio/meson.build
-index 59c2b0f..5120537 100644
---- a/gio/meson.build
-+++ b/gio/meson.build
-@@ -885,6 +885,7 @@ pkg.generate(libgio,
-   variables : [
-     'schemasdir=' + '${datadir}' / schemas_subdir,
-     'dtdsdir=' + '${datadir}' / dtds_subdir,
-+    'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
-     'giomoduledir=' + pkgconfig_giomodulesdir,
-     'gio=' + '${bindir}' / 'gio',
-     'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
-diff --git a/glib/meson.build b/glib/meson.build
-index d2efeba..a69532b 100644
---- a/glib/meson.build
-+++ b/glib/meson.build
-@@ -447,6 +447,7 @@ pkg.generate(libglib,
-   subdirs : ['glib-2.0'],
-   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
-   variables : [
-+    'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
-     'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal',
-     'gobject_query=' + '${bindir}' / 'gobject-query',
-     'glib_mkenums=' + '${bindir}' / 'glib-mkenums',
--- 
-2.45.2
-
diff --git a/package/libglib2/libglib2-bootstrap/2.82.0 b/package/libglib2/libglib2-bootstrap/2.82.0
deleted file mode 120000
index 28b180f102..0000000000
--- a/package/libglib2/libglib2-bootstrap/2.82.0
+++ /dev/null
@@ -1 +0,0 @@
-../2.82.0
\ No newline at end of file
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/libglib2: drop unused 0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch

[Thomas Perale via buildroot]

Hi Fiona,

In reply of:
> In 11aa1cfa5af9a77a0a9f726bd38f1b7db659c0bf the patch was accidentally
> moved into a versioned directory with the wrong version (2.82.0
> instead of 2.82.4) and thus not applied. However, there have been no
> issues reported.
> 
> The patch description mentions being needed to fix build errors in
> package/atk and package/libnice. It was originally added in
> b094f88a4d501101bfba9b65491209e6a0fe0397, and amended for libnice in
> 2c916b400bc608512db790d97df010ca666b6dd2. package/atk was removed in
> 2c3ca7bea1de76163aeef432412eb14551ed0581, because atk has been merged
> into at-spi2-core. Both at-spi2-core and libnice are Meson packages,
> as was atk at the time of its removal.
> 
> Both current packages build with the following configuration (tested
> using utils/test-pkg):
> 
> BR2_PACKAGE_PYTHON3=y
> BR2_PACKAGE_GOBJECT_INTROSPECTION=y
> BR2_PACKAGE_LIBNICE=y
> BR2_PACKAGE_AT_SPI2_CORE=y
> 
> Evidently the patch is no longer needed, presumably because the
> correct search path for GIR files is set by other means, and we can
> remove it instead of fixing the version number of the patch directory.
> 
> Signed-off-by: Fiona Klute <fiona.klute@gmx.de>

> ---
> I admit it is a bit unsatisfying that it's unclear exactly *what*
> fixed that search path. Another bit of evidence I have is that when
> working on that libglib2 2.82.x and gobject-introspection 1.82.0
> version bump it was primarily for package/python-gobject, which also
> uses Meson, so it probably was either that bump or a Meson bump at
> some point before.
> 
> TestPythonPy3NetworkmanagerGoi (accessing NM using python-gobject)
> passes with this patch.
> 
> For stable branches it's probably easiest to verify at-spi2-core and
> libnice build using test-pkg and the config snippet above.

It builds on 2025.02.x.

Tested-by: Thomas Perale <thomas.perale@mind.be>

What do you think would be the next steps ?
Do we still need to have a shared patch directory between libglib2 and libglib2
bootstrap ? Only on 2025.02.x since there are not patches on 'master' branch.

Best regards,
PERALE Thomas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/libglib2: drop unused 0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch

[Peter Korsgaard]

>>>>> "Fiona" == Fiona Klute <fiona.klute@gmx.de> writes:

 > In 11aa1cfa5af9a77a0a9f726bd38f1b7db659c0bf the patch was accidentally
 > moved into a versioned directory with the wrong version (2.82.0
 > instead of 2.82.4) and thus not applied. However, there have been no
 > issues reported.

 > The patch description mentions being needed to fix build errors in
 > package/atk and package/libnice. It was originally added in
 > b094f88a4d501101bfba9b65491209e6a0fe0397, and amended for libnice in
 > 2c916b400bc608512db790d97df010ca666b6dd2. package/atk was removed in
 > 2c3ca7bea1de76163aeef432412eb14551ed0581, because atk has been merged
 > into at-spi2-core. Both at-spi2-core and libnice are Meson packages,
 > as was atk at the time of its removal.

 > Both current packages build with the following configuration (tested
 > using utils/test-pkg):

 > BR2_PACKAGE_PYTHON3=y
 > BR2_PACKAGE_GOBJECT_INTROSPECTION=y
 > BR2_PACKAGE_LIBNICE=y
 > BR2_PACKAGE_AT_SPI2_CORE=y

 > Evidently the patch is no longer needed, presumably because the
 > correct search path for GIR files is set by other means, and we can
 > remove it instead of fixing the version number of the patch directory.

 > Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
 > ---
 > I admit it is a bit unsatisfying that it's unclear exactly *what*
 > fixed that search path. Another bit of evidence I have is that when
 > working on that libglib2 2.82.x and gobject-introspection 1.82.0
 > version bump it was primarily for package/python-gobject, which also
 > uses Meson, so it probably was either that bump or a Meson bump at
 > some point before.

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/libglib2: drop unused 0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch

[Fiona Klute via buildroot]

Hi Thomas!

Am 29.06.26 um 09:42 schrieb Thomas Perale:
> Hi Fiona,
> 
> In reply of:
>> In 11aa1cfa5af9a77a0a9f726bd38f1b7db659c0bf the patch was accidentally
>> moved into a versioned directory with the wrong version (2.82.0
>> instead of 2.82.4) and thus not applied. However, there have been no
>> issues reported.
>>
>> The patch description mentions being needed to fix build errors in
>> package/atk and package/libnice. It was originally added in
>> b094f88a4d501101bfba9b65491209e6a0fe0397, and amended for libnice in
>> 2c916b400bc608512db790d97df010ca666b6dd2. package/atk was removed in
>> 2c3ca7bea1de76163aeef432412eb14551ed0581, because atk has been merged
>> into at-spi2-core. Both at-spi2-core and libnice are Meson packages,
>> as was atk at the time of its removal.
>>
>> Both current packages build with the following configuration (tested
>> using utils/test-pkg):
>>
>> BR2_PACKAGE_PYTHON3=y
>> BR2_PACKAGE_GOBJECT_INTROSPECTION=y
>> BR2_PACKAGE_LIBNICE=y
>> BR2_PACKAGE_AT_SPI2_CORE=y
>>
>> Evidently the patch is no longer needed, presumably because the
>> correct search path for GIR files is set by other means, and we can
>> remove it instead of fixing the version number of the patch directory.
>>
>> Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
> 
>> ---
>> I admit it is a bit unsatisfying that it's unclear exactly *what*
>> fixed that search path. Another bit of evidence I have is that when
>> working on that libglib2 2.82.x and gobject-introspection 1.82.0
>> version bump it was primarily for package/python-gobject, which also
>> uses Meson, so it probably was either that bump or a Meson bump at
>> some point before.
>>
>> TestPythonPy3NetworkmanagerGoi (accessing NM using python-gobject)
>> passes with this patch.
>>
>> For stable branches it's probably easiest to verify at-spi2-core and
>> libnice build using test-pkg and the config snippet above.
> 
> It builds on 2025.02.x.
> 
> Tested-by: Thomas Perale <thomas.perale@mind.be>
> 
> What do you think would be the next steps ?
> Do we still need to have a shared patch directory between libglib2 and libglib2
> bootstrap ? Only on 2025.02.x since there are not patches on 'master' branch.
2025.02.x, 2026.02.x, and 2026.05.x all have the same issue with the 
versioned patch directory, but no other patches. So I'd say if 
at-spi2-core and libnice build anyway, just backport this patch to tidy 
up. :-)

If we add patches in the future, we should apply them to both libglib2 
and libglib2-bootstrap, so we don't add odd bugs with the difference. 
Whether to use a versioned directory or symlinks directly in the 
bootstrap package is just a matter of what's more convenient.

Best regards,
Fiona

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot