* [gentoo-commits] repo/proj/guru:master commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2023-12-26 21:02 David Roman
0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2023-12-26 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 43b3fe5beb391c5907d9b7cc71c95db3c4065703
Author: Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com>
AuthorDate: Mon Dec 25 16:36:54 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Dec 25 16:44:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=43b3fe5b
gui-libs/xdg-desktop-portal-hyprland: add 1.2.6
Closes: https://bugs.gentoo.org/920249
Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>
gui-libs/xdg-desktop-portal-hyprland/Manifest | 2 +
...p-portal-hyprland-1.2.6_use_sys_sdbus-c++.patch | 24 +++++
.../xdg-desktop-portal-hyprland-1.2.6.ebuild | 108 +++++++++++++++++++++
3 files changed, 134 insertions(+)
diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest
index c2317ed891..919bef8d19 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/Manifest
+++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest
@@ -1,5 +1,7 @@
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 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
diff --git a/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.2.6_use_sys_sdbus-c++.patch b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.2.6_use_sys_sdbus-c++.patch
new file mode 100644
index 0000000000..186a51c41b
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.2.6_use_sys_sdbus-c++.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a5bee3..c3a377e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,6 @@ endif()
+ include_directories(
+ .
+ "protocols/"
+- "subprojects/sdbus-cpp/include/"
+ )
+
+ set(CMAKE_CXX_STANDARD 23)
+@@ -30,9 +29,10 @@ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value
+ -fpermissive -Wno-address-of-temporary)
+
+ 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)
diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.6.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.6.ebuild
new file mode 100644
index 0000000000..d32db50ddc
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd cmake toolchain-funcs
+
+DESCRIPTION="xdg-desktop-portal backend for hyprland"
+HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
+
+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"
+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
+ rmdir "${S}/subprojects/hyprland-protocols" || die
+ mv "hyprland-protocols-${PROTO_COMMIT}" "${S}/subprojects/hyprland-protocols" || die
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.2.6_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] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2024-01-19 10:31 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2024-01-19 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 0173d5106ad7899cd18b70bd21487b6e375d01e3
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu Jan 18 18:08:10 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 18:10:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0173d510
gui-libs/xdg-desktop-portal-hyprland:fix 9999 stbus-c++ patch
* upstream commit: https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/6a5de92769d5b7038134044053f90e7458f6a197
Closes: https://bugs.gentoo.org/921969
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
...op-portal-hyprland-9999_use_sys_sdbus-c++.patch | 32 ++++++++++++++++++++++
.../xdg-desktop-portal-hyprland-9999.ebuild | 2 +-
2 files changed, 33 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 0000000000..c86c5c2c1a
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-9999_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 EXCLUDE_FROM_ALL)
+- 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-9999.ebuild
index 6c155b2200..af03bb435c 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
@@ -83,7 +83,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-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] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-libs/xdg-desktop-portal-hyprland/, ...
@ 2024-07-26 20:29 David Roman
0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2024-07-26 20:29 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: David Roman <davidroman96 <AT> gmail <DOT> com>
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] 3+ messages in thread
end of thread, other threads:[~2024-07-26 20:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-26 21:02 [gentoo-commits] repo/proj/guru:master commit in: gui-libs/xdg-desktop-portal-hyprland/, David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-01-19 10:31 Arthur Zamarin
2024-07-26 20:29 David Roman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox