[gentoo-commits] repo/proj/guru:master commit in: gui-libs/xdg-desktop-portal-hyprland/

["David Roman" <davidroman96@gmail.com>]

commit:     89f04be2a6bf5f4afad340fb68afd5015b0e745a
Author:     Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com>
AuthorDate: Wed Nov 22 18:24:30 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Nov 22 18:24:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=89f04be2

gui-libs/xdg-desktop-portal-hyprland: fix 1.2.2

Change from meson to cmake
Bug: https://bugs.gentoo.org/917678
Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>

 gui-libs/xdg-desktop-portal-hyprland/Manifest      |  1 +
 .../xdg-desktop-portal-hyprland-1.2.2.ebuild       | 42 ++++++++++++++--------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest
index 7c8e25c9ef..c2317ed891 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/Manifest
+++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest
@@ -1,3 +1,4 @@
+DIST proto-subproject-1.2.2.tar.gz 6343 BLAKE2B cffa25c1fbac992db9aee57956615c2a5f8a6e90150d86246218e6d346e566a43527f56cab08b07359bd2f56b1e02b741fb0dbb37ec35fbadd22dfdb2006d3b0 SHA512 f8534c0f6562ce3c770ed9c79b8b78504d6f3aa75001c74ecfa5418af939e88a020ca1cef08d20c62e73c764d66452b5ce212a0f0d2e9a3aaba635ee80b142c5
 DIST proto-subproject-1.2.5.tar.gz 6343 BLAKE2B cffa25c1fbac992db9aee57956615c2a5f8a6e90150d86246218e6d346e566a43527f56cab08b07359bd2f56b1e02b741fb0dbb37ec35fbadd22dfdb2006d3b0 SHA512 f8534c0f6562ce3c770ed9c79b8b78504d6f3aa75001c74ecfa5418af939e88a020ca1cef08d20c62e73c764d66452b5ce212a0f0d2e9a3aaba635ee80b142c5
 DIST xdg-desktop-hyprland-1.1.0.tar.gz 42732 BLAKE2B aa78b9f3a5812988e8324b71cc265c4b2ca23d0b12239c3ac13d068a46200504685da0fb57093f0689101fc2235cb7825646a4669bfe1894928d57a3259df9e3 SHA512 e02fa5bb19ca20cdee9a2e6ad0beb507d96118e095b1e5a1836cc16a35492a9ba5db36b06e5be561adcbf16d8716c38cbb1ed373965416696c69448fbd020c10
 DIST xdg-desktop-hyprland-1.2.2.tar.gz 43233 BLAKE2B 3d3d955596051da3a3384dab75a516a47627175ac584e6c8967ffe83607a99d99b8c8365b04f57976b8fe41917354217ca0bf3cb07f5e64cc099a1fb6fc3ef8a SHA512 10c8a0eb23a65535dcb16c30d42e2a71268d5a05b88f14ff4c1bedc127241e4da6c516217287b3499677c92f06034f8ebc0f743c181d4dd3bf7a35423128e141

diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.2.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.2.ebuild
index 1758dc43b4..92f9bd43ff 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.2.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.2.ebuild
@@ -3,22 +3,20 @@
 
 EAPI=8
 
-inherit meson toolchain-funcs
+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/xdg-desktop-portal-hyprland.git"
-	inherit git-r3
-else
-	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"
-fi
+KEYWORDS="~amd64"
+PROTO_COMMIT="4d29e48433270a2af06b8bc711ca1fe5109746cd"
+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/hyprwm/hyprland-protocols/archive/${PROTO_COMMIT}.tar.gz \
+	-> proto-subproject-${PV}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/9999"
+SLOT="0"
 IUSE="elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
@@ -41,10 +39,12 @@ DEPEND="
 		sys-libs/basu
 	)
 "
+
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
 "
+
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.24
 	dev-libs/hyprland-protocols
@@ -53,7 +53,7 @@ BDEPEND="
 "
 
 pkg_setup() {
-		[[ ${MERGE_TYPE} == binary ]] && return
+	[[ ${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."
@@ -66,12 +66,24 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	default
+	rmdir "${S}/subprojects/hyprland-protocols" || die
+	mv "hyprland-protocols-${PROTO_COMMIT}" "${S}/subprojects/hyprland-protocols" || die
+}
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.2.5_use_sys_sdbus-c++.patch"
+	cmake_src_prepare
+}
+
 src_compile() {
-	meson_src_compile
-	emake -C hyprland-share-picker all
+	cmake_src_compile all
 }
 
 src_install() {
-	meson_src_install
-	dobin "${S}/hyprland-share-picker/build/hyprland-share-picker"
+	cmake_src_install
+	exeinto /usr/libexec
+	doexe "${BUILD_DIR}/xdg-desktop-portal-hyprland"
 }