commit: 0173d5106ad7899cd18b70bd21487b6e375d01e3 Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Thu Jan 18 18:08:10 2024 +0000 Commit: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> CommitDate: Thu Jan 18 18:10:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0173d510
gui-libs/xdg-desktop-portal-hyprland:fix 9999 stbus-c++ patch * upstream commit: https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/6a5de92769d5b7038134044053f90e7458f6a197 Closes: https://bugs.gentoo.org/921969 Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com> ...op-portal-hyprland-9999_use_sys_sdbus-c++.patch | 32 ++++++++++++++++++++++ .../xdg-desktop-portal-hyprland-9999.ebuild | 2 +- 2 files changed, 33 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 0000000000..c86c5c2c1a --- /dev/null +++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73f429b..e760098 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,17 +38,12 @@ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value + 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(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols libpipewire-0.3 libspa-0.2 libdrm gbm 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) +@@ -60,7 +55,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 PkgConfig::deps) ++target_link_libraries(xdg-desktop-portal-hyprland PRIVATE rt sdbus-c++ Threads::Threads PkgConfig::deps) + + # protocols + find_program(WaylandScanner NAMES wayland-scanner) 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 6c155b2200..af03bb435c 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 @@ -83,7 +83,7 @@ src_unpack() { } src_prepare() { - eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_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 }
