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 A3EDB15807A for ; Sun, 6 Oct 2024 14:30:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F17A6E29A2; Sun, 6 Oct 2024 14:30:50 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9C4CE29A2 for ; Sun, 6 Oct 2024 14:30:50 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B43C343158 for ; Sun, 6 Oct 2024 14:30:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D4B014CA for ; Sun, 6 Oct 2024 14:30:48 +0000 (UTC) From: "sin-ack" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "sin-ack" Message-ID: <1728224917.25544238010f60c9b2ded3ad541c475a4a3008f9.sin-ack@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/Manifest gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.6_use_sys_sdbus-c++.patch gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.6.ebuild X-VCS-Directories: gui-libs/xdg-desktop-portal-hyprland/ gui-libs/xdg-desktop-portal-hyprland/files/ X-VCS-Committer: sin-ack X-VCS-Committer-Name: sin-ack X-VCS-Revision: 25544238010f60c9b2ded3ad541c475a4a3008f9 X-VCS-Branch: dev Date: Sun, 6 Oct 2024 14:30:48 +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: ae7cdf36-3834-4fda-82c7-2dea21adf489 X-Archives-Hash: de8434e9f694f9c063ecbd68316246e3 commit: 25544238010f60c9b2ded3ad541c475a4a3008f9 Author: sin-ack protonmail com> AuthorDate: Sun Oct 6 14:28:37 2024 +0000 Commit: sin-ack protonmail com> CommitDate: Sun Oct 6 14:28:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=25544238 gui-libs/xdg-desktop-portal-hyprland: add 1.3.6 Signed-off-by: sin-ack protonmail.com> gui-libs/xdg-desktop-portal-hyprland/Manifest | 1 + ...p-portal-hyprland-1.3.6_use_sys_sdbus-c++.patch | 36 +++++++++++ .../xdg-desktop-portal-hyprland-1.3.6.ebuild | 74 ++++++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest index 305adb2bd..2bb4ecb12 100644 --- a/gui-libs/xdg-desktop-portal-hyprland/Manifest +++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest @@ -1 +1,2 @@ DIST xdg-desktop-portal-hyprland-1.3.3.gh.tar.gz 49323 BLAKE2B 6f0bd6636d1a457d238dbb9095782a41961e30b37eacd05e1a4d545fc933b9d3b529400321a31cfb08c6b5d69279bb8905e84f11743bf97b22587432a5e9cf14 SHA512 c100ca27e9cd430602ad0ea4733f34919d84206df084df0d9f8ed8ca8a634069cc7ef71cb587f92eae6eeedf4029a88644b24b9b8d37138cb544279f5be30720 +DIST xdg-desktop-portal-hyprland-1.3.6.gh.tar.gz 49788 BLAKE2B e06d42b29fa147448eb222f72eb27ecc7948d9d428471b1b98dc456df6059cbe83eaadcc3026bb0818b15b8a30494d2c6c750bf6a4fe6489f78ad8a078ef00af SHA512 4716a6299250ac80f9af27bb213742973aa2f131ed0e58ebbd442aef6ceb3ac8f78c41b0f721b271306a5bb0e79c3a70bf18cc5ee4b5cffad9ab3c0cf87207cd diff --git a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.6_use_sys_sdbus-c++.patch b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.6_use_sys_sdbus-c++.patch new file mode 100644 index 000000000..811446c0c --- /dev/null +++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.6_use_sys_sdbus-c++.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 66773db..f328c96 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,6 +51,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( +@@ -67,14 +68,6 @@ pkg_check_modules( + hyprutils + hyprwayland-scanner>=0.4.2) + +-# 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) + if(HYPRLAND_PROTOS_FOUND) +@@ -86,7 +79,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-1.3.6.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.6.ebuild new file mode 100644 index 000000000..71bba7435 --- /dev/null +++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.6.ebuild @@ -0,0 +1,74 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="xdg-desktop-portal backend for hyprland" +HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/hyprwm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="elogind systemd" +REQUIRED_USE="?? ( elogind systemd )" + +DEPEND=" + >=media-video/pipewire-1.2.0:= + dev-cpp/sdbus-c++ + dev-libs/hyprlang:= + gui-libs/hyprutils + dev-libs/inih + dev-libs/wayland + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtwayland:6 + media-libs/mesa + sys-apps/util-linux + x11-libs/libdrm + || ( + systemd? ( >=sys-apps/systemd-237 ) + elogind? ( >=sys-auth/elogind-237 ) + sys-libs/basu + ) +" + +RDEPEND=" + ${DEPEND} + sys-apps/xdg-desktop-portal +" + +BDEPEND=" + >=dev-libs/wayland-protocols-1.24 + dev-libs/hyprland-protocols + >=dev-util/hyprwayland-scanner-0.4.2 + virtual/pkgconfig + || ( >=sys-devel/gcc-13:* >=sys-devel/clang-17:* ) +" + +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then + eerror "XDPH needs >=gcc-13 or >=clang-17 to compile." + eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" + die "GCC version is too old to compile XDPH!" + elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then + eerror "XDPH needs >=gcc-13 or >=clang-17 to compile." + eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + die "Clang version is too old to compile XDPH!" + fi +} + +src_prepare() { + eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.6_use_sys_sdbus-c++.patch" + sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die + cmake_src_prepare +}