Merge pull request #186 from matt1432/chase

Once again chasing latest Hyprland breaking changes
horriblename · Dec 9, 2024 · c56756a · c56756a
2 parents aecf810 + 017c568
commit c56756a
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 22 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -30,7 +30,7 @@
           sed -e 's/c++23/c++2b/g' ./build/compile_commands.json > ./compile_commands.json
         '';
         name = "hyprgrass-shell";
-        nativeBuildInputs = with pkgs; [gcc13 meson pkg-config ninja];
+        nativeBuildInputs = with pkgs; [gcc14 meson pkg-config ninja];
         buildInputs = [hyprland.packages.${system}.hyprland];
         inputsFrom = [
           hyprland.packages.${system}.hyprland

diff --git a/hyprpm.toml b/hyprpm.toml
@@ -17,6 +17,7 @@ commit_pins = [
     ["500d2a3580388afc8b620b0a3624147faa34f98b", "cb929099477407116031010905ce439db771dd62"], # v0.45.1
     ["12f9a0d0b93f691d4d9923716557154d74777b0a", "cb929099477407116031010905ce439db771dd62"], # v0.45.2
     ["320144ae7288fe23686935ebb235d9fe0c900862", "0c2c3dc676cee437cece6cca67965bbaba0e45b5"], # CColor -> CHyprColor
+    ["8bbeee11734d3ba8e2cf15d19cb3c302f8bfdbf2", "b0c1287d571e829adf0b9fe17677c9e7c4277703"], # clang-tidy
     ## DO NOT EDIT THIS LINE: for auto pin script ##
 ]
 

diff --git a/nix/default.nix b/nix/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  gcc13Stdenv,
+  gcc14Stdenv,
   cmake,
   meson,
   ninja,
@@ -12,7 +12,7 @@
 }: let
   version = builtins.readFile ../VERSION;
 in
-  gcc13Stdenv.mkDerivation {
+  gcc14Stdenv.mkDerivation {
     pname = "hyprgrass";
     inherit version;
     src = ./..;

diff --git a/src/GestureManager.hpp b/src/GestureManager.hpp
@@ -7,6 +7,7 @@
 
 #define private public
 #include <hyprland/src/debug/Log.hpp>
+#include <hyprland/src/devices/ITouch.hpp>
 #include <hyprland/src/helpers/Monitor.hpp>
 #include <hyprland/src/includes.hpp>
 #include <hyprland/src/managers/KeybindManager.hpp>

diff --git a/src/HyprLogger.hpp b/src/HyprLogger.hpp
@@ -1,5 +1,5 @@
 #include "gestures/Logger.hpp"
-#include "src/debug/Log.hpp"
+#include <hyprland/src/debug/Log.hpp>
 
 class HyprLogger : public Logger {
   public:

diff --git a/src/main.cpp b/src/main.cpp
@@ -38,13 +38,13 @@ static void onPreConfigReload() {
 }
 
 void listInternalBinds(std::string) {
-    Debug::log(LogLevel::LOG, "[hyprgrass] Listing internal binds:");
+    Debug::log(LOG, "[hyprgrass] Listing internal binds:");
     for (const auto& bind : g_pGestureManager->internalBinds) {
-        Debug::log(LogLevel::LOG, "[hyprgrass] | gesture: {}", bind->key);
-        Debug::log(LogLevel::LOG, "[hyprgrass] |     dispatcher: {}", bind->handler);
-        Debug::log(LogLevel::LOG, "[hyprgrass] |     arg: {}", bind->arg);
-        Debug::log(LogLevel::LOG, "[hyprgrass] |     mouse: {}", bind->mouse);
-        Debug::log(LogLevel::LOG, "[hyprgrass] |");
+        Debug::log(LOG, "[hyprgrass] | gesture: {}", bind->key);
+        Debug::log(LOG, "[hyprgrass] |     dispatcher: {}", bind->handler);
+        Debug::log(LOG, "[hyprgrass] |     arg: {}", bind->arg);
+        Debug::log(LOG, "[hyprgrass] |     mouse: {}", bind->mouse);
+        Debug::log(LOG, "[hyprgrass] |");
     }
 }