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 CB283158451 for ; Mon, 8 Jan 2024 08:57:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11EFD2BC01B; Mon, 8 Jan 2024 08:57:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2FAB2BC01B for ; Mon, 8 Jan 2024 08:57:11 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A88234330C for ; Mon, 8 Jan 2024 08:57:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9022C141 for ; Mon, 8 Jan 2024 08:57:09 +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: <1704704218.0c081f01791ac5efc8524195d4ace27d657b3ff3.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/Manifest gui-libs/xdg-desktop-portal-hyprland/files/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1.ebuild gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.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: 0c081f01791ac5efc8524195d4ace27d657b3ff3 X-VCS-Branch: dev Date: Mon, 8 Jan 2024 08:57:09 +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: 34227494-c181-4353-bbfb-ef6a66b050ed X-Archives-Hash: 9deb978d6d4193607fbd39ee7baa9d31 commit: 0c081f01791ac5efc8524195d4ace27d657b3ff3 Author: Remigiusz Micielski purelymail com> AuthorDate: Mon Jan 8 08:55:08 2024 +0000 Commit: Remigiusz Micielski gmail 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 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}" -}