-
Notifications
You must be signed in to change notification settings - Fork 739
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
x11/plasma5-plasma-workspace: QA improvements
Add missing pkg-plist entries after my rushed and pointy-hat-worthy commit 353079b. [1] I was under the impression that this version just contained the security fixes and didn't do my due diligence. To sort of make up for it: Add other missing pkg-plist entries if kuserfeedback is installed and add it as a dependency. Potentially improve wayland support by adding plasma-wayland-protocols and wayland-protocols as build dependencies. Add PIPEWIRE option and patch out auto-detection. Enable by default as x11/plasma5-plasma-desktop also enables PIPEWIRE by default. Remove ancient CONFLICTS. PR: 279744 [1] Reported by: jbeich [1] MFH: 2024Q2 (cherry picked from commit c75e389)
- Loading branch information
Showing
3 changed files
with
89 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| Don't auto-detect PipeWire | ||
|
|
||
| --- CMakeLists.txt.orig 2024-05-31 12:34:07 UTC | ||
| +++ CMakeLists.txt | ||
| @@ -47,7 +47,9 @@ find_package(KDED CONFIG REQUIRED) | ||
| OPTIONAL_COMPONENTS DocTools) | ||
|
|
||
| find_package(KDED CONFIG REQUIRED) | ||
| -find_package(KPipeWire CONFIG) | ||
| +if(NOT DISABLE_PIPEWIRE) | ||
| + find_package(KPipeWire CONFIG) | ||
| +endif() | ||
|
|
||
| find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION}) | ||
| set_package_properties(KF5NetworkManagerQt PROPERTIES DESCRIPTION "Qt wrapper for NetworkManager API" | ||
| @@ -152,7 +154,9 @@ endif() | ||
| set(HAVE_XFIXES 0) | ||
| endif() | ||
|
|
||
| -pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3) | ||
| +if(NOT DISABLE_PIPEWIRE) | ||
| + pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3) | ||
| +endif() | ||
| add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting") | ||
|
|
||
| if(PipeWire_FOUND) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters