Skip to content
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

Closed
wants to merge 1 commit into from
Closed

chatterino2: update to 2.3.4. #32199

wants to merge 1 commit into from

Conversation

33KK
Copy link
Contributor

@33KK 33KK commented Jul 25, 2021

General

Have the results of the proposed changes been tested?

  • I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
  • I generally don't use the affected packages but briefly tested this PR

@ericonr
Copy link
Member

ericonr commented Jul 26, 2021

Have you considered asking upstream for prepared tarballs with all the subrepos already inside? :)

@33KK
Copy link
Contributor Author

33KK commented Jul 26, 2021

Not sure if that would work, since I'm not downloading some of the submodules

Copy link
Member

@ericonr ericonr left a 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...

srcpkgs/chatterino2/template Outdated Show resolved Hide resolved
@33KK
Copy link
Contributor Author

33KK commented Jul 26, 2021

I found it to be more readable this way

@ericonr
Copy link
Member

ericonr commented Jul 31, 2021

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 distfiles.

Copy link
Member

@ericonr ericonr left a 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?

srcpkgs/chatterino2/template Outdated Show resolved Hide resolved
srcpkgs/chatterino2/template Outdated Show resolved Hide resolved
srcpkgs/chatterino2/template Outdated Show resolved Hide resolved
@33KK
Copy link
Contributor Author

33KK commented Aug 3, 2021

Hopefully didn't mess anything up this time 🥴

@Francesco149
Copy link
Contributor

@Francesco149 ok to be adopted?

yep no problem

@33KK 33KK changed the title chatterino2: update to 2.3.3. chatterino2: update to 2.3.4. Aug 5, 2021
@tibequadorian
Copy link
Contributor

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)
 

@tibequadorian
Copy link
Contributor

I'm pretty sure WinToast is not required.

@paper42
Copy link
Member

paper42 commented Apr 2, 2022

#36170

@paper42 paper42 closed this Apr 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants