Skip to contentSkip to conversation

xcb-proto: update to 1.14.1

PATCH In review Martin Jansa 3 participants 7 messages Mar 10, 2021 – Mar 12, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xcb-proto: update to 1.14.1

From: Richard Leitner <[email protected]>

This fixes [1] the following build error for nativesdk on Fedora 33 which is caused by the removal of fractions.gcd() in favor of math.gcd() in python 3.9 [2]:

ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)

Furthermore the SRC_URI is adapted as the old one doesn't provide the 1.14.1 archive.

[1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
[2] https://bugs.python.org/issue39350

It's needed in gatesgarth and possibly dunfell as well to support distributions with python-3.9 as we build libxcb-native, which is failing with xcb-proto-1.14.

1.14.1 is a bug fix release:
https://lists.x.org/archives/xorg-announce/2020-October/003061.html

---
 .../xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb} (84%)
meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb renamed from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb +2 -2
similarity index 84%
rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
rename to meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
index 6de30098d6..52e474a2e9 100644
@@ -11,8 +11,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
                     file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz"
-SRC_URI[sha256sum] = "186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605"
+SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz"
+SRC_URI[sha256sum] = "f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3"
 
 inherit autotools pkgconfig python3native
 
Signature · 1 line
2.30.1
#1 lore raw
Quoted 15 lines · Martin Jansa

From: Richard Leitner <[email protected]>

This fixes [1] the following build error for nativesdk on Fedora 33 which is caused by the removal of fractions.gcd() in favor of math.gcd() in python 3.9 [2]:

ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)

Furthermore the SRC_URI is adapted as the old one doesn't provide the 1.14.1 archive.

[1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
[2] https://bugs.python.org/issue39350

Quoted 6 lines

It's needed in gatesgarth and possibly dunfell as well to support distributions with python-3.9 as we build libxcb-native, which is failing with xcb-proto-1.14.

1.14.1 is a bug fix release:
https://lists.x.org/archives/xorg-announce/2020-October/003061.html

Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.

Steve

Quoted 31 lines
---
 .../xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb} (84%)
meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb renamed from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb +2 -3
similarity index 84%
rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
rename to meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
index 6de30098d6..52e474a2e9 100644
@@ -11,8 +11,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
                     file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz"
-SRC_URI[sha256sum] = "186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605"
+SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz"
+SRC_URI[sha256sum] = "f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3"
 
 inherit autotools pkgconfig python3native
 
--

2.30.1

#2 lore raw
Quoted 16 lines · Steve Sakoman
Quoted 15 lines · Martin Jansa

From: Richard Leitner <[email protected]>

This fixes [1] the following build error for nativesdk on Fedora 33 which is caused by the removal of fractions.gcd() in favor of math.gcd() in python 3.9 [2]:

ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)

Furthermore the SRC_URI is adapted as the old one doesn't provide the 1.14.1 archive.

[1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
[2] https://bugs.python.org/issue39350

Quoted 8 lines
Quoted 6 lines

It's needed in gatesgarth and possibly dunfell as well to support distributions with python-3.9 as we build libxcb-native, which is failing with xcb-proto-1.14.

1.14.1 is a bug fix release:
https://lists.x.org/archives/xorg-announce/2020-October/003061.html

Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.

I see, well luckily 1.14 doesn't look too scary as well:
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6

If this is the only issue for building dunfell with host distro with python-3.9 then I think it should be considered.

Isn't autobuilder using some new host distro with python-3.9 already?

FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on it now.

Quoted 31 lines
Quoted 31 lines
---
 .../xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb} (84%)
meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb renamed from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb +2 -3
similarity index 84%
rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
rename to meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
index 6de30098d6..52e474a2e9 100644
@@ -11,8 +11,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
                     file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz"
-SRC_URI[sha256sum] = "186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605"
+SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz"
+SRC_URI[sha256sum] = "f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3"
 
 inherit autotools pkgconfig python3native
 
--

2.30.1

#3 lore raw
Quoted 30 lines · Martin Jansa
Quoted 16 lines · Steve Sakoman
Quoted 15 lines · Martin Jansa

From: Richard Leitner <[email protected]>

This fixes [1] the following build error for nativesdk on Fedora 33 which is caused by the removal of fractions.gcd() in favor of math.gcd() in python 3.9 [2]:

ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)

Furthermore the SRC_URI is adapted as the old one doesn't provide the 1.14.1 archive.

[1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
[2] https://bugs.python.org/issue39350

Quoted 8 lines
Quoted 6 lines

It's needed in gatesgarth and possibly dunfell as well to support distributions with python-3.9 as we build libxcb-native, which is failing with xcb-proto-1.14.

1.14.1 is a bug fix release:
https://lists.x.org/archives/xorg-announce/2020-October/003061.html

Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.

I see, well luckily 1.14 doesn't look too scary as well:
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6

Quoted 7 lines

If this is the only issue for building dunfell with host distro with python-3.9 then I think it should be considered.

Isn't autobuilder using some new host distro with python-3.9 already?

FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on it now.

At least for LuneOS images this was the only build issue I've seen with 21.04.

Together with an warning about glibc:
WARNING: Your host glibc version (2.33) is newer than that in uninative (2.32). Disabling uninative so that sstate is not corrupted.

which I see you're going to address in new PR with uninative upgrade.

Cheers,

#4 lore raw
Quoted 32 lines · Martin Jansa
Quoted 30 lines · Martin Jansa
Quoted 16 lines · Steve Sakoman
Quoted 15 lines · Martin Jansa

From: Richard Leitner <[email protected]>

This fixes [1] the following build error for nativesdk on Fedora 33 which is caused by the removal of fractions.gcd() in favor of math.gcd() in python 3.9 [2]:

ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)

