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 BA4B51581E7 for ; Sun, 21 Apr 2024 22:11:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DE2AE29AC; Sun, 21 Apr 2024 22:11:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75540E29AC for ; Sun, 21 Apr 2024 22:11:18 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 356F034354C for ; Sun, 21 Apr 2024 22:11:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F9081513 for ; Sun, 21 Apr 2024 22:11:15 +0000 (UTC) From: "Anthony Ruhier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony Ruhier" Message-ID: <1713737401.41b304c25c983bbe251cf791bc3336b7c06a27ec.aruhier@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/files/xdg-desktop-portal-hyprland-1.3.1_fix_systemd_path.patch gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild X-VCS-Directories: gui-libs/xdg-desktop-portal-hyprland/files/ gui-libs/xdg-desktop-portal-hyprland/ X-VCS-Committer: aruhier X-VCS-Committer-Name: Anthony Ruhier X-VCS-Revision: 41b304c25c983bbe251cf791bc3336b7c06a27ec X-VCS-Branch: dev Date: Sun, 21 Apr 2024 22:11:15 +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: 57a92c77-29cc-4f74-9025-ce6764ad2091 X-Archives-Hash: db8f131f6b8521848446e74944051068 commit: 41b304c25c983bbe251cf791bc3336b7c06a27ec Author: Anthony Ruhier mailbox org> AuthorDate: Sun Apr 21 22:10:01 2024 +0000 Commit: Anthony Ruhier mailbox 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 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 +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 }