pool/hyprland
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1119458 from home:sp1rit

Browse Source 
Added "fix_ia86_std_clamp.patch" that is required for Hyprland to build on ia86.

OBS-URL: https://build.opensuse.org/request/show/1119458
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/hyprland?expand=0&rev=45
This commit is contained in:
Florian 2023-10-22 22:26:26 +00:00 committed by Git OBS Bridge
parent 56bdf16015
commit e287efa1e3
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fix_ia86_std_clamp.patch Normal file
View File

@ -0,0 +1,31 @@
From 913c8b81ad44e159e5f0b555a1254451065f317d Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 16 Oct 2023 21:26:45 +0200
Subject: [PATCH] renderer: cast std::clamp args to be of the same type
src/render/OpenGL.cpp:1769:41: error: no matching function for call to 'clamp'
const auto FORCEWALLPAPER = std::clamp(*PFORCEWALLPAPER, -1L, 2L);
^~~~~~~~~~
/usr/include/c++/v1/__algorithm/clamp.h:38:1: note: candidate template ignored: deduced conflicting types for parameter '_Tp' ('int64_t' (aka 'long long') vs. 'long')
clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi)
^
/usr/include/c++/v1/__algorithm/clamp.h:27:1: note: candidate function template not viable: requires 4 arguments, but 3 were provided
clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi, _Compare __comp)
^
---
src/render/OpenGL.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp
index 8ad8e0c140..2d8ee92b2d 100644
--- a/src/render/OpenGL.cpp
+++ b/src/render/OpenGL.cpp
@@ -1766,7 +1766,7 @@ void CHyprOpenGLImpl::createBGTextureForMonitor(CMonitor* pMonitor) {
static auto* const PFORCEHYPRCHAN = &g_pConfigManager->getConfigValuePtr("misc:force_hypr_chan")->intValue;
static auto* const PFORCEWALLPAPER = &g_pConfigManager->getConfigValuePtr("misc:force_default_wallpaper")->intValue;
- const auto FORCEWALLPAPER = std::clamp(*PFORCEWALLPAPER, -1L, 2L);
+ const auto FORCEWALLPAPER = std::clamp(*PFORCEWALLPAPER, static_cast<int64_t>(-1L), static_cast<int64_t>(2L));
// release the last tex if exists
const auto PTEX = &m_mMonitorBGTextures[pMonitor];

6
hyprland.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Oct 22 22:21:49 UTC 2023 - Florian "spirit" <packaging@sp1rit.anonaddy.me>
- Added "fix_ia86_std_clamp.patch" that is required for Hyprland to
build on ia86.
-------------------------------------------------------------------
Thu Oct 19 14:12:29 UTC 2023 - Florian "spirit" <packaging@sp1rit.anonaddy.me>

2
hyprland.spec
View File

@ -27,6 +27,8 @@ License: BSD-3-Clause
URL: https://hyprland.org/
Source0: %{name}-%{version}.tar.xz
Patch1: 0001-fixed-patchd-wlroots-build.patch
# Source: https://github.com/hyprwm/Hyprland/pull/3589. Will be included in the next release.
Patch2: fix_ia86_std_clamp.patch
BuildRequires: cmake
BuildRequires: gcc-c++ >= 11
BuildRequires: git