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

UI: Link Qt::DBus on FreeBSD #10894

Merged
merged 1 commit into from
Jun 26, 2024
Merged

UI: Link Qt::DBus on FreeBSD #10894

merged 1 commit into from
Jun 26, 2024

Conversation

emaste
Copy link
Contributor

@emaste emaste commented Jun 19, 2024

As with Linux we need to link Qt::DBus on FreeBSD now that there's a HighContrastEnabled implementation that makes use of it.

Fixes: 41ba8bd ("UI: Add HighContrastEnabled implementation fo...")

Description

Link Qt::DBus on FreeBSD

Motivation and Context

41ba8bd added a HighContrastEnabled implementation which makes use of DBus, and updated UI/cmake/os-linux.cmake to link Qt:DBus. os-freebsd.cmake needs the same change.

How Has This Been Tested?

Built-tested on my laptop.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

As with Linux we need to link Qt::DBus on FreeBSD now that there's a
HighContrastEnabled implementation that makes use of it.

Fixes: 41ba8bd ("UI: Add HighContrastEnabled implementation fo...")
@emaste
Copy link
Contributor Author

emaste commented Jun 19, 2024

With this change obs builds and runs on my FreeBSD 15 laptop. I'm not sure about the build failures in FreeBSD CI just yet.
obs

@RytoEX RytoEX added the Bug Fix Non-breaking change which fixes an issue label Jun 19, 2024
@emaste
Copy link
Contributor Author

emaste commented Jun 19, 2024

I'm not sure about the build failures in FreeBSD CI just yet.

It seems to just be the case that CI is running with -Werror and my local build is not. I have the following warning counts:

 326 implicit conversion loses integer precision: '<type>' (aka '<type>') to '<type>' [-Wshorten-64-to-32]
   2 indirection of non-volatile null pointer will be deleted, not trap [-Wnull-dereference]
   1 comparison of integers of different signs: 'int' and 'uint_fast8_t' (aka 'unsigned int') [-Wsign-compare]
   1 code will never be executed [-Wunreachable-code]
   1 'PySys_SetArgv' is deprecated [-Wdeprecated-declarations]

Copy link
Collaborator

@tytan652 tytan652 left a comment

Choose a reason for hiding this comment

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

LGTM

@RytoEX RytoEX added this to the OBS Studio 30.2 milestone Jun 26, 2024
@RytoEX RytoEX self-assigned this Jun 26, 2024
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

Looks good to me, and fixes an oversight in 41ba8bd (#9653).

@RytoEX RytoEX merged commit fd34bab into obsproject:master Jun 26, 2024
15 checks passed
@emaste emaste deleted the freebsd branch October 23, 2024 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Fix Non-breaking change which fixes an issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants