From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F0C00159C96 for ; Thu, 25 Jul 2024 16:49:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ACA02BC01E; Thu, 25 Jul 2024 16:49:15 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F2AB2BC01E for ; Thu, 25 Jul 2024 16:49:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCF6C3406A2 for ; Thu, 25 Jul 2024 16:49:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 767C81889 for ; Thu, 25 Jul 2024 16:49:12 +0000 (UTC) From: "John M. Harris, Jr." To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John M. Harris, Jr." Message-ID: <1721926145.af8ae94474aa36d51d898f0961fc27fbac5cfa28.johnmh@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, ... X-VCS-Repository: repo/proj/guru X-VCS-Files: gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild X-VCS-Directories: gui-libs/xdg-desktop-portal-hyprland/files/ gui-libs/xdg-desktop-portal-hyprland/ X-VCS-Committer: johnmh X-VCS-Committer-Name: John M. Harris, Jr. X-VCS-Revision: af8ae94474aa36d51d898f0961fc27fbac5cfa28 X-VCS-Branch: dev Date: Thu, 25 Jul 2024 16:49:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8f564c7-ca47-449e-9054-73a57c2df4f0 X-Archives-Hash: 53297690cae660b1bfc179a30dc59319 commit: af8ae94474aa36d51d898f0961fc27fbac5cfa28 Author: John M. Harris Jr. johnmh me> AuthorDate: Thu Jul 25 16:45:24 2024 +0000 Commit: John M. Harris, Jr. johnmh me> 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.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 }