* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/hyprlock/files/, gui-apps/hyprlock/
@ 2024-04-13 17:15 Julien Roy
0 siblings, 0 replies; 2+ messages in thread
From: Julien Roy @ 2024-04-13 17:15 UTC (permalink / raw
To: gentoo-commits
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 <vaxry@vaxry.net>
+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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/hyprlock/files/, gui-apps/hyprlock/
@ 2024-10-31 11:33 David Roman
0 siblings, 0 replies; 2+ messages in thread
From: David Roman @ 2024-10-31 11:33 UTC (permalink / raw
To: gentoo-commits
commit: fa37442d892ce8b6a5540febc640df5a64d1af0d
Author: Anthony Ruhier <aruhier <AT> mailbox <DOT> org>
AuthorDate: Wed Oct 30 10:15:07 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Oct 30 10:15:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa37442d
gui-apps/hyprlock: add 0.5.0
Signed-off-by: Anthony Ruhier <aruhier <AT> mailbox.org>
gui-apps/hyprlock/Manifest | 1 +
.../files/hyprlock-0.5.0-fix-CFLAGS-CXXFLAGS.patch | 12 +++++
gui-apps/hyprlock/hyprlock-0.5.0.ebuild | 51 ++++++++++++++++++++++
3 files changed, 64 insertions(+)
diff --git a/gui-apps/hyprlock/Manifest b/gui-apps/hyprlock/Manifest
index 79be81f6e..961093723 100644
--- a/gui-apps/hyprlock/Manifest
+++ b/gui-apps/hyprlock/Manifest
@@ -1 +1,2 @@
DIST hyprlock-0.4.1.tar.gz 64302 BLAKE2B c6c745b6efa453aa2eff71d65e25c26499ada675c983d62c36c72f1a2ef8e6e4415cf7d53a7e405971366470149a8b40e855923ae7dc86e01e32ff1d257353b5 SHA512 f3831f51a18907e400ba8ab17e16aec7edc25eff207da6cb70b1a06eb1b8312d3061b077cc6ff59d5475bc17322a3f1e47bd9e6adc9041617b8797366eb6d7b5
+DIST hyprlock-0.5.0.tar.gz 67016 BLAKE2B c15491e00c0b3ea04e9d99c399d6803271849f75432ed34b516cbe059582371de357e67077e356eb7d71a7490e010ff2a5333444410023a73598d5ee185f2346 SHA512 c9fc30e20889dc694294ad9ec03c39c7e47fada4972139822b9f9275d04f2de6a9105918eca1369a4c6a3e4f5c6a956675beebbbab688f0d8f13bffccedb5a03
diff --git a/gui-apps/hyprlock/files/hyprlock-0.5.0-fix-CFLAGS-CXXFLAGS.patch b/gui-apps/hyprlock/files/hyprlock-0.5.0-fix-CFLAGS-CXXFLAGS.patch
new file mode 100644
index 000000000..cfde5df93
--- /dev/null
+++ b/gui-apps/hyprlock/files/hyprlock-0.5.0-fix-CFLAGS-CXXFLAGS.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c2dfd6c..96f34b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+ message(STATUS "Configuring hyprlock in Debug with CMake")
+ add_compile_definitions(HYPRLAND_DEBUG)
+ else()
+- add_compile_options(-O3)
+ message(STATUS "Configuring hyprlock in Release with CMake")
+ endif()
+
diff --git a/gui-apps/hyprlock/hyprlock-0.5.0.ebuild b/gui-apps/hyprlock/hyprlock-0.5.0.ebuild
new file mode 100644
index 000000000..d800d0089
--- /dev/null
+++ b/gui-apps/hyprlock/hyprlock-0.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Hyprland's GPU-accelerated screen locking utility"
+HOMEPAGE="https://github.com/hyprwm/hyprlock"
+
+if [[ "${PV}" = *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+ SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+ dev-cpp/sdbus-c++:0/2
+ >=dev-libs/hyprlang-0.4.0
+ >=gui-libs/hyprutils-0.2.0
+ dev-libs/date
+ dev-libs/glib:2
+ dev-libs/wayland
+ media-libs/libglvnd
+ media-libs/libjpeg-turbo:=
+ media-libs/libwebp:=
+ media-libs/mesa[opengl]
+ sys-libs/pam
+ x11-libs/cairo
+ x11-libs/libxkbcommon
+ x11-libs/libdrm
+ x11-libs/pango
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/wayland-protocols
+"
+
+BDEPEND="
+ dev-util/wayland-scanner
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/hyprlock-0.4.1-fix-CFLAGS-CXXFLAGS.patch"
+)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-31 11:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-31 11:33 [gentoo-commits] repo/proj/guru:master commit in: gui-apps/hyprlock/files/, gui-apps/hyprlock/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-04-13 17:15 Julien Roy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox