public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2023-11-22 17:27 Remigiusz Micielski
  0 siblings, 0 replies; 7+ messages in thread
From: Remigiusz Micielski @ 2023-11-22 17:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2a191d353a1e0999ddfebdaebba7f4538b6a1be6
Author:     Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com>
AuthorDate: Wed Nov 22 17:20:24 2023 +0000
Commit:     Remigiusz Micielski <remigiusz.micielski <AT> gmail <DOT> 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 <rmicielski <AT> 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 <rmicielski@purelymail.com>
+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"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2024-01-08  8:57 Remigiusz Micielski
  0 siblings, 0 replies; 7+ messages in thread
From: Remigiusz Micielski @ 2024-01-08  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     0c081f01791ac5efc8524195d4ace27d657b3ff3
Author:     Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com>
AuthorDate: Mon Jan  8 08:55:08 2024 +0000
Commit:     Remigiusz Micielski <remigiusz.micielski <AT> gmail <DOT> com>
CommitDate: Mon Jan  8 08:56:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0c081f01

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

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

 gui-libs/xdg-desktop-portal-hyprland/Manifest      |  2 ++
 ...p-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch | 32 +++++++++++++++++++
 ...ld => xdg-desktop-portal-hyprland-1.3.1.ebuild} | 36 +++-------------------
 .../xdg-desktop-portal-hyprland-9999.ebuild        | 36 +++-------------------
 4 files changed, 42 insertions(+), 64 deletions(-)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest
index 919bef8d19..381f04e7fd 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/Manifest
+++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest
@@ -1,7 +1,9 @@
 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 proto-subproject-1.2.6.tar.gz 6343 BLAKE2B cffa25c1fbac992db9aee57956615c2a5f8a6e90150d86246218e6d346e566a43527f56cab08b07359bd2f56b1e02b741fb0dbb37ec35fbadd22dfdb2006d3b0 SHA512 f8534c0f6562ce3c770ed9c79b8b78504d6f3aa75001c74ecfa5418af939e88a020ca1cef08d20c62e73c764d66452b5ce212a0f0d2e9a3aaba635ee80b142c5
+DIST proto-subproject-1.3.1.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
 DIST xdg-desktop-hyprland-1.2.5.tar.gz 45688 BLAKE2B d99a399b9e3ff12ddd73293638177b919a37d7922eb35071efdc86f6c5c311995578b1143fd1bb337171aebb9b43b9719957bb40a2a668563fd6ac7dd62c7ad0 SHA512 8ee18e1535a419a146fc7ae2adce53a3fbab8a339ed48594022d525d5892bc979c9ffb6f28da76ec2e4d566213cbeab876470dab8949f218a24bc705877f0c67
 DIST xdg-desktop-hyprland-1.2.6.tar.gz 46109 BLAKE2B e5f714812d8a0eb1a98eef6a19d79b1d9fe6f1a5bc9a499cd8707e73a8b3709552b710c863d6a98aa653dbb5fa1eaf223cc20b4e3991146b5c19d5a7eb2b2870 SHA512 b51a9ea71a8365f5ad08e99e43257794af737a9fb4083b4e00a6d246b45bc6aba0e6204fc480c92a31b665aa836a4cb2193cab7047fadc8a8acf36de4a111516
+DIST xdg-desktop-hyprland-1.3.1.tar.gz 46999 BLAKE2B 17dd6883d90985075dc8bdeb4901ad393fb6ab541aba901536f761464e313e87485a4589f6691321e1e9615817206318362afeaef424ef8f603868ed0d7f26d6 SHA512 8d0f9b97fca4566efe717de6d739d10ec51ce5aa33459940f759fc90543fcca3b094d3e570446c5f82c9146249ce39c00fa215b0b83573a466a9907aec9366f3

diff --git a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch
new file mode 100644
index 0000000000..1ecaa8ffc2
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73f429b..e760098 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,17 +38,12 @@ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value
+ 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(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols libpipewire-0.3 libspa-0.2 libdrm gbm 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)
+-    add_library(PkgConfig::SDBUS ALIAS sdbus-c++)
+-endif()
+ 
+ # same for hyprland-protocols
+ pkg_check_modules(HYPRLAND_PROTOS IMPORTED_TARGET hyprland-protocols)
+@@ -60,7 +55,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 PkgConfig::deps)
++target_link_libraries(xdg-desktop-portal-hyprland PRIVATE rt sdbus-c++ Threads::Threads PkgConfig::deps)
+ 
+ # protocols
+ find_program(WaylandScanner NAMES wayland-scanner)

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.3.1.ebuild
similarity index 69%
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.3.1.ebuild
index 0a6bf7fd01..6c155b2200 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.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit systemd cmake toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="xdg-desktop-portal backend for hyprland"
 HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
@@ -48,6 +48,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
+	dev-libs/hyprlang
 "
 
 BDEPEND="
@@ -82,36 +83,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.2.6_use_sys_sdbus-c++.patch"
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch"
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
 }
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_install() {
-	LIBEXEC="/usr/libexec"
-	SYSTEMD_SERVICE="${S}/contrib/systemd/xdg-desktop-portal-hyprland.service"
-	DBUS_SERVICE="${S}/org.freedesktop.impl.portal.desktop.hyprland.service"
-
-	cmake_src_install
-
-	exeinto $LIBEXEC
-	doexe "${BUILD_DIR}/xdg-desktop-portal-hyprland"
-
-	insinto /usr/share/xdg-desktop-portal/portals
-	doins "${S}/hyprland.portal"
-
-	# systemd service
-	sed -i "s|@libexecdir@|${LIBEXEC}|g" "${SYSTEMD_SERVICE}.in" || die
-	mv "${SYSTEMD_SERVICE}.in" "${SYSTEMD_SERVICE}" || die
-	systemd_douserunit "${SYSTEMD_SERVICE}"
-
-	# dbus service
-	sed -i "s|@libexecdir@|${LIBEXEC}|g" "${DBUS_SERVICE}.in" || die
-	mv "${DBUS_SERVICE}.in" "${DBUS_SERVICE}"
-	insinto /usr/share/dbus-1/services/
-	doins "${DBUS_SERVICE}"
-}

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 0a6bf7fd01..6c155b2200 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
@@ -1,9 +1,9 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit systemd cmake toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="xdg-desktop-portal backend for hyprland"
 HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
@@ -48,6 +48,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
+	dev-libs/hyprlang
 "
 
 BDEPEND="
