-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chatterino2: update to 2.3.4. #32199
Conversation
Have you considered asking upstream for prepared tarballs with all the subrepos already inside? :) |
Not sure if that would work, since I'm not downloading some of the submodules |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you moving things around so much? This was already using the preferred order, so the diff shouldn't be so huge...
I found it to be more readable this way |
Right, but the main style in void to bundle all the commits on top instead of right before |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Francesco149 ok to be adopted?
Hopefully didn't mess anything up this time 🥴 |
yep no problem |
This patch should fix cross builds: diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
index 82905436..b0b89a4e 100644
--- a/cmake/FindLRUCache.cmake
+++ b/cmake/FindLRUCache.cmake
@@ -1,6 +1,6 @@
include(FindPackageHandleStandardArgs)
-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
+find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
index 4671874c..119284c2 100644
--- a/cmake/FindPajladaSerialize.cmake
+++ b/cmake/FindPajladaSerialize.cmake
@@ -1,6 +1,6 @@
include(FindPackageHandleStandardArgs)
-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
+find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
index f4c964ec..75efba20 100644
--- a/cmake/FindPajladaSignals.cmake
+++ b/cmake/FindPajladaSignals.cmake
@@ -1,6 +1,6 @@
include(FindPackageHandleStandardArgs)
-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
+find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
|
I'm pretty sure WinToast is not required. |
General
Have the results of the proposed changes been tested?