wyj/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2025-04-20 00:08:58 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

gui-libs/xdg-desktop-portal-hyprland: Fix patch, live

Browse Source 
Signed-off-by: John M. Harris Jr. <johnmh@johnmh.me>
This commit is contained in:
John M. Harris Jr. 2024-07-25 09:45:24 -07:00
parent 02c2737f4e
commit af8ae94474
No known key found for this signature in database
GPG Key ID: 5C3C40B1FE495465
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch Normal file
View File

@ -0,0 +1,34 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 039318f..4f5e882 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,7 @@ add_compile_options(
message(STATUS "Checking deps...")
add_subdirectory(hyprland-share-picker)
+find_package(sdbus-c++ REQUIRED)
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(
@@ -65,12 +66,6 @@ pkg_check_modules(
hyprlang>=0.2.0)
# check whether we can find sdbus-c++ through pkg-config
-pkg_check_modules(SDBUS IMPORTED_TARGET sdbus-c++)
-if(NOT SDBUS_FOUND)
- include_directories("subprojects/sdbus-cpp/include/")
- add_subdirectory(subprojects/sdbus-cpp EXCLUDE_FROM_ALL)
- add_library(PkgConfig::SDBUS ALIAS sdbus-c++)
-endif()
# same for hyprland-protocols
pkg_check_modules(HYPRLAND_PROTOS IMPORTED_TARGET hyprland-protocols)
@@ -83,7 +78,7 @@ endif()
file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
add_executable(xdg-desktop-portal-hyprland ${SRCFILES})
target_link_libraries(
- xdg-desktop-portal-hyprland PRIVATE rt PkgConfig::SDBUS Threads::Threads
+ xdg-desktop-portal-hyprland PRIVATE rt sdbus-c++ Threads::Threads
PkgConfig::deps)
# protocols

2
gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
View File

@ -66,7 +66,7 @@ pkg_setup() {
}
src_prepare() {
eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.2_use_sys_sdbus-c++.patch"
eapply "${FILESDIR}/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch"
sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
cmake_src_prepare
}