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

dbus: don't propagate X11 libs, drop with_glib, update license info #23384

Merged
merged 6 commits into from
Apr 8, 2024
Merged

dbus: don't propagate X11 libs, drop with_glib, update license info #23384

merged 6 commits into from
Apr 8, 2024

Conversation

valgur
Copy link
Contributor

@valgur valgur commented Apr 5, 2024 •
edited
Loading

I dropped (deprecated) the with_glib option altogether since it's only used within tests and nowhere else. I guess this might have been intended to enable dbus-glib, which has been deprecated and moved to a separate repo a long while ago.

Set the X11 dependency to visible=False. As noted by the recipe comment, this is not ideal but it's the best that is currently possible with the tools provided by Conan.

I also made the licensing details a bit more accurate, since the mix of licenses covering the project is actually quite complex:
https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/COPYING
https://gitlab.freedesktop.org/dbus/dbus/-/tree/master/LICENSES

Also bumped libselinux to avoid a conflict with libsystemd and removed with_selinux option on non-Linux OS-s.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 5, 2024

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

👋 @jwillikers you might be interested. 😉

@ghost ghost mentioned this pull request Apr 5, 2024
Closed
@ghost
Copy link

ghost commented Apr 5, 2024

I detected other pull requests that are modifying dbus/1.x.x recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

This was referenced Apr 5, 2024
Open
Merged
Closed
Closed
@prince-chrismc prince-chrismc mentioned this pull request Apr 5, 2024
Open
@conan-center-bot

This comment has been minimized.

Sign in to view
jwillikers
jwillikers approved these changes Apr 5, 2024
View reviewed changes
Copy link
Contributor

@jwillikers jwillikers left a comment

Choose a reason for hiding this comment

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

This PR LGTM. Do you think it's worth addressing #22133 as part of this?

@AbrilRBS AbrilRBS self-assigned this Apr 5, 2024
AbrilRBS
AbrilRBS approved these changes Apr 5, 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.

Thanks! Approving, but let's try to open an issue upstream for the buggy meson file!

AbrilRBS
AbrilRBS requested changes Apr 5, 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.

nevermind, I think that also addresing #22133 would be good to have in the same if you can :)

@valgur
Copy link
Contributor Author

valgur commented Apr 6, 2024 •
edited
Loading

I dropped (deprecated) the with_glib option altogether since it's only used within tests and nowhere else. I guess this might have been intended to enable dbus-glib, which has been deprecated and moved to a separate repo a long while ago.

Set the X11 dependency to visible=False. As noted by the recipe comment, this is not ideal but it's the best that is currently possible with the tools provided by Conan.

I also made the licensing details a bit more accurate, since the mix of licenses covering the project is actually quite complex:
https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/COPYING
https://gitlab.freedesktop.org/dbus/dbus/-/tree/master/LICENSES

@valgur valgur changed the title dbus: avoid overlinking of glib and X11 libraries dbus: don't propagate X11 libs, drop with_glib option Apr 6, 2024
@valgur valgur changed the title dbus: don't propagate X11 libs, drop with_glib option dbus: don't propagate X11 libs, drop with_glib, update license info Apr 6, 2024
@valgur
dbus: fix systemd unitdir installation paths
eeb60eb 
Including `self.package_folder` installed them under the package folder with the full `<package_folder>/home/...` path.
@conan-center-bot

This comment has been minimized.

Sign in to view
jwillikers
jwillikers approved these changes Apr 6, 2024
View reviewed changes
Copy link
Contributor

@jwillikers jwillikers left a comment

Choose a reason for hiding this comment

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

Thanks @valgur!

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 4 (080f0b85506c0b3c2e7edf1b305520a6c9363327):

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

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

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

  • dbus/1.15.2:
    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 4 (080f0b85506c0b3c2e7edf1b305520a6c9363327):

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

  • dbus/1.15.8:
    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 8650c2e into conan-io:master Apr 8, 2024
28 checks passed
yhsng pushed a commit to yhsng/conan-center-index that referenced this pull request Apr 12, 2024
@valgur
(conan-io#23384) dbus: don't propagate X11 libs, drop with_glib, up…
ae34d2a 
…date license info

* dbus: avoid overlinking of glib and X11 libraries

* dbus: set xorg dependency visible=False

* dbus: update license details

https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.15.8/COPYING

* dbus: drop with_glib option

* dbus: fix systemd unitdir installation paths

Including `self.package_folder` installed them under the package folder with the full `<package_folder>/home/...` path.

* dbus: revert macOS install path
ericLemanissier pushed a commit to ericLemanissier/conan-center-index that referenced this pull request Apr 16, 2024
@valgur @ericLemanissier
(conan-io#23384) dbus: don't propagate X11 libs, drop with_glib, up…
d9a7a66 
…date license info

* dbus: avoid overlinking of glib and X11 libraries

* dbus: set xorg dependency visible=False

* dbus: update license details

https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.15.8/COPYING

* dbus: drop with_glib option

* dbus: fix systemd unitdir installation paths

Including `self.package_folder` installed them under the package folder with the full `<package_folder>/home/...` path.

* dbus: revert macOS install path
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwillikers jwillikers jwillikers approved these changes

@AbrilRBS AbrilRBS AbrilRBS approved these changes

Assignees

@AbrilRBS AbrilRBS

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[bug] dbus: generated dbus-1.pc incorrectly has Requires: xorg
4 participants
@valgur @conan-center-bot @AbrilRBS @jwillikers