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 0D473158099 for ; Wed, 22 Nov 2023 17:27:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D4A92BC018; Wed, 22 Nov 2023 17:27:23 +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 1C5A12BC018 for ; Wed, 22 Nov 2023 17:27:22 +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 39836335D7F for ; Wed, 22 Nov 2023 17:27:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 993DB13B4 for ; Wed, 22 Nov 2023 17:27:20 +0000 (UTC) From: "Remigiusz Micielski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Remigiusz Micielski" Message-ID: <1700674032.2a191d353a1e0999ddfebdaebba7f4538b6a1be6.remigiusz.micielski@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-1.2.5_use_sys_sdbus-c++.patch gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.5.ebuild X-VCS-Directories: gui-libs/xdg-desktop-portal-hyprland/files/ gui-libs/xdg-desktop-portal-hyprland/ X-VCS-Committer: remigiusz.micielski X-VCS-Committer-Name: Remigiusz Micielski X-VCS-Revision: 2a191d353a1e0999ddfebdaebba7f4538b6a1be6 X-VCS-Branch: dev Date: Wed, 22 Nov 2023 17:27:20 +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: 6a92ca44-0824-471c-955d-a0955d3de6ca X-Archives-Hash: 1631acefae373db0bc8d8f312f48132e commit: 2a191d353a1e0999ddfebdaebba7f4538b6a1be6 Author: Remigiusz Micielski purelymail com> AuthorDate: Wed Nov 22 17:20:24 2023 +0000 Commit: Remigiusz Micielski gmail com> CommitDate: Wed Nov 22 17:27:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2a191d35 gui-libs/xdg-desktop-portal-hyprland: add 1.2.5 Closes: https://bugs.gentoo.org/917678 Signed-off-by: Remigiusz Micielski purelymail.com> ...p-portal-hyprland-1.2.5_use_sys_sdbus-c++.patch | 35 +++++++++ .../xdg-desktop-portal-hyprland-1.2.5.ebuild | 84 ++++++++++++++++++++++ 2 files changed, 119 insertions(+) diff --git a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.2.5_use_sys_sdbus-c++.patch b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.2.5_use_sys_sdbus-c++.patch new file mode 100644 index 0000000000..42ec92a2fa --- /dev/null +++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.2.5_use_sys_sdbus-c++.patch @@ -0,0 +1,35 @@ +From 7ec34c32dae716cb3976037e1086e193ff1b0cc3 Mon Sep 17 00:00:00 2001 +From: Remigiusz Micielski +Date: Wed, 22 Nov 2023 17:13:09 +0100 +Subject: [PATCH] fix: use sys sdbus-c++ + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 44d1689..aa7588b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,16 +21,16 @@ endif() + include_directories( + . + "protocols/" +- "subprojects/sdbus-cpp/include/" + ) + + set(CMAKE_CXX_STANDARD 23) + add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing -Wno-pointer-arith -fpermissive) + + message(STATUS "Checking deps...") +-add_subdirectory(subprojects/sdbus-cpp) + add_subdirectory(hyprland-share-picker) + ++find_package(sdbus-c++ REQUIRED) ++ + find_package(Threads REQUIRED) + + find_package(PkgConfig REQUIRED) +-- +2.41.0 + diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.5.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.5.ebuild new file mode 100644 index 0000000000..1129bc9cca --- /dev/null +++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.5.ebuild @@ -0,0 +1,84 @@ +# Copyright 2022-2023 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" + +KEYWORDS="~amd64" +SRC_URI="https://github.com/hyprwm/xdg-desktop-portal-hyprland/archive/refs/tags/v${PV}.tar.gz \ + -> xdg-desktop-hyprland-${PV}.tar.gz +https://github.com/micielski/xdg-desktop-portal-hyprland-subprojects/releases/download/${PV}/xdg-desktop-portal-hyprland-${PV}-subprojects.tar.xz" + +LICENSE="MIT" +SLOT="0" +IUSE="elogind systemd" +REQUIRED_USE="?? ( elogind systemd )" + +DEPEND=" + >=media-video/pipewire-0.3.41:= + dev-cpp/sdbus-c++ + dev-libs/inih + dev-libs/wayland + dev-qt/qtbase + dev-qt/qtcore + dev-qt/qtgui + dev-qt/qtwayland:6 + dev-qt/qtwidgets + 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 + 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_unpack() { + default + mv subprojects/* "xdg-desktop-portal-hyprland-${PV}/subprojects" || die +} + +src_prepare() { + default + eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.2.5_use_sys_sdbus-c++.patch" + cmake_src_prepare +} + +src_compile() { + cmake_src_compile all +} + +src_install() { + cmake_src_install + exeinto /usr/libexec + doexe "${BUILD_DIR}/xdg-desktop-portal-hyprland" +}