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.

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

dbus: Bump expat and glib dependencies to minimize conflicts #22920

Merged
merged 1 commit into from
Mar 22, 2024

Conversation

jwillikers
Copy link
Contributor

@jwillikers jwillikers commented Feb 27, 2024

The expat dependency must be bumped to not conflict with wayland. Additionally, glib/2.78.1 and glib/2.78.3 are used much more than glib/2.77.0. I went with glib/2.78.3 since it is newer and also required in the Qt packages. Bump build dependencies as well.

Blocks #22387.


The expat dependency must be bumped to not conflict with wayland.
Additionally, glib/2.78.1 and glib/2.78.3 are used much more than glib/2.77.0.
I went with glib/2.78.3 since it is newer and also required in the Qt packages.
Bump build dependencies as well.
Copy link
Contributor

🤖 Beep Boop! This pull request is making changes to 'recipes/dbus//'.

👋 @jwillikers you might be interested. 😉

@conan-center-bot

This comment has been minimized.

@ghost
Copy link

ghost commented Feb 27, 2024

@@ -67,9 +67,9 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("expat/2.5.0")
self.requires("expat/2.6.0")
Copy link
Member

Choose a reason for hiding this comment

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

It will break Qt5 and Qt6. Both are using expat 2.5.0 and require dbus.

Copy link
Contributor Author

@jwillikers jwillikers Feb 28, 2024

Choose a reason for hiding this comment

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

@uilianries Wayland also currently breaks them... just not by default since Wayland is disabled by default if I remember correctly. Would you rather I downgrade expat in Wayland to 2.5.0? Or open PRs to bump dependencies in Qt 5 and 6?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I went ahead and opened #22929 to bump expat to 2.6.0 in Qt.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This inconsistency blocks #22387

Copy link
Contributor Author

Choose a reason for hiding this comment

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

#22929 has been merged, so this should be good to go now.

@conan-center-bot

This comment has been minimized.

@AbrilRBS AbrilRBS self-assigned this Mar 14, 2024
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.

I'll generate the missing binaries this'd create after getting merged :)

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot conan-center-bot added Bump dependencies Only bumping dependencies versions in the recipe and removed Waiting for CI labels Mar 22, 2024
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 4 (2cc7a70726ac62bf6f2e6e061999e08a600486e0):

  • dbus/1.15.8:
    All packages built successfully! (All logs)

  • dbus/1.15.6:
    All packages built successfully! (All logs)

  • dbus/1.15.2:
    All packages built successfully! (All logs)

  • dbus/1.15.0:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit 67fc9c7 into conan-io:master Mar 22, 2024
29 checks passed
@conan-center-bot
Copy link
Collaborator

This PR has been automatically merged due to Bump version or Bump dependencies label.
Read https://github.com/conan-io/conan-center-index/blob/master/docs/labels.md#bump-version to obtain more information.

@jwillikers jwillikers deleted the dbus-bump-exapt branch March 22, 2024 16:50
Ahajha pushed a commit to Ahajha/conan-center-index that referenced this pull request Apr 6, 2024
…onflicts

The expat dependency must be bumped to not conflict with wayland.
Additionally, glib/2.78.1 and glib/2.78.3 are used much more than glib/2.77.0.
I went with glib/2.78.3 since it is newer and also required in the Qt packages.
Bump build dependencies as well.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bump dependencies Only bumping dependencies versions in the recipe
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants