From 3a664d74160f49dd4f96cce35acc5320a481a7eb Mon Sep 17 00:00:00 2001
From: Artem Kobets <artem@akobets.xyz>
Date: Sat, 18 Jan 2020 20:18:19 +0200
Subject: [PATCH] chatterino2: update to 2.1.7

---
 .../patches/0001-use-system-communi.patch     | 16 +++++------
 srcpkgs/chatterino2/patches/0002-qt5.14.patch | 24 -----------------
 srcpkgs/chatterino2/template                  | 27 +++++++++++--------
 3 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/chatterino2/patches/0002-qt5.14.patch

diff --git a/srcpkgs/chatterino2/patches/0001-use-system-communi.patch b/srcpkgs/chatterino2/patches/0001-use-system-communi.patch
index 3b315b565fe..0c14d35e5cd 100644
--- a/srcpkgs/chatterino2/patches/0001-use-system-communi.patch
+++ b/srcpkgs/chatterino2/patches/0001-use-system-communi.patch
@@ -1,12 +1,14 @@
 diff --git chatterino.pro chatterino.pro
-index a6c29eeb..6cff9d74 100644
+index 79d36ab6..82e6dbfe 100644
 --- chatterino.pro
 +++ chatterino.pro
-@@ -1,8 +1,11 @@
+@@ -9,10 +9,13 @@
+ #  - 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/
 +INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
 +INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
@@ -16,15 +18,9 @@ index a6c29eeb..6cff9d74 100644
  TARGET             = chatterino
  TEMPLATE           = app
  PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -40,13 +43,11 @@ macx {
- }
- 
+@@ -74,7 +77,6 @@ CONFIG(debug, debug|release) {
  # 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)
diff --git a/srcpkgs/chatterino2/patches/0002-qt5.14.patch b/srcpkgs/chatterino2/patches/0002-qt5.14.patch
deleted file mode 100644
index 16d69527b08..00000000000
--- a/srcpkgs/chatterino2/patches/0002-qt5.14.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 3377e99acb7..f5deb78b34e 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,16 +1,18 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.1.4
+version=2.1.7
 revision=1
 _signals_commit=1c38746b05d9311e73c8c8acdfdc4d36c9c551be
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
+_settings_commit=4fe0ff9b0cb7b04f8017a63b38c40104430a4b66
+_humanize_commit=13867379249c64cd44b9cd4c03f18c1a52d56587
+_serialize_commit=86bfa5a14c64aaf1f04a626bbd52a481cf55074a
+_qtkeychain_commit=832f550da3f6655168a737d2e1b7df37272e936d
 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
+ libsecret-devel"
 short_desc="Qt-based twitch chat client"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
 license="MIT"
@@ -19,12 +21,14 @@ distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/pajlada/signals/archive/${_signals_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/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="7f61b6c36ac9fb0a73cd028f317108ec2f29877afa472842b811386c19c5c7ec
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz"
+checksum="c017005d1098af9bddafaef013e8d1120cb805101125b3a20df2bd7dd413ccce
 19df585d2242b9b90c6f94cb58aa5e64bf9166c7c2178724d9648bfefd9b8332
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+5007b7da4bda1c1c58ad1800c641d9b7bfb9b2d696027220c5e28ced58eb6bf8
+196ebfe37e6cdf61eaa1650b570cd50fcf6d8fc4c0aa408ff540b017d71ec634
+2945e445ecaa183c8678f0c1c33cd0b6957ef2ac9218ac630cced31c147c0b11
+1b42796adde88dddaeac0a1398a2814d82032de5fe8eb7696f1eb99768986400"
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv[56]*|ppc|ppc-musl)
@@ -38,6 +42,7 @@ post_extract() {
 	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/"* lib/settings/
 	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/"* lib/humanize/
 	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/"* lib/serialize/
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}/"* lib/qtkeychain/
 }
 
 pre_configure() {