Furthermore the SRC_URI is adapted as the old one doesn't provide the 1.14.1 archive.

[1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
[2] https://bugs.python.org/issue39350

Quoted 8 lines
Quoted 6 lines

It's needed in gatesgarth and possibly dunfell as well to support distributions with python-3.9 as we build libxcb-native, which is failing with xcb-proto-1.14.

1.14.1 is a bug fix release:
https://lists.x.org/archives/xorg-announce/2020-October/003061.html

Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.

I see, well luckily 1.14 doesn't look too scary as well:
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6

Quoted 8 lines
Quoted 6 lines

If this is the only issue for building dunfell with host distro with python-3.9 then I think it should be considered.
Isn't autobuilder using some new host distro with python-3.9 already?

FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on it now.

At least for LuneOS images this was the only build issue I've seen with 21.04.

I'll add the version bump to my next set of patches for testing.

Steve

Quoted 9 lines

Together with an warning about glibc:
WARNING: Your host glibc version (2.33) is newer than that in uninative (2.32). Disabling uninative so that sstate is not corrupted.

which I see you're going to address in new PR with uninative upgrade.

Cheers,

#5 lore raw
Quoted 37 lines · Steve Sakoman
Quoted 36 lines · Martin Jansa
Quoted 34 lines · Martin Jansa
Quoted 16 lines · Steve Sakoman
Quoted 15 lines · Martin Jansa

From: Richard Leitner <[email protected]>

This fixes [1] the following build error for nativesdk on Fedora 33 which is caused by the removal of fractions.gcd() in favor of math.gcd() in python 3.9 [2]:

ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)

Furthermore the SRC_URI is adapted as the old one doesn't provide the 1.14.1 archive.

[1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
[2] https://bugs.python.org/issue39350

Quoted 8 lines
Quoted 6 lines

It's needed in gatesgarth and possibly dunfell as well to support distributions with python-3.9 as we build libxcb-native, which is failing with xcb-proto-1.14.

1.14.1 is a bug fix release:
https://lists.x.org/archives/xorg-announce/2020-October/003061.html

Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.

I see, well luckily 1.14 doesn't look too scary as well:
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6

If this is the only issue for building dunfell with host distro with python-3.9 then I think it should be considered.
Isn't autobuilder using some new host distro with python-3.9 already?

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on it now.

At least for LuneOS images this was the only build issue I've seen with 21.04.

I'll add the version bump to my next set of patches for testing.

Steve: I'm sorry, please forget what I said about upgrade, 1.13 version in dunfell already has this fix for python-3.9 backported in:
https://git.openembedded.org/openembedded-core/commit/?h=0f688c1419b1e2dfddff3c985f89a3f1949fc9fb

so only 1.14 version in gatesgarth is affected.

If you already have those updates in queue, then they shouldn't harm, but aren't so necessary thanks to this backport.

Quoted 9 lines
Quoted 9 lines

Together with an warning about glibc:
WARNING: Your host glibc version (2.33) is newer than that in uninative (2.32). Disabling uninative so that sstate is not corrupted.

which I see you're going to address in new PR with uninative upgrade.

Cheers,

#6 lore raw
Quoted 42 lines · Martin Jansa
Quoted 40 lines · Steve Sakoman
Quoted 39 lines · Martin Jansa
Quoted 36 lines · Martin Jansa
Quoted 16 lines · Steve Sakoman
Quoted 15 lines · Martin Jansa

From: Richard Leitner <[email protected]>

This fixes [1] the following build error for nativesdk on Fedora 33 which is caused by the removal of fractions.gcd() in favor of math.gcd() in python 3.9 [2]:

ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)

Furthermore the SRC_URI is adapted as the old one doesn't provide the 1.14.1 archive.

[1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
[2] https://bugs.python.org/issue39350

Quoted 8 lines
Quoted 6 lines

It's needed in gatesgarth and possibly dunfell as well to support distributions with python-3.9 as we build libxcb-native, which is failing with xcb-proto-1.14.

1.14.1 is a bug fix release:
https://lists.x.org/archives/xorg-announce/2020-October/003061.html

Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.

I see, well luckily 1.14 doesn't look too scary as well:
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6

If this is the only issue for building dunfell with host distro with python-3.9 then I think it should be considered.
Isn't autobuilder using some new host distro with python-3.9 already?

FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on it now.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

At least for LuneOS images this was the only build issue I've seen with 21.04.

I'll add the version bump to my next set of patches for testing.

Steve: I'm sorry, please forget what I said about upgrade, 1.13 version in dunfell already has this fix for python-3.9 backported in:
https://git.openembedded.org/openembedded-core/commit/?h=0f688c1419b1e2dfddff3c985f89a3f1949fc9fb

Ah, yes, I remember that now! Good catch.

Quoted 4 lines

so only 1.14 version in gatesgarth is affected.

If you already have those updates in queue, then they shouldn't harm, but aren't so necessary thanks to this backport.

I haven't started testing with them yet, so I'll drop them.

Steve

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

Together with an warning about glibc:
WARNING: Your host glibc version (2.33) is newer than that in uninative (2.32). Disabling uninative so that sstate is not corrupted.

which I see you're going to address in new PR with uninative upgrade.

Cheers,