From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] chatterino2: update to 2.1.7
Date: Sun, 19 Jan 2020 09:48:53 +0100 [thread overview]
Message-ID: <20200119084853.SHtHZ6Qlzt6JflMD9dTz_M4RNOph7-PhRJxOVsS3QwU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18371@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
There is an updated pull request by artemkobets against master on the void-packages repository
https://github.com/artemkobets/void-packages master
https://github.com/void-linux/void-packages/pull/18371
chatterino2: update to 2.1.7
A patch file from https://github.com/void-linux/void-packages/pull/18371.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-18371.patch --]
[-- Type: text/x-diff, Size: 7131 bytes --]
From a558e49a919f13cd294dac376d650558bbc84260 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 | 32 ----------
.../patches/0001-use-system-deps.patch | 58 +++++++++++++++++++
srcpkgs/chatterino2/patches/0002-qt5.14.patch | 24 --------
srcpkgs/chatterino2/template | 21 +++----
4 files changed, 69 insertions(+), 66 deletions(-)
delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-communi.patch
create mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
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
deleted file mode 100644
index 3b315b565fe..00000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-communi.patch
+++ /dev/null
@@ -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)
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
new file mode 100644
index 00000000000..5f7ddfadb17
--- /dev/null
+++ b/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>
+
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..d76e66d41e1 100644
--- a/srcpkgs/chatterino2/template
+++ b/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
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
+_settings_commit=4fe0ff9b0cb7b04f8017a63b38c40104430a4b66
+_humanize_commit=13867379249c64cd44b9cd4c03f18c1a52d56587
+_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
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+5007b7da4bda1c1c58ad1800c641d9b7bfb9b2d696027220c5e28ced58eb6bf8
+196ebfe37e6cdf61eaa1650b570cd50fcf6d8fc4c0aa408ff540b017d71ec634
+2945e445ecaa183c8678f0c1c33cd0b6957ef2ac9218ac630cced31c147c0b11"
case "${XBPS_TARGET_MACHINE}" in
armv[56]*|ppc|ppc-musl)
next prev parent reply other threads:[~2020-01-19 8:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-18 18:23 [PR PATCH] " voidlinux-github
2020-01-18 18:25 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-18 18:33 ` voidlinux-github
2020-01-18 19:40 ` [PR PATCH] [Closed]: " voidlinux-github
2020-01-19 8:48 ` voidlinux-github
2020-01-19 8:48 ` voidlinux-github [this message]
2020-01-19 9:27 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200119084853.SHtHZ6Qlzt6JflMD9dTz_M4RNOph7-PhRJxOVsS3QwU@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).