Skip to contentSkip to conversation

gobject-introspection: fix default search path for girdir

PATCH In review Chen Qi 2 participants 4 messages Aug 2, 2021 – Aug 3, 2021

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/1 gobject-introspection: fix default search path for girdir

When running g-ir-scanner, we get the following error:

Couldn't find include 'GObject-2.0.gir' (search path:
'['/usr/lib64', 'gir-1.0', '/usr/local/share/gir-1.0', '/usr/share/gir-1.0', '/usr/share/gir-1.0', '/usr/share/gir-1.0']')

This is because g-ir-tool-template.in is not setting girdir correctly. It's using the prefix instead of the actual girdir.

---
 ...-ir-tool-template.in-fix-girdir-path.patch | 33 +++++++++++++++++++
 .../gobject-introspection_1.68.0.bb           |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch new file +33 -0
new file mode 100644
index 0000000000..c0d263946b
@@ -0,0 +1,33 @@
+From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 13 Jul 2021 02:05:11 -0700
+Subject: [PATCH] g-ir-tool-template.in: fix girdir path
+
+In case gir_dir_prefix is set, it's possible that g-ir-scanner
+cannot find the .gir files. This is because that the girdir
+is set to gir_dir_prefix, which is wrong. It's not a prefix,
+it the actual gir dir.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ tools/g-ir-tool-template.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
+index 6e98f52e..62c07c31 100755
+--- a/tools/g-ir-tool-template.in
++++ b/tools/g-ir-tool-template.in
+@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir
+ 
+ # Respect gir_dir_prefix
+ girdir = ''
+-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@'))
++girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0'))
+ builtins.__dict__['GIRDIR'] = [girdir]
+ 
+ # Again, relative paths first so that the installation prefix is relocatable
+-- 
+2.30.2
+
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb +1 -0
index 048deabe64..647511f7ad 100644
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
            file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
+           file://0001-g-ir-tool-template.in-fix-girdir-path.patch \
            "
 
 SRC_URI[sha256sum] = "d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27"
Signature · 1 line
2.30.2
#1 lore raw

The concerns are the same as the previous time this patch was submitted:

This is not seen in the autobuilder, how can it be reproduced?

Also, please submit upstream first.

Alex

Quoted 90 lines · Chen Qi

When running g-ir-scanner, we get the following error:

Couldn't find include 'GObject-2.0.gir' (search path:
'['/usr/lib64', 'gir-1.0', '/usr/local/share/gir-1.0',
'/usr/share/gir-1.0',
'/usr/share/gir-1.0', '/usr/share/gir-1.0']')

This is because g-ir-tool-template.in is not setting girdir correctly. It's using the prefix instead of the actual girdir.

---
 ...-ir-tool-template.in-fix-girdir-path.patch | 33 +++++++++++++++++++
 .../gobject-introspection_1.68.0.bb           |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644

meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch new file mode 100644
index 0000000000..c0d263946b
--- /dev/null
+++
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch

meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch new file +26 -0
@@ -0,0 +1,33 @@
+From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 13 Jul 2021 02:05:11 -0700
+Subject: [PATCH] g-ir-tool-template.in: fix girdir path
+
+In case gir_dir_prefix is set, it's possible that g-ir-scanner
+cannot find the .gir files. This is because that the girdir
+is set to gir_dir_prefix, which is wrong. It's not a prefix,
+it the actual gir dir.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ tools/g-ir-tool-template.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
+index 6e98f52e..62c07c31 100755
+--- a/tools/g-ir-tool-template.in
++++ b/tools/g-ir-tool-template.in
+@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir
+
+ # Respect gir_dir_prefix
+ girdir = ''
+-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@

'))
++girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0'))
+ builtins.__dict__['GIRDIR'] = [girdir]
+
+ # Again, relative paths first so that the installation prefix is relocatable
+--
+2.30.2

(quoted diff) +1 -0
+
(quoted diff) +0 -0

