chatterino2: update to 2.1.7

srcpkgs/chatterino2/patches/0001-use-system-communi.patch

@@ -1,32 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index a6c29eeb..6cff9d74 100644
---- chatterino.pro
-+++ chatterino.pro
-@@ -1,8 +1,11 @@
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
- 
- INCLUDEPATH       += src/
-+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
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -40,13 +43,11 @@ macx {
- }
- 
- # Submodules
--DEFINES += IRC_NAMESPACE=Communi
- 
- include(lib/warnings.pri)
- include(lib/appbase.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)

srcpkgs/chatterino2/patches/0001-use-system-deps.patch

@@ -0,0 +1,58 @@
+diff --git chatterino.pro chatterino.pro
+index d8b14bbe..f7657f06 100644
+--- chatterino.pro
++++ 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
+--- src/common/Credentials.cpp
++++ 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>
+ 

srcpkgs/chatterino2/patches/0002-qt5.14.patch

@@ -1,24 +0,0 @@
-From 033c97e85dbaeda687253dc5b9e3008fd50f057a Mon Sep 17 00:00:00 2001
-From: fourtf <tf.four@gmail.com>
-Date: Thu, 3 Oct 2019 10:07:14 +0200
-Subject: [PATCH] disabled hash<QString> for Qt 5.14
-
----
- src/util/QStringHash.hpp | 2 ++
- 1 file changed, 2 insertions(+)
-
---- src/util/QStringHash.hpp	2018-06-25 12:52:07.000000000 +0200
-+++ src/util/QStringHash.hpp	2019-11-16 14:08:54.342448158 +0100
-@@ -3,6 +3,7 @@
- #include <QHash>
- #include <QString>
- 
-+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- namespace std {
- template <>
- struct hash<QString> {
-@@ -12,3 +13,4 @@
-     }
- };
- }  // namespace std
-+#endif

srcpkgs/chatterino2/template

@@ -1,16 +1,17 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.1.4
+version=2.1.7
 revision=1
 _signals_commit=1c38746b05d9311e73c8c8acdfdc4d36c9c551be
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
+_settings_commit=4fe0ff9b0cb7b04f8017a63b38c40104430a4b66
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
+_humanize_commit=13867379249c64cd44b9cd4c03f18c1a52d56587
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
+_serialize_commit=86bfa5a14c64aaf1f04a626bbd52a481cf55074a
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
- libcommuni-devel"
+ libcommuni-devel pkg-config"
 makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp"
+ boost-devel rapidjson libcommuni-devel websocketpp
+ qtkeychain-qt5-devel libsecret-devel"
 short_desc="Qt-based twitch chat client"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
 license="MIT"
@@ -20,11 +21,11 @@ distfiles="${homepage}/archive/v${version}.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/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="7f61b6c36ac9fb0a73cd028f317108ec2f29877afa472842b811386c19c5c7ec
+checksum="c017005d1098af9bddafaef013e8d1120cb805101125b3a20df2bd7dd413ccce
 19df585d2242b9b90c6f94cb58aa5e64bf9166c7c2178724d9648bfefd9b8332
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
+5007b7da4bda1c1c58ad1800c641d9b7bfb9b2d696027220c5e28ced58eb6bf8
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
+196ebfe37e6cdf61eaa1650b570cd50fcf6d8fc4c0aa408ff540b017d71ec634
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+2945e445ecaa183c8678f0c1c33cd0b6957ef2ac9218ac630cced31c147c0b11"
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv[56]*|ppc|ppc-musl)