Removed patches for Hyprland git
Some checks failed
Build hyprland-git / Build and push image (push) Failing after 4m43s
Some checks failed
Build hyprland-git / Build and push image (push) Failing after 4m43s
This commit is contained in:
@@ -1,191 +0,0 @@
|
||||
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
|
||||
index 0d9c2f8..6b966c9 100644
|
||||
--- a/src/Compositor.cpp
|
||||
+++ b/src/Compositor.cpp
|
||||
@@ -79,6 +79,7 @@
|
||||
#include <malloc.h>
|
||||
#include <unistd.h>
|
||||
#include <xf86drm.h>
|
||||
+#include <memory>
|
||||
|
||||
using namespace Hyprutils::String;
|
||||
using namespace Aquamarine;
|
||||
@@ -1179,7 +1180,7 @@ PHLWINDOW CCompositor::getWindowFromSurface(SP<CWLSurfaceResource> pSurface) {
|
||||
if (VIEW->type() != Desktop::View::VIEW_TYPE_WINDOW)
|
||||
return nullptr;
|
||||
|
||||
- return dynamicPointerCast<Desktop::View::CWindow>(VIEW);
|
||||
+ return std::dynamic_pointer_cast<Desktop::View::CWindow>(VIEW);
|
||||
}
|
||||
|
||||
PHLWINDOW CCompositor::getWindowFromHandle(uint32_t handle) {
|
||||
diff --git a/src/desktop/view/LayerSurface.cpp b/src/desktop/view/LayerSurface.cpp
|
||||
index 3192321..e71163b 100644
|
||||
--- a/src/desktop/view/LayerSurface.cpp
|
||||
+++ b/src/desktop/view/LayerSurface.cpp
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "../../managers/input/InputManager.hpp"
|
||||
#include "../../managers/HookSystemManager.hpp"
|
||||
#include "../../managers/EventManager.hpp"
|
||||
+#include <memory>
|
||||
|
||||
using namespace Desktop;
|
||||
using namespace Desktop::View;
|
||||
diff --git a/src/desktop/view/Popup.cpp b/src/desktop/view/Popup.cpp
|
||||
index 31ea125..a47f2d0 100644
|
||||
--- a/src/desktop/view/Popup.cpp
|
||||
+++ b/src/desktop/view/Popup.cpp
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "../../render/Renderer.hpp"
|
||||
#include "../../render/OpenGL.hpp"
|
||||
#include <ranges>
|
||||
+#include <memory>
|
||||
|
||||
using namespace Desktop;
|
||||
using namespace Desktop::View;
|
||||
@@ -51,7 +52,7 @@ SP<CPopup> CPopup::create(SP<CXDGPopupResource> resource, WP<CPopup> pOwner) {
|
||||
SP<CPopup> CPopup::fromView(SP<IView> v) {
|
||||
if (!v || v->type() != VIEW_TYPE_POPUP)
|
||||
return nullptr;
|
||||
- return dynamicPointerCast<CPopup>(v);
|
||||
+ return std::dynamic_pointer_cast<CPopup>(v);
|
||||
}
|
||||
|
||||
CPopup::CPopup() : IView(CWLSurface::create()) {
|
||||
diff --git a/src/desktop/view/SessionLock.cpp b/src/desktop/view/SessionLock.cpp
|
||||
index a4a5b78..a949288 100644
|
||||
--- a/src/desktop/view/SessionLock.cpp
|
||||
+++ b/src/desktop/view/SessionLock.cpp
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "../../Compositor.hpp"
|
||||
|
||||
+#include <memory>
|
||||
+
|
||||
using namespace Desktop;
|
||||
using namespace Desktop::View;
|
||||
|
||||
@@ -36,7 +38,7 @@ void View::CSessionLock::init() {
|
||||
SP<View::CSessionLock> View::CSessionLock::fromView(SP<IView> v) {
|
||||
if (!v || v->type() != VIEW_TYPE_LOCK_SCREEN)
|
||||
return nullptr;
|
||||
- return dynamicPointerCast<View::CSessionLock>(v);
|
||||
+ return std::dynamic_pointer_cast<View::CSessionLock>(v);
|
||||
}
|
||||
|
||||
eViewType View::CSessionLock::type() const {
|
||||
diff --git a/src/desktop/view/Subsurface.cpp b/src/desktop/view/Subsurface.cpp
|
||||
index 2c39a08..9fe4369 100644
|
||||
--- a/src/desktop/view/Subsurface.cpp
|
||||
+++ b/src/desktop/view/Subsurface.cpp
|
||||
@@ -6,6 +6,7 @@
|
||||
#include "../../protocols/core/Subcompositor.hpp"
|
||||
#include "../../render/Renderer.hpp"
|
||||
#include "../../managers/input/InputManager.hpp"
|
||||
+#include <memory>
|
||||
|
||||
using namespace Desktop;
|
||||
using namespace Desktop::View;
|
||||
@@ -56,7 +57,7 @@ SP<CSubsurface> CSubsurface::create(SP<CWLSubsurfaceResource> pSubsurface, WP<De
|
||||
SP<CSubsurface> CSubsurface::fromView(SP<IView> v) {
|
||||
if (!v || v->type() != VIEW_TYPE_SUBSURFACE)
|
||||
return nullptr;
|
||||
- return dynamicPointerCast<CSubsurface>(v);
|
||||
+ return dynamic_pointer_cast<CSubsurface>(v);
|
||||
}
|
||||
|
||||
CSubsurface::CSubsurface() : IView(CWLSurface::create()) {
|
||||
diff --git a/src/desktop/view/WLSurface.cpp b/src/desktop/view/WLSurface.cpp
|
||||
index 1bf90ae..f7772df 100644
|
||||
--- a/src/desktop/view/WLSurface.cpp
|
||||
+++ b/src/desktop/view/WLSurface.cpp
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "../../protocols/core/Compositor.hpp"
|
||||
#include "../../protocols/LayerShell.hpp"
|
||||
#include "../../render/Renderer.hpp"
|
||||
+#include <memory>
|
||||
|
||||
using namespace Desktop;
|
||||
using namespace Desktop::View;
|
||||
@@ -44,7 +45,7 @@ bool CWLSurface::small() const {
|
||||
if (!m_resource->m_current.texture)
|
||||
return false;
|
||||
|
||||
- const auto O = dynamicPointerCast<CWindow>(m_view.lock());
|
||||
+ const auto O = std::dynamic_pointer_cast<CWindow>(m_view.lock());
|
||||
const auto REPORTED_SIZE = O->getReportedSize();
|
||||
|
||||
return REPORTED_SIZE.x > m_resource->m_current.size.x + 1 || REPORTED_SIZE.y > m_resource->m_current.size.y + 1;
|
||||
@@ -55,7 +56,7 @@ Vector2D CWLSurface::correctSmallVec() const {
|
||||
return {};
|
||||
|
||||
const auto SIZE = getViewporterCorrectedSize();
|
||||
- const auto O = dynamicPointerCast<CWindow>(m_view.lock());
|
||||
+ const auto O = std::dynamic_pointer_cast<CWindow>(m_view.lock());
|
||||
const auto REP = O->getReportedSize();
|
||||
|
||||
return Vector2D{(REP.x - SIZE.x) / 2, (REP.y - SIZE.y) / 2}.clamp({}, {INFINITY, INFINITY}) * (O->m_realSize->value() / REP);
|
||||
@@ -106,7 +107,7 @@ CRegion CWLSurface::computeDamage() const {
|
||||
damage.scale(SCALE);
|
||||
if (BOX.has_value()) {
|
||||
if (m_view->type() == VIEW_TYPE_WINDOW)
|
||||
- damage.intersect(CBox{{}, BOX->size() * dynamicPointerCast<CWindow>(m_view.lock())->m_X11SurfaceScaledBy});
|
||||
+ damage.intersect(CBox{{}, BOX->size() * std::dynamic_pointer_cast<CWindow>(m_view.lock())->m_X11SurfaceScaledBy});
|
||||
else
|
||||
damage.intersect(CBox{{}, BOX->size()});
|
||||
}
|
||||
diff --git a/src/desktop/view/Window.cpp b/src/desktop/view/Window.cpp
|
||||
index e27129a..f433a40 100644
|
||||
--- a/src/desktop/view/Window.cpp
|
||||
+++ b/src/desktop/view/Window.cpp
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "../../managers/animation/DesktopAnimationManager.hpp"
|
||||
|
||||
#include <hyprutils/string/String.hpp>
|
||||
+#include <memory>
|
||||
|
||||
using namespace Hyprutils::String;
|
||||
using namespace Hyprutils::Animation;
|
||||
@@ -131,7 +132,7 @@ CWindow::CWindow(SP<CXWaylandSurface> surface) : IView(CWLSurface::create()), m_
|
||||
SP<CWindow> CWindow::fromView(SP<IView> v) {
|
||||
if (!v || v->type() != VIEW_TYPE_WINDOW)
|
||||
return nullptr;
|
||||
- return dynamicPointerCast<CWindow>(v);
|
||||
+ return dynamic_pointer_cast<CWindow>(v);
|
||||
}
|
||||
|
||||
CWindow::~CWindow() {
|
||||
diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
|
||||
index 98662d1..d0d2f87 100644
|
||||
--- a/src/managers/input/InputManager.cpp
|
||||
+++ b/src/managers/input/InputManager.cpp
|
||||
@@ -48,6 +48,7 @@
|
||||
#include "../cursor/CursorShapeOverrideController.hpp"
|
||||
|
||||
#include <aquamarine/input/Input.hpp>
|
||||
+#include <memory>
|
||||
|
||||
CInputManager::CInputManager() {
|
||||
m_listeners.setCursorShape = PROTO::cursorShape->m_events.setShape.listen([this](const CCursorShapeProtocol::SSetShapeEvent& event) {
|
||||
@@ -337,10 +338,10 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus, bool mouse, st
|
||||
const auto BOX = HLSurface->getSurfaceBoxGlobal();
|
||||
|
||||
if (BOX) {
|
||||
- const auto PWINDOW = HLSurface->view()->type() == Desktop::View::VIEW_TYPE_WINDOW ? dynamicPointerCast<Desktop::View::CWindow>(HLSurface->view()) : nullptr;
|
||||
+ const auto PWINDOW = HLSurface->view()->type() == Desktop::View::VIEW_TYPE_WINDOW ? std::dynamic_pointer_cast<Desktop::View::CWindow>(HLSurface->view()) : nullptr;
|
||||
surfacePos = BOX->pos();
|
||||
pFoundLayerSurface =
|
||||
- HLSurface->view()->type() == Desktop::View::VIEW_TYPE_LAYER_SURFACE ? dynamicPointerCast<Desktop::View::CLayerSurface>(HLSurface->view()) : nullptr;
|
||||
+ HLSurface->view()->type() == Desktop::View::VIEW_TYPE_LAYER_SURFACE ? std::dynamic_pointer_cast<Desktop::View::CLayerSurface>(HLSurface->view()) : nullptr;
|
||||
if (!pFoundLayerSurface)
|
||||
pFoundWindow = !PWINDOW || PWINDOW->isHidden() ? Desktop::focusState()->window() : PWINDOW;
|
||||
} else // reset foundSurface, find one normally
|
||||
@@ -786,7 +787,7 @@ void CInputManager::processMouseDownNormal(const IPointer::SButtonEvent& e) {
|
||||
auto HLSurf = Desktop::View::CWLSurface::fromResource(g_pSeatManager->m_state.pointerFocus.lock());
|
||||
|
||||
if (HLSurf && HLSurf->view()->type() == Desktop::View::VIEW_TYPE_WINDOW)
|
||||
- g_pCompositor->changeWindowZOrder(dynamicPointerCast<Desktop::View::CWindow>(HLSurf->view()), true);
|
||||
+ g_pCompositor->changeWindowZOrder(std::dynamic_pointer_cast<Desktop::View::CWindow>(HLSurf->view()), true);
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -28,7 +28,6 @@ License: BSD-3-Clause AND BSD-2-Clause AND HPND-sell-variant AND LGPL-2.1
|
||||
URL: https://github.com/hyprwm/Hyprland
|
||||
%if 0%{?bumpver}
|
||||
Source0: %{url}/archive/%{hyprland_commit}/%{name}-%{hyprland_shortcommit}.tar.gz
|
||||
Patch1: dynamicPointerCast.patch
|
||||
Source2: https://github.com/hyprwm/hyprland-protocols/archive/%{protocols_commit}/protocols-%{protocols_shortcommit}.tar.gz
|
||||
Source3: https://github.com/canihavesomecoffee/udis86/archive/%{udis86_commit}/udis86-%{udis86_shortcommit}.tar.gz
|
||||
%else
|
||||
@@ -185,7 +184,6 @@ Requires: pkgconfig(xkbcommon)
|
||||
|
||||
%prep
|
||||
%autosetup -n %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source} -N
|
||||
%autopatch -p 1
|
||||
|
||||
%if 0%{?bumpver}
|
||||
tar -xf %{SOURCE2} -C subprojects/hyprland-protocols --strip=1
|
||||
|
||||
Reference in New Issue
Block a user