gobject-introspection_1.68.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb index 048deabe64..647511f7ad 100644
--- a/meta/recipes-gnome/gobject-introspection/ gobject-introspection_1.68.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/ gobject-introspection_1.68.0.bb

(quoted diff) +1 -0
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM =
 "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}",
 2)}/${BPN}-${PV}.tar.xz \
 
 file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
+           file://0001-g-ir-tool-template.in-fix-girdir-path.patch \
            "

SRC_URI[sha256sum] =
"d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27" --
2.30.2

author
#2 lore raw

I didn't notice the previous email.
The reason that it's not seen on autobuilder is that it's runtime error.
At build time, it uses a wrapper which adds extra parameters including the correct path. That's why we didn't see any error at build time.

Regards,
Qi
________________________________
From: Alexander Kanavin <[email protected]>
Sent: Monday, August 2, 2021 20:57
To: Chen, Qi <[email protected]>
Cc: OE-core <[email protected]>
Subject: Re: [OE-core][PATCH] gobject-introspection: fix default search path for girdir

The concerns are the same as the previous time this patch was submitted:

This is not seen in the autobuilder, how can it be reproduced?

Also, please submit upstream first.

Alex

On Mon, 2 Aug 2021 at 08:25, Chen Qi <[email protected]<mailto:[email protected]>> wrote:
When running g-ir-scanner, we get the following error:

Couldn't find include 'GObject-2.0.gir' (search path:
'['/usr/lib64', 'gir-1.0', '/usr/local/share/gir-1.0', '/usr/share/gir-1.0', '/usr/share/gir-1.0', '/usr/share/gir-1.0']')

This is because g-ir-tool-template.in<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$> is not setting girdir correctly. It's using the prefix instead of the actual girdir.

---
 ...-ir-tool-template.in-fix-girdir-path.patch | 33 +++++++++++++++++++
 .../gobject-introspection_1.68.0.bb<https://urldefense.com/v3/__http://gobject-introspection_1.68.0.bb__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVzZmyFvTA$>           |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch new file +33 -0
new file mode 100644
index 0000000000..c0d263946b
@@ -0,0 +1,33 @@
+From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]<mailto:[email protected]>>
+Date: Tue, 13 Jul 2021 02:05:11 -0700
+Subject: [PATCH] g-ir-tool-template.in<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>: fix girdir path
+
+In case gir_dir_prefix is set, it's possible that g-ir-scanner
+cannot find the .gir files. This is because that the girdir
+is set to gir_dir_prefix, which is wrong. It's not a prefix,
+it the actual gir dir.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]<mailto:[email protected]>>
+---
+ tools/g-ir-tool-template.in<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$> | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/g-ir-tool-template.in<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$> b/tools/g-ir-tool-template.in<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
+index 6e98f52e..62c07c31 100755
+--- a/tools/g-ir-tool-template.in<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
++++ b/tools/g-ir-tool-template.in<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
+@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir
+
+ # Respect gir_dir_prefix
+ girdir = ''
+-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@'))
++girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0'))
+ builtins.__dict__['GIRDIR'] = [girdir]
+
+ # Again, relative paths first so that the installation prefix is relocatable
+--
+2.30.2
+
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb<https://urldefense.com/v3/__http://gobject-introspection_1.68.0.bb__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVzZmyFvTA$> +1 -0
index 048deabe64..647511f7ad 100644
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
            file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
+           file://0001-g-ir-tool-template.in-fix-girdir-path.patch \
            "
 
 SRC_URI[sha256sum] = "d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27"

--
2.30.2

#3 lore raw

Can you please provide the steps needed to reproduce the error? Can they be automated and added to the AB? Otherwise, I cannot meaningfully review the patch.

Also, the second concern is still not addressed: please submit upstream first, and include the link to the oe-core submission. It's only a merge request on gnome gitlab.

Alex

Quoted 133 lines · Qi

I didn't notice the previous email.
The reason that it's not seen on autobuilder is that it's runtime error. At build time, it uses a wrapper which adds extra parameters including the correct path. That's why we didn't see any error at build time.

Regards,
Qi
------------------------------
*From:* Alexander Kanavin <[email protected]>
*Sent:* Monday, August 2, 2021 20:57
*To:* Chen, Qi <[email protected]>
*Cc:* OE-core <[email protected]> *Subject:* Re: [OE-core][PATCH] gobject-introspection: fix default search path for girdir

The concerns are the same as the previous time this patch was submitted:

This is not seen in the autobuilder, how can it be reproduced?

Also, please submit upstream first.

Alex

On Mon, 2 Aug 2021 at 08:25, Chen Qi <[email protected]> wrote:

When running g-ir-scanner, we get the following error:

Couldn't find include 'GObject-2.0.gir' (search path:
'['/usr/lib64', 'gir-1.0', '/usr/local/share/gir-1.0',
'/usr/share/gir-1.0',
'/usr/share/gir-1.0', '/usr/share/gir-1.0']')

This is because g-ir-tool-template.in
<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
is not setting girdir correctly.
It's using the prefix instead of the actual girdir.

---
 ...-ir-tool-template.in-fix-girdir-path.patch | 33 +++++++++++++++++++
 .../gobject-introspection_1.68.0.bb
<https://urldefense.com/v3/__http://gobject-introspection_1.68.0.bb__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVzZmyFvTA$>
         |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644

meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch new file mode 100644
index 0000000000..c0d263946b
--- /dev/null
+++
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch

meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch new file +4 -0
@@ -0,0 +1,33 @@
+From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 13 Jul 2021 02:05:11 -0700
+Subject: [PATCH] g-ir-tool-template.in

<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>:
fix girdir path

meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch new file +11 -0
+
+In case gir_dir_prefix is set, it's possible that g-ir-scanner
+cannot find the .gir files. This is because that the girdir
+is set to gir_dir_prefix, which is wrong. It's not a prefix,
+it the actual gir dir.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ tools/g-ir-tool-template.in

<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
| 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

(quoted diff) +2 -0
+
+diff --git a/tools/g-ir-tool-template.in

<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
b/tools/g-ir-tool-template.in
<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
+index 6e98f52e..62c07c31 100755
+--- a/tools/g-ir-tool-template.in
<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
++++ b/tools/g-ir-tool-template.in
<https://urldefense.com/v3/__http://g-ir-tool-template.in__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVyKRXwDEQ$>
+@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir
+
+ # Respect gir_dir_prefix
+ girdir = ''
+-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@ '))
++girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0'))
+ builtins.__dict__['GIRDIR'] = [girdir]
+
+ # Again, relative paths first so that the installation prefix is relocatable
+--
+2.30.2

(quoted diff) +1 -0
+
(quoted diff) +0 -0

gobject-introspection_1.68.0.bb
<https://urldefense.com/v3/__http://gobject-introspection_1.68.0.bb__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVzZmyFvTA$>
b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb
<https://urldefense.com/v3/__http://gobject-introspection_1.68.0.bb__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVzZmyFvTA$>
index 048deabe64..647511f7ad 100644
--- a/meta/recipes-gnome/gobject-introspection/ gobject-introspection_1.68.0.bb
<https://urldefense.com/v3/__http://gobject-introspection_1.68.0.bb__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVzZmyFvTA$>
+++ b/meta/recipes-gnome/gobject-introspection/ gobject-introspection_1.68.0.bb
<https://urldefense.com/v3/__http://gobject-introspection_1.68.0.bb__;!!AjveYdw8EvQ!J_A1otd5YXy92u0Rt13BFCPh2oDkkoD52jcpckk63XwzQq-riVTsPB7qUVzZmyFvTA$>

(quoted diff) +1 -0
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM =
 "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}",
 2)}/${BPN}-${PV}.tar.xz \
 
 file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
+           file://0001-g-ir-tool-template.in-fix-girdir-path.patch \
            "

SRC_URI[sha256sum] =
"d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27" --
2.30.2