@@ -82,36 +83,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.2.6_use_sys_sdbus-c++.patch"
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch"
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
 }
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_install() {
-	LIBEXEC="/usr/libexec"
-	SYSTEMD_SERVICE="${S}/contrib/systemd/xdg-desktop-portal-hyprland.service"
-	DBUS_SERVICE="${S}/org.freedesktop.impl.portal.desktop.hyprland.service"
-
-	cmake_src_install
-
-	exeinto $LIBEXEC
-	doexe "${BUILD_DIR}/xdg-desktop-portal-hyprland"
-
-	insinto /usr/share/xdg-desktop-portal/portals
-	doins "${S}/hyprland.portal"
-
-	# systemd service
-	sed -i "s|@libexecdir@|${LIBEXEC}|g" "${SYSTEMD_SERVICE}.in" || die
-	mv "${SYSTEMD_SERVICE}.in" "${SYSTEMD_SERVICE}" || die
-	systemd_douserunit "${SYSTEMD_SERVICE}"
-
-	# dbus service
-	sed -i "s|@libexecdir@|${LIBEXEC}|g" "${DBUS_SERVICE}.in" || die
-	mv "${DBUS_SERVICE}.in" "${DBUS_SERVICE}"
-	insinto /usr/share/dbus-1/services/
-	doins "${DBUS_SERVICE}"
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2024-04-21 22:11 Anthony Ruhier
  0 siblings, 0 replies; 7+ messages in thread
From: Anthony Ruhier @ 2024-04-21 22:11 UTC (permalink / raw
  To: gentoo-commits

commit:     41b304c25c983bbe251cf791bc3336b7c06a27ec
Author:     Anthony Ruhier <aruhier <AT> mailbox <DOT> org>
AuthorDate: Sun Apr 21 22:10:01 2024 +0000
Commit:     Anthony Ruhier <aruhier <AT> mailbox <DOT> org>
CommitDate: Sun Apr 21 22:10:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=41b304c2

gui-libs/xdg-desktop-portal-hyprland: fix systemd path

Add patch from
https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/24fa87b939539a1d13696718490ff5642ab12509
to fix the path of systemd service from /usr/lib64/systemd to
/usr/lib/systemd.

Signed-off-by: Anthony Ruhier <aruhier <AT> mailbox.org>

 ...top-portal-hyprland-1.3.1_fix_systemd_path.patch | 21 +++++++++++++++++++++
 .../xdg-desktop-portal-hyprland-1.3.1-r1.ebuild     |  1 +
 2 files changed, 22 insertions(+)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_fix_systemd_path.patch b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_fix_systemd_path.patch
new file mode 100644
index 0000000000..36d0b2ba82
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_fix_systemd_path.patch
@@ -0,0 +1,21 @@
+From 24fa87b939539a1d13696718490ff5642ab12509 Mon Sep 17 00:00:00 2001
+From: Pavel Solovev <daron439@gmail.com>
+Date: Sun, 7 Jan 2024 22:17:24 +0300
+Subject: [PATCH] Cmake: Do not use CMAKE_INSTALL_LIBDIR for the systemd
+ service
+
+In some distros CMAKE_INSTALL_LIBDIR is lib64, but systemd services are always in lib (not lib64)
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73f429b..2eb7cfb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -104,4 +104,4 @@ install(TARGETS xdg-desktop-portal-hyprland DESTINATION ${CMAKE_INSTALL_LIBEXECD
+ 
+ install(FILES hyprland.portal DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/xdg-desktop-portal/portals")
+ install(FILES ${CMAKE_BINARY_DIR}/org.freedesktop.impl.portal.desktop.hyprland.service DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services")
+-install(FILES ${CMAKE_BINARY_DIR}/contrib/systemd/xdg-desktop-portal-hyprland.service DESTINATION "${CMAKE_INSTALL_LIBDIR}/systemd/user")
++install(FILES ${CMAKE_BINARY_DIR}/contrib/systemd/xdg-desktop-portal-hyprland.service DESTINATION "lib/systemd/user")

diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
index f09bf0c356..85d3f8f44a 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
@@ -89,6 +89,7 @@ src_unpack() {
 
 src_prepare() {
 	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch"
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_fix_systemd_path.patch"
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2024-07-02  3:00 John M. Harris, Jr.
  0 siblings, 0 replies; 7+ messages in thread
From: John M. Harris, Jr. @ 2024-07-02  3:00 UTC (permalink / raw
  To: gentoo-commits

commit:     d039999249fd50cd454fa6035456ba69ae0c27d0
Author:     John M. Harris Jr. <johnmh <AT> johnmh <DOT> me>
AuthorDate: Tue Jul  2 02:56:56 2024 +0000
Commit:     John M. Harris, Jr. <johnmh <AT> johnmh <DOT> me>
CommitDate: Tue Jul  2 02:56:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0399992

gui-libs/xdg-desktop-portal-hyprland: Add patch for pipewire >=1.1.0

Signed-off-by: John M. Harris Jr. <johnmh <AT> johnmh.me>

 ...-desktop-portal-hyprland-9999_fix_pipewire.patch | 21 +++++++++++++++++++++
 .../xdg-desktop-portal-hyprland-9999.ebuild         |  1 +
 2 files changed, 22 insertions(+)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_fix_pipewire.patch b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_fix_pipewire.patch
new file mode 100644
index 000000000..0655bbe38
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_fix_pipewire.patch
@@ -0,0 +1,21 @@
+diff --git a/src/shared/ScreencopyShared.hpp b/src/shared/ScreencopyShared.hpp
+index d626da6..2368833 100644
+--- a/src/shared/ScreencopyShared.hpp
++++ b/src/shared/ScreencopyShared.hpp
+@@ -5,16 +5,12 @@
+ extern "C" {
+ #include <spa/pod/builder.h>
+ 
+-#undef SPA_VERSION_POD_BUILDER_CALLBACKS
+-#define SPA_VERSION_POD_BUILDER_CALLBACKS .version = 0
+ #include <spa/buffer/meta.h>
+ #include <spa/utils/result.h>
+ #include <spa/param/props.h>
+ #include <spa/param/format-utils.h>
+ #include <spa/param/video/format-utils.h>
+ #include <spa/pod/dynamic.h>
+-#undef SPA_VERSION_POD_BUILDER_CALLBACKS
+-#define SPA_VERSION_POD_BUILDER_CALLBACKS 0
+ }
+ #include <wayland-client.h>
+ 

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 ac2bb3c93..fabc08977 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
@@ -84,6 +84,7 @@ src_unpack() {
 
 src_prepare() {
 	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch"
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-9999_fix_pipewire.patch"
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2024-07-25 16:49 John M. Harris, Jr.
  0 siblings, 0 replies; 7+ messages in thread
From: John M. Harris, Jr. @ 2024-07-25 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     af8ae94474aa36d51d898f0961fc27fbac5cfa28
Author:     John M. Harris Jr. <johnmh <AT> johnmh <DOT> me>
AuthorDate: Thu Jul 25 16:45:24 2024 +0000
Commit:     John M. Harris, Jr. <johnmh <AT> johnmh <DOT> 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 <AT> 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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2024-10-06 14:30 sin-ack
  0 siblings, 0 replies; 7+ messages in thread
From: sin-ack @ 2024-10-06 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     25544238010f60c9b2ded3ad541c475a4a3008f9
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Sun Oct  6 14:28:37 2024 +0000
Commit:     sin-ack <sin-ack <AT> protonmail <DOT> 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 <sin-ack <AT> 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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2024-10-06 14:39 sin-ack
  0 siblings, 0 replies; 7+ messages in thread
From: sin-ack @ 2024-10-06 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     066f6cded2e7bc50b49e210f66d2293d8f2c0ff7
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Sun Oct  6 14:37:07 2024 +0000
Commit:     sin-ack <sin-ack <AT> protonmail <DOT> com>
CommitDate: Sun Oct  6 14:38:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=066f6cde

Revert "gui-libs/xdg-desktop-portal-hyprland: add 1.3.6"

This reverts commit 25544238010f60c9b2ded3ad541c475a4a3008f9.

Signed-off-by: sin-ack <sin-ack <AT> 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 deletions(-)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest
index 2bb4ecb12..305adb2bd 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/Manifest
+++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest
@@ -1,2 +1 @@
 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
deleted file mode 100644
index 811446c0c..000000000
--- a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.6_use_sys_sdbus-c++.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 71bba7435..000000000
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-10-06 14:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-08  8:57 [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/, Remigiusz Micielski
  -- strict thread matches above, loose matches on Subject: below --
2024-10-06 14:39 sin-ack
2024-10-06 14:30 sin-ack
2024-07-25 16:49 John M. Harris, Jr.
2024-07-02  3:00 John M. Harris, Jr.
2024-04-21 22:11 Anthony Ruhier
2023-11-22 17:27 Remigiusz Micielski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox