From 70bb674938b4dd3e3805afb9f5b279dba1b1b031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Stormo?= Date: Fri, 15 May 2026 22:49:30 +0200 Subject: [PATCH] chatterino2: update to 2.5.5. --- srcpkgs/chatterino2/patches/cmake.patch | 38 +-------------------- srcpkgs/chatterino2/template | 44 +++++++++++-------------- 2 files changed, 20 insertions(+), 62 deletions(-) diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch index 89c11a3095075a..bc6e4ee92d0b21 100644 --- a/srcpkgs/chatterino2/patches/cmake.patch +++ b/srcpkgs/chatterino2/patches/cmake.patch @@ -34,32 +34,8 @@ index b595075c..9c4e0f03 100644 find_package_handle_standard_args(MagicEnum DEFAULT_MSG MagicEnum_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) - diff --git a/cmake/FindSol2.cmake b/cmake/FindSol2.cmake -index be64d000..2b18a5ce 100644 +index be64d000..f5cddbca 100644 --- a/cmake/FindSol2.cmake +++ b/cmake/FindSol2.cmake @@ -1,6 +1,6 @@ @@ -70,15 +46,3 @@ index be64d000..2b18a5ce 100644 find_package_handle_standard_args(Sol2 DEFAULT_MSG Sol2_INCLUDE_DIR) -diff --git a/cmake/FindWebsocketpp.cmake b/cmake/FindWebsocketpp.cmake -index f8d0bb65..cd9b8b0e 100644 ---- a/cmake/FindWebsocketpp.cmake -+++ b/cmake/FindWebsocketpp.cmake -@@ -1,6 +1,6 @@ - include(FindPackageHandleStandardArgs) - --find_path(Websocketpp_INCLUDE_DIR websocketpp/version.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/websocketpp) -+find_path(Websocketpp_INCLUDE_DIR websocketpp/version.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/websocketpp NO_CMAKE_FIND_ROOT_PATH) - - find_package_handle_standard_args(Websocketpp DEFAULT_MSG Websocketpp_INCLUDE_DIR) - diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index 9c089fd578109e..f896e905f88890 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -1,18 +1,17 @@ # Template file for 'chatterino2' pkgname=chatterino2 -version=2.5.3 +version=2.5.5 revision=1 -_libcommuni_commit="2979eb96262756047a8dca47f2e509168138c0d0" -_serialize_commit="17946d65a41a72b447da37df6e314cded9650c32" -_settings_commit="c141a40d2d493646cd8f0b1e06251a828dfdfdd2" -_signals_commit="d06770649a7e83db780865d09c313a876bf0f4eb" -_sanitizers_cmake_commit="0573e2ea8651b9bb3083f193c41eb086497cc80a" +_libcommuni_commit="bb5417c451d764f57f2f1b3e1c9a81496b5521bd" +_serialize_commit="75bc7b9c1054f70d0dd0486f175dea93c7733cc3" +_settings_commit="16b3d5ba6e947e84df74e17a19121d6be8baf36b" +_signals_commit="ef0bd9978826bfb2df536c1312762bacbe0b45fa" +_sanitizers_cmake_commit="bcb1fc68616e9645ca5acea2992412606373ab04" _magic_enum_commit="e55b9b54d5cf61f8e117cafb17846d7d742dd3b4" -_miniaudio_commit="350784a9467a79d0fa65802132668e5afbcf3777" -_websocketpp_commit="f1736a8e72b910810ff6869fe20f647a62f3bc35" +_miniaudio_commit="347321b27c58d42567e905c715de60ad43a6cb8e" _certify_commit="a448a3915ddac716ce76e4b8cbf0e7f4153ed1e2" _sol2_commit="2b0d2fe8ba0074e16b499940c4f3126b9c7d3471" -_expected_lite_commit="54ca18bcea8e39c41650d82268077d559c695aa5" +_expected_lite_commit="df5814711f5f9111a2515a181bde67f22f2fe716" _lua_commit="1ab3208a1fceb12fca8f24ba57d6e13c5bff15e3" build_style=cmake configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON @@ -21,11 +20,11 @@ configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON -DCHATTERINO_UPDATER=OFF -DCHATTERINO_PLUGINS=ON -DSKIP_JSON_GENERATION=ON - " + -DCHATTERINO_SPELLCHECK=ON" hostmakedepends="qt6-declarative-host-tools doxygen pkg-config python3" makedepends="qt6-tools-devel qt6-svg-devel qtkeychain-qt6-devel qt6-qt5compat-devel boost-headers openssl-devel rapidjson - libnotify-devel" + libnotify-devel hunspell-devel" depends="qt6-imageformats" short_desc="Chat client for twitch.tv" maintainer="Orphaned " @@ -40,26 +39,23 @@ distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${versio https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz https://github.com/Neargye/magic_enum/archive/${_magic_enum_commit}.tar.gz https://github.com/mackron/miniaudio/archive/${_miniaudio_commit}.tar.gz - https://github.com/zaphoyd/websocketpp/archive/${_websocketpp_commit}.tar.gz https://github.com/Chatterino/certify/archive/${_certify_commit}.tar.gz https://github.com/ThePHD/sol2/archive/${_sol2_commit}.tar.gz https://github.com/martinmoene/expected-lite/archive/${_expected_lite_commit}.tar.gz https://github.com/lua/lua/archive/${_lua_commit}.tar.gz " -checksum="f2ea359ae8b0098e52239d88b419ed5e3c4d8b6ce8bd3eb8d2f64af5ff20088b - 6da5abb774f5f2474ef198ace5db45529ef88eb003fdef0be128fef212fd720b - d33129527018ea5dc46abf97009a4417c0e219c46e4db87d4dd4ce146ac45f63 - 1e326c558323fbfe80d21f1ff07086831ee4fc66579271bd2a4a6081bc0021ba - ee0291c3efafa71eb50d671c807f069737fec798706f11d2ba407fb296c3c0df - 8788e94b71e08a58442f8e73d9cf718cdd9eb21ffc3d8f7ee2e5fed7a10c2d32 +checksum="e5a8a6cf8f8f95039d8d2f5f94eb8c9e517df53b2b2386dd847f4b2120e30d1d + b5536c414394a18e6a6671c86d702477d0174e5b111b5abe86a20166275cd1af + 657b764ed5473adcd81bd684b514f1bb22e5ef337401e101cc5c316113d27f3b + c2dc4e9410011ae9930619e0a687618b19aa58679cdbff913f77de4aa7733ac3 + 503a5b4e0acf886c3c420ee628a20da0d897eea690ed74b69623bf8ef908d383 + 98f25152be7305263189e1167c7b65a79328b335d1cf4861f592318a36d031ae bdb15ee58b44988a493b514194ca7e770b7c69d8af0c93d4447bcfa5fc044e3a - 28ab6d0d39c32a46d57b52d104046e8b3637bfc51d8bab07ec5ae5415dc8ee52 - 4f5ab534268f4443b1916473af60edfce667db86a27bccc4c3287b8d59c12497 + 0df742e2126cc20221810d7f8a9c80fe5925374f8447ccc269a026928973bef8 cd9ea0390ec39b75b16ba9f59486d8d42501a3444a045fa2ace016e8eba8d6e1 cd840d6bfd004884aef27360c4f17e467c47a2bd8495d75a1a8e80d4ceeb58cd - 177a6185f46e6fe0b4de76b90dfc849a42163e91f0b53da7d0585a7838424042 - 252c3ed15d755ce72461689f1401f5c0c37fe53dd09b4b75597f2e3f9b98a785 - " + 9e43f3c1f4f7e38839ecfcbeaff4aa2e7bb58e890caf11d493417a5cd35e57eb + 252c3ed15d755ce72461689f1401f5c0c37fe53dd09b4b75597f2e3f9b98a785" skip_extraction=" ${_libcommuni_commit}.tar.gz ${_serialize_commit}.tar.gz @@ -68,7 +64,6 @@ skip_extraction=" ${_sanitizers_cmake_commit}.tar.gz ${_magic_enum_commit}.tar.gz ${_miniaudio_commit}.tar.gz - ${_websocketpp_commit}.tar.gz ${_certify_commit}.tar.gz ${_sol2_commit}.tar.gz ${_expected_lite_commit}.tar.gz @@ -82,7 +77,6 @@ post_extract() { vsrcextract -C lib/signals ${_signals_commit}.tar.gz vsrcextract -C lib/magic_enum ${_magic_enum_commit}.tar.gz vsrcextract -C lib/miniaudio ${_miniaudio_commit}.tar.gz - vsrcextract -C lib/websocketpp ${_websocketpp_commit}.tar.gz vsrcextract -C lib/certify ${_certify_commit}.tar.gz vsrcextract -C lib/sol2 ${_sol2_commit}.tar.gz vsrcextract -C lib/expected-lite ${_expected_lite_commit}.tar.gz