commit: af8ae94474aa36d51d898f0961fc27fbac5cfa28
Author: John M. Harris Jr. <johnmh <AT> johnmh <DOT> me>
AuthorDate: Thu Jul 25 16:45:24 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 16:49:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=af8ae944
gui-libs/xdg-desktop-portal-hyprland: Fix patch, live
Signed-off-by: John M. Harris Jr. <johnmh <AT> johnmh.me>
...op-portal-hyprland-9999_use_sys_sdbus-c++.patch | 34 ++++++++++++++++++++++
.../xdg-desktop-portal-hyprland-9999.ebuild | 2 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git
a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch
b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch
new file mode 100644
index 000000000..2fd5f007c
--- /dev/null
+++
b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch
@@ -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
diff --git
a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
index f49c02593..6bd18e3f8 100644
---
a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
+++
b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
@@ -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
}
