diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2024-07-05 22:58:45 +0200 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2024-07-06 12:43:19 +0200 |
| commit | a351889cffbc48b1b861c871e902668844e2d4b8 (patch) | |
| tree | 09defbb70bd65a4d99110f1f98fec04640ca0d50 | |
| parent | KDE: KDE Plasma 6.1.2, Bugfix Release for July (diff) | |
x11/hyprlock: update to 0.4.02024Q3
Changes: https://github.com/hyprwm/hyprlock/releases/tag/v0.4.0
Reported by: GitHub (watch releases)
(cherry picked from commit e96bf8752a2225eecae38acc1694aa654c681339)
| -rw-r--r-- | x11/hyprlock/Makefile | 9 | ||||
| -rw-r--r-- | x11/hyprlock/distinfo | 12 | ||||
| -rw-r--r-- | x11/hyprlock/files/patch-pam_hyprlock | 23 |
3 files changed, 23 insertions, 21 deletions
diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile index 5e9bfdc49e85..0030a047a9d8 100644 --- a/x11/hyprlock/Makefile +++ b/x11/hyprlock/Makefile @@ -1,11 +1,10 @@ PORTNAME= hyprlock DISTVERSIONPREFIX= v -DISTVERSION= 0.3.0 +DISTVERSION= 0.4.0 CATEGORIES= x11 wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= d9a6229434fb.patch:-p1 # -G Ninja -PATCHFILES+= 8658386f212f.patch:-p1 # https://github.com/hyprwm/hyprlock/issues/289 +PATCHFILES+= 7fb3c0350076.patch:-p1 # https://github.com/hyprwm/hyprlock/pull/404 MAINTAINER= jbeich@FreeBSD.org COMMENT= Hyprland's GPU-accelerated screen locking utility #' @@ -16,12 +15,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ + libhyprutils.so:devel/hyprutils \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ + libwebp.so:graphics/webp \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper -USES= compiler:c++11-lib cmake gl gnome pkgconfig +USES= cmake compiler:c++11-lib gl gnome jpeg pkgconfig USE_GITHUB= yes USE_GL= egl gbm USE_GNOME= cairo pango diff --git a/x11/hyprlock/distinfo b/x11/hyprlock/distinfo index c0d6df0daf68..0ab6a75dbb22 100644 --- a/x11/hyprlock/distinfo +++ b/x11/hyprlock/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1715283979 -SHA256 (hyprwm-hyprlock-v0.3.0_GH0.tar.gz) = 5e84ac3223ea340bb3d39c22db4edefbb8364da8c3b6b3d0da1dfa45d8cc945f -SIZE (hyprwm-hyprlock-v0.3.0_GH0.tar.gz) = 61599 -SHA256 (d9a6229434fb.patch) = c50bfa1b1d69d95a6fe0ae9ab9c023ee220f8b9b535a54f1271782e33b198941 -SIZE (d9a6229434fb.patch) = 852 -SHA256 (8658386f212f.patch) = 36d0de05ba6897dc77ad2ad86ad7ffd0aae6d665dc588b931e0f86243818906d -SIZE (8658386f212f.patch) = 984 +TIMESTAMP = 1720213125 +SHA256 (hyprwm-hyprlock-v0.4.0_GH0.tar.gz) = 1da2a9e55e3f174a7c10d3c71b54bba1b55dbbbd1ef3a94783b43c40f3b0c83d +SIZE (hyprwm-hyprlock-v0.4.0_GH0.tar.gz) = 63230 +SHA256 (7fb3c0350076.patch) = 69891ef9be8a2510062b91972cda662614096918879de730ad93f256dd34309c +SIZE (7fb3c0350076.patch) = 1208 diff --git a/x11/hyprlock/files/patch-pam_hyprlock b/x11/hyprlock/files/patch-pam_hyprlock index 57460c064b18..864ba47ea5b2 100644 --- a/x11/hyprlock/files/patch-pam_hyprlock +++ b/x11/hyprlock/files/patch-pam_hyprlock @@ -14,14 +14,17 @@ so try authenticating via setuid helper first. -auth include login +auth include unix-selfauth ---- src/core/Password.cpp.orig 2024-04-08 14:39:01 UTC -+++ src/core/Password.cpp -@@ -70,7 +70,7 @@ std::shared_ptr<CPassword::SVerificationResult> CPassw - return true; - }; - -- result->realized = auth("hyprlock") || auth("su") || true; -+ result->realized = auth("hyprlock") || true; - g_pHyprlock->addTimer(std::chrono::milliseconds(1), passwordCheckTimerCallback, nullptr); - }).detach(); +--- src/core/Auth.cpp.orig 2024-07-05 20:58:45 UTC ++++ src/core/Auth.cpp +@@ -56,11 +56,6 @@ CAuth::CAuth() { + CAuth::CAuth() { + static auto* const PPAMMODULE = (Hyprlang::STRING*)(g_pConfigManager->getValuePtr("general:pam_module")); + m_sPamModule = *PPAMMODULE; +- +- if (!std::filesystem::exists(std::filesystem::path("/etc/pam.d/") / m_sPamModule)) { +- Debug::log(ERR, "Pam module \"/etc/pam.d/{}\" does not exist! Falling back to \"/etc/pam.d/su\"", m_sPamModule); +- m_sPamModule = "su"; +- } + } + static void passwordCheckTimerCallback(std::shared_ptr<CTimer> self, void* data) { |