Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

glib: support python 3.12 #24591

Merged
merged 3 commits into from
Jul 12, 2024
Merged

glib: support python 3.12 #24591

merged 3 commits into from
Jul 12, 2024

Conversation

ErniGH
Copy link
Contributor

@ErniGH ErniGH commented Jul 11, 2024 •
edited by jcar87
Loading

Changes in this PR:

  • Backport: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4133 to support python 3.12 (which does not have distutils). Also compatible with earlier versions of python.
  • Use newer version of meson (at least 1.2.3 is required to support python 3.12, otherwise it complains about missing distutils, see here)

@ErniGH ErniGH requested a review from jcar87 July 11, 2024 15:23
@ErniGH ErniGH changed the title patches glibpatches Jul 11, 2024
@ErniGH ErniGH changed the title glibpatches glib patches Jul 11, 2024
@jcar87 jcar87 changed the title glib patches glib: support python 3.12 Jul 11, 2024
@jcar87 jcar87 mentioned this pull request Jul 11, 2024
Closed
3 tasks
@conan-center-bot

This comment has been minimized.

Sign in to view
AbrilRBS
AbrilRBS reviewed Jul 11, 2024
View reviewed changes
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job! Some minor comments, otherwise looks great :)

recipes/glib/all/conandata.yml
"2.76.3":
- patch_file: "patches/libintl-discovery.patch"
patch_type: bugfix
patch_description: fix libintl discovery
patch_source: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3352
- patch_file: "patches/remove-distutils.patch"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this file also be versioned as 2.75 just like above? It wil make it less likely that it ends up dangling in the future :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't worry too much - we can use tooling to find dangling patches regardless of the filename, and they are not critical

recipes/glib/all/patches/remove-distutils-2.77.0.patch
+++ b/gio/gdbus-2.0/codegen/utils.py
@@ -19,7 +19,7 @@
#
# Author: David Zeuthen <davidz@redhat.com>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:verymad: The original patch is yours, they stole your credit! hahaha 😄

recipes/glib/all/conanfile.py Outdated Show resolved Hide resolved
@jcar87 @AbrilRBS
Update recipes/glib/all/conanfile.py
7c0024b 
Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es>
@conan-center-bot

This comment has been minimized.

Sign in to view
@valgur valgur mentioned this pull request Jul 12, 2024
Closed
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@jwillikers
Copy link
Contributor

@ErniGH Thanks for fixing this!

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 8 (7c0024bfe029a9f4f68d1e0b48c81e6dbf71df97):

  • glib/2.78.1:
    All packages built successfully! (All logs)

  • glib/2.78.3:
    All packages built successfully! (All logs)

  • glib/2.77.3:
    All packages built successfully! (All logs)

  • glib/2.77.2:
    All packages built successfully! (All logs)

  • glib/2.77.0:
    All packages built successfully! (All logs)

  • glib/2.78.0:
    All packages built successfully! (All logs)

  • glib/2.76.3:
    All packages built successfully! (All logs)

  • glib/2.75.3:
    All packages built successfully! (All logs)

  • glib/2.77.1:
    All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 8 (7c0024bfe029a9f4f68d1e0b48c81e6dbf71df97):

  • glib/2.77.3:
    All packages built successfully! (All logs)

  • glib/2.78.1:
    All packages built successfully! (All logs)

  • glib/2.75.3:
    All packages built successfully! (All logs)

  • glib/2.78.3:
    All packages built successfully! (All logs)

  • glib/2.78.0:
    All packages built successfully! (All logs)

  • glib/2.77.2:
    All packages built successfully! (All logs)

  • glib/2.77.1:
    All packages built successfully! (All logs)

  • glib/2.77.0:
    All packages built successfully! (All logs)

  • glib/2.76.3:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit 025b78a into conan-io:master Jul 12, 2024
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AbrilRBS AbrilRBS AbrilRBS left review comments

@jwillikers jwillikers jwillikers approved these changes

@jcar87 jcar87 jcar87 approved these changes

Assignees

@ErniGH ErniGH

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ErniGH @conan-center-bot @jwillikers @jcar87 @AbrilRBS