Skip to content

[dbus] Cleanup, fix pkgconfig for osx#27425

Merged
BillyONeal merged 14 commits intomicrosoft:masterfrom
dg0yt:dbus
Oct 26, 2022
Merged

[dbus] Cleanup, fix pkgconfig for osx#27425
BillyONeal merged 14 commits intomicrosoft:masterfrom
dg0yt:dbus

Conversation

@dg0yt
Copy link
Copy Markdown
Contributor

@dg0yt dg0yt commented Oct 24, 2022

@Neumann-A Should we add an x11 feature, or disable x11 for osx?

github-actions[bot]
github-actions bot previously approved these changes Oct 24, 2022
View reviewed changes
@dg0yt
Copy link
Copy Markdown
Contributor Author

dg0yt commented Oct 24, 2022

This port needs three dirs in share:

  • dbus aka ${PORT}
  • dbus1 for session.conf
  • DBus-1 for CMake config

@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Oct 24, 2022

@Neumann-A Should we add an x11 feature, or disable x11 for osx?

I don't have any feelings if it should be a feature for osx. If people could want it, make it a feature, otherwise disable it for osx.

@autoantwort
Copy link
Copy Markdown
Contributor

autoantwort commented Oct 24, 2022

I think you can disable x11 on osx. It is not really a thing on macos and only works if you install third party software that runs a x11 server.

@FrankXie05 FrankXie05 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Oct 24, 2022
@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Oct 24, 2022

only works if you install third party software that runs a x11 server

logically that means it is a feature.

@dg0yt
Copy link
Copy Markdown
Contributor Author

dg0yt commented Oct 24, 2022

The new question is if someone objects to "supports": "!staticcrt", due to only building dynamic libs, effectively excluding x64-windows-static.

@dg0yt
Copy link
Copy Markdown
Contributor Author

dg0yt commented Oct 24, 2022

only works if you install third party software that runs a x11 server

logically that means it is a feature.

Would it be okay to make it opt-in for Linux, too?

@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Oct 24, 2022

Would it be okay to make it opt-in for Linux, too?

Probably:

if get_option('x11_autolaunch').disabled()
    use_x11_autolaunch = false
    x11 = not_found
else
    if get_option('x11_autolaunch').enabled() and platform_windows
        error('X11 autolaunch is not supported on Windows')
    endif

    x11 = dependency('x11', required: false)
    use_x11_autolaunch = x11.found()

    if get_option('x11_autolaunch').enabled() and not use_x11_autolaunch
        error('X11 autolaunch support requested but not found')
    endif
endif
config.set('DBUS_BUILD_X11', use_x11_autolaunch)
config.set('DBUS_ENABLE_X11_AUTOLAUNCH', use_x11_autolaunch)

but this looks like you could get away in ripping out the libx11 dep completely.

@Neumann-A
Copy link
Copy Markdown
Contributor

Neumann-A commented Oct 24, 2022

Ok for the CMake part:

if(X11_FOUND)
    option(DBUS_BUILD_X11 "Build with X11 autolaunch support " ON)
endif()

maybe ask upstream if it is supported on windows. Seems like it diverged

github-actions[bot]
github-actions bot previously approved these changes Oct 24, 2022
View reviewed changes
@dg0yt dg0yt marked this pull request as draft October 24, 2022 20:05
github-actions[bot]
github-actions bot previously approved these changes Oct 25, 2022
View reviewed changes
github-actions[bot]
github-actions bot previously approved these changes Oct 25, 2022
View reviewed changes
@dg0yt
Copy link
Copy Markdown
Contributor Author

dg0yt commented Oct 25, 2022

Extra comments:

  • AFAICS port dbus is currently not used by any other vcpkg port. However, there are ports with dbus features. There may be installation order problems in those ports.
  • On Linux, the port may use (if present) system libsystemd.so which pulls in liblzma.so.5, liblz4.so.1, libgcrypt.so.20 and libgpg-error.so.0 (Ubuntu 18.04). I'm not sure how symbols are resolved when an app uses those libs from vcpkg and dbus.

@dg0yt dg0yt changed the title [dbus] Fix pkgconfig for osx [dbus] Cleanup, fix pkgconfig for osx Oct 25, 2022
@dg0yt dg0yt marked this pull request as ready for review October 25, 2022 05:39
@FrankXie05 FrankXie05 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Oct 26, 2022
@BillyONeal
Copy link
Copy Markdown
Member

BillyONeal commented Oct 26, 2022

  • On Linux, the port may use (if present) system libsystemd.so which pulls in liblzma.so.5, liblz4.so.1, libgcrypt.so.20 and libgpg-error.so.0 (Ubuntu 18.04). I'm not sure how symbols are resolved when an app uses those libs from vcpkg and dbus.

I don't know if anyone knows :). That said, this PR is clearly an improvement on the status quo, thanks!

