diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch deleted file mode 100644 index 1b0a6d6140e..00000000000 --- a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop -index 6ee45354..ece81f5c 100644 ---- a/resources/com.chatterino.chatterino.desktop -+++ b/resources/com.chatterino.chatterino.desktop -@@ -4,7 +4,7 @@ Version=1.0 - Name=Chatterino - Comment=Chat client for Twitch - Exec=chatterino --Icon=chatterino -+Icon=com.chatterino.chatterino - Terminal=false - Categories=Network;InstantMessaging; - StartupWMClass=chatterino diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch index 8a564356695..89c11a30950 100644 --- a/srcpkgs/chatterino2/patches/cmake.patch +++ b/srcpkgs/chatterino2/patches/cmake.patch @@ -1,3 +1,15 @@ +diff --git a/cmake/FindBoostCertify.cmake b/cmake/FindBoostCertify.cmake +index 7dc04c3a..5f538248 100644 +--- a/cmake/FindBoostCertify.cmake ++++ b/cmake/FindBoostCertify.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-find_path(BoostCertify_INCLUDE_DIR boost/certify/https_verification.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/certify/include) ++find_path(BoostCertify_INCLUDE_DIR boost/certify/https_verification.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/certify/include NO_CMAKE_FIND_ROOT_PATH) + + find_package_handle_standard_args(BoostCertify DEFAULT_MSG BoostCertify_INCLUDE_DIR) + diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake index 82905436..b0b89a4e 100644 --- a/cmake/FindLRUCache.cmake @@ -10,6 +22,18 @@ index 82905436..b0b89a4e 100644 find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR) +diff --git a/cmake/FindMagicEnum.cmake b/cmake/FindMagicEnum.cmake +index b595075c..9c4e0f03 100644 +--- a/cmake/FindMagicEnum.cmake ++++ b/cmake/FindMagicEnum.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-find_path(MagicEnum_INCLUDE_DIR magic_enum/magic_enum.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/magic_enum/include) ++find_path(MagicEnum_INCLUDE_DIR magic_enum/magic_enum.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/magic_enum/include NO_CMAKE_FIND_ROOT_PATH) + + 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 @@ -34,3 +58,27 @@ index f4c964ec..75efba20 100644 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 +--- a/cmake/FindSol2.cmake ++++ b/cmake/FindSol2.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-find_path(Sol2_INCLUDE_DIR sol/sol.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/sol2/include) ++find_path(Sol2_INCLUDE_DIR sol/sol.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/sol2/include NO_CMAKE_FIND_ROOT_PATH) + + 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 33778d556fa..096ad9f19f9 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -1,18 +1,31 @@ # Template file for 'chatterino2' pkgname=chatterino2 -version=2.3.5 -revision=2 -_libcommuni_commit="a7b32cd6fa0640721b6114b31d37d79ebf832411" -_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469" -_settings_commit="04792d853c7f83c9d7ab4df00279442a658d3be3" -_signals_commit="25e4ec3b8d6ea94a5e65a26e7cfcbbce3b87c5d6" -_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b" +version=2.5.3 +revision=1 +_libcommuni_commit="2979eb96262756047a8dca47f2e509168138c0d0" +_serialize_commit="17946d65a41a72b447da37df6e314cded9650c32" +_settings_commit="c141a40d2d493646cd8f0b1e06251a828dfdfdd2" +_signals_commit="d06770649a7e83db780865d09c313a876bf0f4eb" +_sanitizers_cmake_commit="0573e2ea8651b9bb3083f193c41eb086497cc80a" +_magic_enum_commit="e55b9b54d5cf61f8e117cafb17846d7d742dd3b4" +_miniaudio_commit="350784a9467a79d0fa65802132668e5afbcf3777" +_websocketpp_commit="f1736a8e72b910810ff6869fe20f647a62f3bc35" +_certify_commit="a448a3915ddac716ce76e4b8cbf0e7f4153ed1e2" +_sol2_commit="2b0d2fe8ba0074e16b499940c4f3126b9c7d3471" +_expected_lite_commit="54ca18bcea8e39c41650d82268077d559c695aa5" +_lua_commit="1ab3208a1fceb12fca8f24ba57d6e13c5bff15e3" build_style=cmake -configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON" -hostmakedepends="qt5-qmake qt5-host-tools" -makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel - qtkeychain-qt5-devel boost-devel openssl-devel rapidjson websocketpp" -depends="qt5-imageformats qt5-svg" +configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON + -DCHATTERINO_LTO=ON + -DBUILD_WITH_QT6=ON + -DCHATTERINO_UPDATER=OFF + -DCHATTERINO_PLUGINS=ON + " +hostmakedepends="qt6-declarative-host-tools doxygen pkg-config python3" +makedepends="qt6-tools-devel qt6-svg-devel qtkeychain-qt6-devel + qt6-qt5compat-devel boost-devel openssl-devel rapidjson + libnotify-devel" +depends="qt6-imageformats" short_desc="Chat client for twitch.tv" maintainer="Orphaned " license=MIT @@ -23,19 +36,42 @@ distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${versio https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz - https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz" -checksum="f1fff3523f5a3f633430d44f7ca6c6c718a515258d50004a855e69e4aa989b4e - d6fd560851357d1e52f93604314215c75b291104e054c84a16c34d7d83d40f14 - d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63 - 702e97d8f2fcaec65256e6f691c3ed055924430ce64b29ebe74f3769a9d50d71 - ae098841b0f33079366eff8bc44fe3f2f2f65e70259c1cc9ff8d727c4edf974c - f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341" + 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 + bdb15ee58b44988a493b514194ca7e770b7c69d8af0c93d4447bcfa5fc044e3a + 28ab6d0d39c32a46d57b52d104046e8b3637bfc51d8bab07ec5ae5415dc8ee52 + 4f5ab534268f4443b1916473af60edfce667db86a27bccc4c3287b8d59c12497 + cd9ea0390ec39b75b16ba9f59486d8d42501a3444a045fa2ace016e8eba8d6e1 + cd840d6bfd004884aef27360c4f17e467c47a2bd8495d75a1a8e80d4ceeb58cd + 177a6185f46e6fe0b4de76b90dfc849a42163e91f0b53da7d0585a7838424042 + 252c3ed15d755ce72461689f1401f5c0c37fe53dd09b4b75597f2e3f9b98a785 + " skip_extraction=" ${_libcommuni_commit}.tar.gz ${_serialize_commit}.tar.gz ${_settings_commit}.tar.gz ${_signals_commit}.tar.gz ${_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 + ${_lua_commit}.tar.gz " post_extract() { @@ -43,6 +79,13 @@ post_extract() { vsrcextract -C lib/serialize ${_serialize_commit}.tar.gz vsrcextract -C lib/settings ${_settings_commit}.tar.gz 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 + vsrcextract -C lib/lua/src ${_lua_commit}.tar.gz vsrcextract -C cmake/sanitizers-cmake ${_sanitizers_cmake_commit}.tar.gz }