mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-22 17:17:03 +02:00
Merge 0600b5d6f0
into 81124a8acd
This commit is contained in:
commit
9ce00560d6
3 changed files with 11 additions and 89 deletions
|
@ -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
|
|
@ -1,36 +0,0 @@
|
|||
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)
|
||||
|
|
@ -1,49 +1,20 @@
|
|||
# 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
|
||||
archs="x86_64"
|
||||
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 -DCMAKE_BUILD_TYPE=Release -DUSE_PRECOMPILED_HEADERS=OFF -DCHATTERINO_UPDATER=OFF -DSKIP_JSON_GENERATION=ON"
|
||||
hostmakedepends="git"
|
||||
makedepends="qt6-base-devel qt6-core qt6-tools-devel boost-devel openssl-devel qt6-imageformats qtkeychain-qt6-devel qt6-qt5compat-devel qt6-svg-devel libnotify-devel pkg-config"
|
||||
depends="qt6-imageformats qt6-svg qt6-base qt6-core qt6-tools boost openssl qt6-imageformats qtkeychain-qt6 qt6-qt5compat qt6-svg libnotify qt6-plugin-tls-openssl"
|
||||
short_desc="Chat client for twitch.tv"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
maintainer="konskara <konskara41@ee.duth.gr>"
|
||||
license=MIT
|
||||
homepage="https://chatterino.com"
|
||||
changelog="https://chatterino.com/changelog"
|
||||
distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
|
||||
https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
|
||||
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"
|
||||
skip_extraction="
|
||||
${_libcommuni_commit}.tar.gz
|
||||
${_serialize_commit}.tar.gz
|
||||
${_settings_commit}.tar.gz
|
||||
${_signals_commit}.tar.gz
|
||||
${_sanitizers_cmake_commit}.tar.gz
|
||||
"
|
||||
homepage="https://github.com/Chatterino/chatterino2"
|
||||
|
||||
post_extract() {
|
||||
vsrcextract -C lib/libcommuni ${_libcommuni_commit}.tar.gz
|
||||
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 cmake/sanitizers-cmake ${_sanitizers_cmake_commit}.tar.gz
|
||||
do_fetch() {
|
||||
git clone --recurse-submodules --branch v${version} https://github.com/Chatterino/chatterino2.git "$wrksrc"
|
||||
}
|
||||
|
||||
post_install() {
|
||||
|
|
Loading…
Add table
Reference in a new issue