@BillyONeal BillyONeal merged commit fc66853 into microsoft:master Oct 26, 2022
@dg0yt dg0yt deleted the dbus branch October 26, 2022 18:48
BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Nov 1, 2022
@BillyONeal
When @BillyONeal started being the on-call vcpkg maintainer on 2022-1…
948a53d 
…0-17, he started applying use of the "embedded VERSION" feature microsoft/vcpkg-tool#717 to PRs on merge.

@dg0yt points out that this use should be accompanied by a call to vcpkg_minimum_required, in https://github.com/microsoft/vcpkg/pull/27594/files#r1010641672

This is an audit of everything merged in that time and whether it needs to gain that.

microsoft#27561 No VERSION
microsoft#27525 No VERSION
microsoft#27554 Already has vcpkg_minimum_required
microsoft#27536 No VERSION
microsoft#27562 No VERSION
microsoft#24914 Fixed here
microsoft#27547 No VERSION
microsoft#27502 No VERSION
microsoft#27497 No VERSION
microsoft#27317 No VERSION
microsoft#27288 No VERSION
microsoft#27509 No VERSION
microsoft#27504 No VERSION
microsoft#27514 No VERSION
microsoft#27501 No VERSION
microsoft#27495 No VERSION
microsoft#27488 No VERSION
microsoft#27499 No VERSION
microsoft#27378 No VERSION
microsoft#27376 Fixed here
microsoft#27373 No VERSION
microsoft#27045 No VERSION
microsoft#27521 No VERSION
microsoft#27453 No VERSION
microsoft#27481 No VERSION
microsoft#27511 No VERSION
microsoft#27490 No VERSION
microsoft#27510 No VERSION
microsoft#27496 No VERSION
microsoft#27503 No VERSION
microsoft#27485 No VERSION
microsoft#27484 No VERSION
microsoft#27483 No VERSION
microsoft#27459 No VERSION
microsoft#27369 No VERSION
microsoft#27489 No VERSION
microsoft#26594 No VERSION
microsoft#27465 No VERSION
microsoft#27456 No VERSION
microsoft#27425 No VERSION
microsoft#27464 Fixed here
microsoft#27406 No VERSION
microsoft#27398 No VERSION
microsoft#27240 No VERSION
microsoft#27450 No VERSION
microsoft#27463 No VERSION
microsoft#27462 No VERSION
microsoft#27448 No VERSION
microsoft#27440 No VERSION
microsoft#27435 No VERSION
microsoft#27424 No VERSION
microsoft#27414 No VERSION
microsoft#27412 No VERSION
microsoft#27380 No VERSION
microsoft#27343 No VERSION
microsoft#27342 No VERSION
microsoft#27367 No VERSION
microsoft#27226 No VERSION
microsoft#27320 No VERSION
microsoft#26923 No VERSION
microsoft#27284 No VERSION
microsoft#27433 No VERSION
microsoft#27314 VERSION got *removed*
microsoft#27335 No VERSION
microsoft#27370 No VERSION
microsoft#27324 No VERSION
microsoft#27391 No VERSION
microsoft#27388 No VERSION
microsoft#27396 No VERSION
microsoft#27404 No VERSION
microsoft#27413 No VERSION
microsoft#27417 No VERSION
microsoft#27427 No VERSION
microsoft#27428 No VERSION
microsoft#27368 No VERSION
microsoft#27307 No VERSION
microsoft#27415 Fixed here.
microsoft#27371 Fixed here.
microsoft#27323 No VERSION
microsoft#27352 No VERSION
microsoft#27347 No VERSION
microsoft#27366 No VERSION
microsoft#27361 No VERSION
microsoft#27359 No VERSION
microsoft#27358 No VERSION
microsoft#27355 No VERSION
microsoft#27331 No VERSION
microsoft#24615 No VERSION
microsoft#27325 No VERSION
microsoft#24861 No VERSION
microsoft#27354 No VERSION
microsoft#27346 No VERSION
microsoft#27345 No VERSION
microsoft#27218 No VERSION
microsoft#27329 No VERSION
microsoft#27326 No VERSION
microsoft#27321 No VERSION
microsoft#27312 No VERSION
microsoft#27297 No VERSION
microsoft#27336 No VERSION
microsoft#27225 No VERSION
microsoft#27339 No VERSION
microsoft#27302 No VERSION
microsoft#27295 No VERSION
microsoft#27233 No VERSION
microsoft#27313 No VERSION
microsoft#27237 No VERSION
microsoft#27250 No VERSION
microsoft#27263 No VERSION
microsoft#27266 No VERSION
microsoft#27272 No VERSION
microsoft#27287 No VERSION
microsoft#27282 No VERSION
microsoft#27294 No VERSION
microsoft#27228 No VERSION
microsoft#27163 No VERSION
microsoft#26817 No VERSION
microsoft#27286 No VERSION
microsoft#27274 No VERSION
microsoft#27276 No VERSION
microsoft#27232 No VERSION
microsoft#27221 No VERSION
microsoft#27215 No VERSION
microsoft#27166 No VERSION
microsoft#27239 No VERSION
microsoft#27246 No VERSION
microsoft#27268 No VERSION
microsoft#27259 No VERSION
microsoft#27238 No VERSION
microsoft#27224 No VERSION
microsoft#27203 No VERSION
microsoft#27124 No VERSION
@BillyONeal BillyONeal mentioned this pull request Nov 1, 2022
Merged
JavierMatosD pushed a commit that referenced this pull request Nov 8, 2022
@BillyONeal
Add vcpkg_minimum_required before using VERSION. (#27598)
e79c0d2 
* When @BillyONeal started being the on-call vcpkg maintainer on 2022-10-17, he started applying use of the "embedded VERSION" feature microsoft/vcpkg-tool#717 to PRs on merge.

@dg0yt points out that this use should be accompanied by a call to vcpkg_minimum_required, in https://github.com/microsoft/vcpkg/pull/27594/files#r1010641672

This is an audit of everything merged in that time and whether it needs to gain that.

#27561 No VERSION
#27525 No VERSION
#27554 Already has vcpkg_minimum_required
#27536 No VERSION
#27562 No VERSION
#24914 Fixed here
#27547 No VERSION
#27502 No VERSION
#27497 No VERSION
#27317 No VERSION
#27288 No VERSION
#27509 No VERSION
#27504 No VERSION
#27514 No VERSION
#27501 No VERSION
#27495 No VERSION
#27488 No VERSION
#27499 No VERSION
#27378 No VERSION
#27376 Fixed here
#27373 No VERSION
#27045 No VERSION
#27521 No VERSION
#27453 No VERSION
#27481 No VERSION
#27511 No VERSION
#27490 No VERSION
#27510 No VERSION
#27496 No VERSION
#27503 No VERSION
#27485 No VERSION
#27484 No VERSION
#27483 No VERSION
#27459 No VERSION
#27369 No VERSION
#27489 No VERSION
#26594 No VERSION
#27465 No VERSION
#27456 No VERSION
#27425 No VERSION
#27464 Fixed here
#27406 No VERSION
#27398 No VERSION
#27240 No VERSION
#27450 No VERSION
#27463 No VERSION
#27462 No VERSION
#27448 No VERSION
#27440 No VERSION
#27435 No VERSION
#27424 No VERSION
#27414 No VERSION
#27412 No VERSION
#27380 No VERSION
#27343 No VERSION
#27342 No VERSION
#27367 No VERSION
#27226 No VERSION
#27320 No VERSION
#26923 No VERSION
#27284 No VERSION
#27433 No VERSION
#27314 VERSION got *removed*
#27335 No VERSION
#27370 No VERSION
#27324 No VERSION
#27391 No VERSION
#27388 No VERSION
#27396 No VERSION
#27404 No VERSION
#27413 No VERSION
#27417 No VERSION
#27427 No VERSION
#27428 No VERSION
#27368 No VERSION
#27307 No VERSION
#27415 Fixed here.
#27371 Fixed here.
#27323 No VERSION
#27352 No VERSION
#27347 No VERSION
#27366 No VERSION
#27361 No VERSION
#27359 No VERSION
#27358 No VERSION
#27355 No VERSION
#27331 No VERSION
#24615 No VERSION
#27325 No VERSION
#24861 No VERSION
#27354 No VERSION
#27346 No VERSION
#27345 No VERSION
#27218 No VERSION
#27329 No VERSION
#27326 No VERSION
#27321 No VERSION
#27312 No VERSION
#27297 No VERSION
#27336 No VERSION
#27225 No VERSION
#27339 No VERSION
#27302 No VERSION
#27295 No VERSION
#27233 No VERSION
#27313 No VERSION
#27237 No VERSION
#27250 No VERSION
#27263 No VERSION
#27266 No VERSION
#27272 No VERSION
#27287 No VERSION
#27282 No VERSION
#27294 No VERSION
#27228 No VERSION
#27163 No VERSION
#26817 No VERSION
#27286 No VERSION
#27274 No VERSION
#27276 No VERSION
#27232 No VERSION
#27221 No VERSION
#27215 No VERSION
#27166 No VERSION
#27239 No VERSION
#27246 No VERSION
#27268 No VERSION
#27259 No VERSION
#27238 No VERSION
#27224 No VERSION
#27203 No VERSION
#27124 No VERSION

* Also add libcanberra
@dg0yt dg0yt mentioned this pull request Oct 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

+1 more reviewer

@FrankXie05 FrankXie05 FrankXie05 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@FrankXie05 FrankXie05

Labels

category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dg0yt @Neumann-A @autoantwort @BillyONeal @FrankXie05