From 636b2f4a3498f407c83367b87d72ec1446804e74 Mon Sep 17 00:00:00 2001
From: "Franc[e]sco" <lolisamurai@tfwno.gf>
Date: Wed, 20 Nov 2019 04:44:37 +0100
Subject: [PATCH] chatterino2: update to 2.1.4

---
 .../patches/0001-use-system-communi.patch     | 55 ++++++++++---------
 srcpkgs/chatterino2/template                  | 22 +++++---
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/chatterino2/patches/0001-use-system-communi.patch b/srcpkgs/chatterino2/patches/0001-use-system-communi.patch
index 05a95fde344..3b315b565fe 100644
--- a/srcpkgs/chatterino2/patches/0001-use-system-communi.patch
+++ b/srcpkgs/chatterino2/patches/0001-use-system-communi.patch
@@ -1,29 +1,32 @@
 diff --git chatterino.pro chatterino.pro
-index 38168d72..9f760304 100644
+index a6c29eeb..6cff9d74 100644
 --- chatterino.pro
 +++ chatterino.pro
-@@ -7,10 +7,13 @@
- message(----)
- 
- QT                += widgets core gui network multimedia svg
--CONFIG            += communi
--COMMUNI           += core model util
- CONFIG            += c++14
- 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
- DEFINES           += QT_DEPRECATED_WARNINGS
-@@ -37,8 +40,6 @@ include(dependencies/settings.pri)
- include(dependencies/signals.pri)
- include(dependencies/humanize.pri)
- include(dependencies/fmt.pri)
--DEFINES += IRC_NAMESPACE=Communi
--include(dependencies/libcommuni.pri)
- include(dependencies/websocketpp.pri)
- include(dependencies/openssl.pri)
- include(dependencies/boost.pri)
+@@ -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)
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index d513cc34438..3377e99acb7 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,10 +1,11 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.0.4
-revision=2
-_signals_commit=3f6645c615ff7bf412c05fe322e589cbdd34ff9b
-_settings_commit=ad31b38866d80a17ced902476ed06da69edce3a0
+version=2.1.4
+revision=1
+_signals_commit=1c38746b05d9311e73c8c8acdfdc4d36c9c551be
+_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
+_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
  libcommuni-devel"
@@ -17,11 +18,13 @@ homepage="https://github.com/fourtf/chatterino2"
 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"
-checksum="dd05748a0d7ec8c4e6d1e10ef0da42682dc97fce8dc52b17a276c0bc097e5adf
-e0fca1d0998fad8dbc213d235dd07b3e343f8ebbd0b0af6d15de1bf45dd56aa4
-addb1ec2e06c40e6b467b4bdcdbca0407098fe36009c62ac7e92f157d47b2cb5
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0"
+ https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
+checksum="7f61b6c36ac9fb0a73cd028f317108ec2f29877afa472842b811386c19c5c7ec
+19df585d2242b9b90c6f94cb58aa5e64bf9166c7c2178724d9648bfefd9b8332
+f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
+5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
+eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv[56]*|ppc|ppc-musl)
@@ -34,6 +37,7 @@ post_extract() {
 	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/"* lib/signals/
 	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/"* lib/settings/
 	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/"* lib/humanize/
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/"* lib/serialize/
 }
 
 pre_configure() {