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

["Remigiusz Micielski" <remigiusz.micielski@gmail.com>]

commit:     8a834cded9de79becd18b62238ccd0a6a1b6d210
Author:     Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com>
AuthorDate: Sun Sep 24 18:38:21 2023 +0000
Commit:     Remigiusz Micielski <remigiusz.micielski <AT> gmail <DOT> com>
CommitDate: Sun Sep 24 18:39:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8a834cde

gui-libs/xdg-desktop-portal-hyprland: add 1.1.0, update 9999

Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>

 gui-libs/xdg-desktop-portal-hyprland/Manifest      |  1 +
 ...ld => xdg-desktop-portal-hyprland-1.1.0.ebuild} | 23 +++++++++++++---------
 .../xdg-desktop-portal-hyprland-9999.ebuild        | 23 +++++++++++++---------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest
index 301216c4b6..517548e387 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/Manifest
+++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest
@@ -1,2 +1,3 @@
 DIST xdg-desktop-hyprland-0.4.0.tar.gz 50645 BLAKE2B 7f4e2d3102e848c15dfa6eeefa3d1375ea5b7dc34ae9c3b7fb42caded4090bf877a4d1eef1dfb42be37b7b9374487297b2b9366b619bb7f6700676222d218d81 SHA512 3b6955f15ae86a7552d39bf107cfd153fe0fff68cc4b87b277b8010f40a267446cc9c8f51975197f2fc4333b854e2e2a549e03cbdde63675a51dd12b0ce185f3
 DIST xdg-desktop-hyprland-0.5.0.tar.gz 50608 BLAKE2B 7e2c7098f4be1a35c9093b1454c828467dfd52057dc30948ff1824c506115e0a1df8c037d7e85d79c0b845f682285c0fbf6786708537126cc3c94cd05e819a4a SHA512 1efbd3378e9d84f47189264b1b98e65cc73aeea916e31f085ba4503b9e4e25f8121894433adf21d0174ceae3588048a6a83c440cb57e8d2e62301629e93f8c91
+DIST xdg-desktop-hyprland-1.1.0.tar.gz 42732 BLAKE2B aa78b9f3a5812988e8324b71cc265c4b2ca23d0b12239c3ac13d068a46200504685da0fb57093f0689101fc2235cb7825646a4669bfe1894928d57a3259df9e3 SHA512 e02fa5bb19ca20cdee9a2e6ad0beb507d96118e095b1e5a1836cc16a35492a9ba5db36b06e5be561adcbf16d8716c38cbb1ed373965416696c69448fbd020c10

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-1.1.0.ebuild
similarity index 72%
copy from gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
copy to gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.1.0.ebuild
index 17ebcc66ec..62aa1bd3e5 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-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson
+inherit meson toolchain-funcs
 
 DESCRIPTION="xdg-desktop-portal backend for hyprland"
 HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=media-video/pipewire-0.3.41:=
+	dev-cpp/sdbus-c++
 	dev-libs/inih
 	dev-libs/wayland
 	dev-qt/qtbase
@@ -50,16 +51,20 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_configure() {
-	local emesonargs=()
-	if use systemd; then
-		emesonargs+=(-Dsd-bus-provider=libsystemd)
-	elif use elogind; then
-		emesonargs+=(-Dsd-bus-provider=libelogind)
+pkg_setup() {
+		[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc; then
+		STDLIBVER=$(echo '#include <string>' | $(tc-getCXX) -x c++ -dM -E - | \
+					grep GLIBCXX_RELEASE | sed 's/.*\([1-9][0-9]\)/\1/')
+
+		if [[ ${STDLIBVER} -lt 13 ]]; then
+			die "XDPH requires >=sys-devel/gcc-13.0.0 to build"
+		fi
 	else
-		emesonargs+=(-Dsd-bus-provider=basu)
+		die "XDPH 1.1.0 won't build with clang.\
+		See: https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/81";
 	fi
-	meson_src_configure
 }
 
 src_compile() {

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 17ebcc66ec..62aa1bd3e5 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
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson
+inherit meson toolchain-funcs
 
 DESCRIPTION="xdg-desktop-portal backend for hyprland"
 HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=media-video/pipewire-0.3.41:=
+	dev-cpp/sdbus-c++
 	dev-libs/inih
 	dev-libs/wayland
 	dev-qt/qtbase
@@ -50,16 +51,20 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_configure() {
-	local emesonargs=()
-	if use systemd; then
-		emesonargs+=(-Dsd-bus-provider=libsystemd)
-	elif use elogind; then
-		emesonargs+=(-Dsd-bus-provider=libelogind)
+pkg_setup() {
+		[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc; then
+		STDLIBVER=$(echo '#include <string>' | $(tc-getCXX) -x c++ -dM -E - | \
+					grep GLIBCXX_RELEASE | sed 's/.*\([1-9][0-9]\)/\1/')
+
+		if [[ ${STDLIBVER} -lt 13 ]]; then
+			die "XDPH requires >=sys-devel/gcc-13.0.0 to build"
+		fi
 	else
-		emesonargs+=(-Dsd-bus-provider=basu)
+		die "XDPH 1.1.0 won't build with clang.\
+		See: https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/81";
 	fi
-	meson_src_configure
 }
 
 src_compile() {