commit: 2af7eea2247a8c9ad1af4af9cfe3a970163f6e45 Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Sat Apr 13 16:17:55 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Sat Apr 13 16:21:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2af7eea2
gui-apps/hyprlock: add 0.3.0-r1, drop 0.3.0 * apply upstream patch that fix cmake install error Closes: https://bugs.gentoo.org/929117 Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com> .../files/0002-cmake-install-pam-file-fix.patch | 24 ++++++++++++++++++++++ ...rlock-0.3.0.ebuild => hyprlock-0.3.0-r1.ebuild} | 1 + gui-apps/hyprlock/hyprlock-9999.ebuild | 9 ++------ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/gui-apps/hyprlock/files/0002-cmake-install-pam-file-fix.patch b/gui-apps/hyprlock/files/0002-cmake-install-pam-file-fix.patch new file mode 100644 index 0000000000..fbdf38c84a --- /dev/null +++ b/gui-apps/hyprlock/files/0002-cmake-install-pam-file-fix.patch @@ -0,0 +1,24 @@ +From d9a6229434fba475ea42b634ee2f03919236798d Mon Sep 17 00:00:00 2001 +From: Vaxry <[email protected]> +Date: Wed, 10 Apr 2024 22:42:54 +0100 +Subject: [PATCH] pam: always install pam file + +--- + CMakeLists.txt | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4d73c4..3cc75f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,9 +83,4 @@ protocol("unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml" "linux-dmabuf-unst + # Installation + install(TARGETS hyprlock) + +-install(CODE " +- if (NOT EXISTS \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d/hyprlock\") +- install(FILES \"${CMAKE_SOURCE_DIR}/pam/hyprlock\" DESTINATION \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d\") +- endif() +-") +- ++install(FILES ${CMAKE_SOURCE_DIR}/pam/hyprlock DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d) diff --git a/gui-apps/hyprlock/hyprlock-0.3.0.ebuild b/gui-apps/hyprlock/hyprlock-0.3.0-r1.ebuild similarity index 95% rename from gui-apps/hyprlock/hyprlock-0.3.0.ebuild rename to gui-apps/hyprlock/hyprlock-0.3.0-r1.ebuild index ea126e6db7..bb79fa02dc 100644 --- a/gui-apps/hyprlock/hyprlock-0.3.0.ebuild +++ b/gui-apps/hyprlock/hyprlock-0.3.0-r1.ebuild @@ -46,6 +46,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch" + "${FILESDIR}/0002-cmake-install-pam-file-fix.patch" ) src_configure() { diff --git a/gui-apps/hyprlock/hyprlock-9999.ebuild b/gui-apps/hyprlock/hyprlock-9999.ebuild index caf3a0797b..ea126e6db7 100644 --- a/gui-apps/hyprlock/hyprlock-9999.ebuild +++ b/gui-apps/hyprlock/hyprlock-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 inherit cmake toolchain-funcs -COMMIT="57e80006602b7857fb23feded368055df62b8cb3" DESCRIPTION="Hyprland's GPU-accelerated screen locking utility" HOMEPAGE="https://github.com/hyprwm/hyprlock"; @@ -13,12 +12,8 @@ if [[ "${PV}" = *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"; else - #When releases start to happen - #SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz" - #S="${WORKDIR}/${PN}-source" - - SRC_URI="https://github.com/hyprwm/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" + SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${PV}" KEYWORDS="~amd64" fi
