mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-28 16:32:57 +02:00
chatterino2: update to 2.3.4.
This commit is contained in:
tibequadorian
Echo
parent
0ff873217d
commit
cafd949df7
4 changed files with 92 additions and 99 deletions
13
srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
Normal file
13
srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
|
||||||
|
index 6ee45354..ece81f5c 100644
|
||||||
|
--- a/chatterino2/resources/com.chatterino.chatterino.desktop
|
||||||
|
+++ b/chatterino2/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,58 +0,0 @@
|
||||||
diff --git chatterino.pro chatterino.pro
|
|
||||||
index d8b14bbe..f7657f06 100644
|
|
||||||
--- a/chatterino.pro
|
|
||||||
+++ b/chatterino.pro
|
|
||||||
@@ -12,10 +12,17 @@
|
|
||||||
# - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
|
|
||||||
|
|
||||||
QT += widgets core gui network multimedia svg concurrent
|
|
||||||
-CONFIG += communi
|
|
||||||
-COMMUNI += core model util
|
|
||||||
|
|
||||||
INCLUDEPATH += src/
|
|
||||||
+# libcommuni
|
|
||||||
+INCLUDEPATH += /usr/include/qt5/Communi/IrcCore
|
|
||||||
+INCLUDEPATH += /usr/include/qt5/Communi/IrcModel
|
|
||||||
+INCLUDEPATH += /usr/include/qt5/Communi/IrcUtil
|
|
||||||
+DEFINES += IRC_SHARED
|
|
||||||
+LIBS += -lIrcCore -lIrcModel -lIrcUtil
|
|
||||||
+# qtkeychain
|
|
||||||
+INCLUDEPATH += /usr/include/qt5keychain
|
|
||||||
+LIBS += -lqt5keychain
|
|
||||||
TARGET = chatterino
|
|
||||||
TEMPLATE = app
|
|
||||||
PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
|
|
||||||
@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
|
|
||||||
include(lib/warnings.pri)
|
|
||||||
include(lib/fmt.pri)
|
|
||||||
include(lib/humanize.pri)
|
|
||||||
-include(lib/libcommuni.pri)
|
|
||||||
include(lib/websocketpp.pri)
|
|
||||||
include(lib/wintoast.pri)
|
|
||||||
include(lib/signals.pri)
|
|
||||||
@@ -86,7 +92,6 @@ include(lib/settings.pri)
|
|
||||||
include(lib/serialize.pri)
|
|
||||||
include(lib/winsdk.pri)
|
|
||||||
include(lib/rapidjson.pri)
|
|
||||||
-include(lib/qtkeychain.pri)
|
|
||||||
|
|
||||||
exists( $$OUT_PWD/conanbuildinfo.pri ) {
|
|
||||||
message("Using conan packages")
|
|
||||||
diff --git src/common/Credentials.cpp src/common/Credentials.cpp
|
|
||||||
index 87abecb9..5de78130 100644
|
|
||||||
--- a/src/common/Credentials.cpp
|
|
||||||
+++ b/src/common/Credentials.cpp
|
|
||||||
@@ -1,12 +1,12 @@
|
|
||||||
#include "Credentials.hpp"
|
|
||||||
|
|
||||||
#include "debug/AssertInGuiThread.hpp"
|
|
||||||
-#include "keychain.h"
|
|
||||||
#include "singletons/Paths.hpp"
|
|
||||||
#include "singletons/Settings.hpp"
|
|
||||||
#include "util/CombinePath.hpp"
|
|
||||||
#include "util/Overloaded.hpp"
|
|
||||||
|
|
||||||
+#include <qt5keychain/keychain.h>
|
|
||||||
#include <QSaveFile>
|
|
||||||
#include <boost/variant.hpp>
|
|
||||||
|
|
||||||
36
srcpkgs/chatterino2/patches/cmake.patch
Normal file
36
srcpkgs/chatterino2/patches/cmake.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
|
||||||
|
index 82905436..b0b89a4e 100644
|
||||||
|
--- a/chatterino2/cmake/FindLRUCache.cmake
|
||||||
|
+++ b/chatterino2/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/chatterino2/cmake/FindPajladaSerialize.cmake
|
||||||
|
+++ b/chatterino2/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/chatterino2/cmake/FindPajladaSignals.cmake
|
||||||
|
+++ b/chatterino2/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,55 +1,57 @@
|
||||||
# Template file for 'chatterino2'
|
# Template file for 'chatterino2'
|
||||||
pkgname=chatterino2
|
pkgname=chatterino2
|
||||||
version=2.2.2
|
version=2.3.4
|
||||||
revision=2
|
revision=1
|
||||||
_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
|
_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
|
||||||
_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
|
_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
|
||||||
_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
|
_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
|
||||||
_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
|
_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
|
||||||
build_style=qmake
|
_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
|
||||||
configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
|
_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
|
||||||
INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
|
create_wrksrc=yes
|
||||||
INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
|
build_wrksrc="chatterino2"
|
||||||
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
|
build_style=cmake
|
||||||
makedepends="qt5-svg-devel qt5-multimedia-devel
|
hostmakedepends="qt5-qmake qt5-host-tools"
|
||||||
boost-devel rapidjson libcommuni-devel websocketpp
|
makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
|
||||||
qtkeychain-qt5-devel"
|
boost-devel openssl-devel rapidjson websocketpp"
|
||||||
short_desc="Qt-based twitch chat client"
|
depends="qt5-imageformats qt5-svg"
|
||||||
maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
|
short_desc="Chat client for twitch.tv"
|
||||||
license="MIT"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
|
license=MIT
|
||||||
homepage="https://chatterino.com"
|
homepage="https://chatterino.com"
|
||||||
changelog="https://chatterino.com/changelog"
|
changelog="https://chatterino.com/changelog"
|
||||||
distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
|
distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
|
||||||
https://github.com/pajlada/signals/archive/${_signals_commit}.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/settings/archive/${_settings_commit}.tar.gz
|
||||||
https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
|
https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
|
||||||
https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
|
https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
|
||||||
checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
|
https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
|
||||||
e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
|
checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
|
||||||
f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
|
ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
|
||||||
5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
|
d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
|
||||||
eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
|
0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
|
||||||
|
7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
|
||||||
|
4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
|
||||||
|
f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
||||||
makedepends+=" libatomic-devel"
|
makedepends+=" libatomic-devel"
|
||||||
configure_args+=" LIBS+=-latomic"
|
LIBS="-latomic"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
post_extract() {
|
post_extract() {
|
||||||
rmdir lib/signals
|
mv "chatterino2-${version}" "${build_wrksrc}"
|
||||||
rmdir lib/settings
|
rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
|
||||||
rmdir lib/humanize
|
${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
|
||||||
rmdir lib/serialize
|
${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \
|
||||||
mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
|
${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
|
||||||
mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
|
mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
|
||||||
mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
|
mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
|
||||||
mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
|
mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
|
||||||
}
|
mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
|
||||||
|
mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
|
||||||
pre_configure() {
|
mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
|
||||||
# it wraps libcommuni in a namespace but void's binaries don't
|
|
||||||
find \( -name '*.cpp' -o -name '*.hpp' \) \
|
|
||||||
-exec sed -i "{}" -e 's/Communi::/::/g' \;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue