Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] chatterino2: update to 2.3.3.
@ 2021-07-25 20:31 33kk
  2021-07-26  3:01 ` ericonr
                   ` (33 more replies)
  0 siblings, 34 replies; 35+ messages in thread
From: 33kk @ 2021-07-25 20:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]

There is a new pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8036 bytes --]

From 90ff11f695aa1e2a24128baa949ab0c3c1857b24 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.3.

---
 .../patches/0001-use-system-deps.patch        | 58 ------------
 srcpkgs/chatterino2/template                  | 93 ++++++++++---------
 2 files changed, 47 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..85bb65102142 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,56 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
-homepage="https://chatterino.com"
+version=2.3.3
+revision=1
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
+homepage="https://chatterino.com/"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/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="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+build_style=cmake
 
-post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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/
-}
+depends="qt5-imageformats qt5-svg"
+hostmakedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel boost-devel openssl-devel rapidjson websocketpp"
+
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="ef8daa14946b8e19f536200e28db2b25e8311ba5"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 
-pre_configure() {
-	# 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' \;
+distfiles=https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz"
+https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/signals/archive/${_signals_commit}.tar.gz
+https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="83d6b39b530ea9fb34a5c6bdbad84610da17a827f3526de3175f9baa6173f64c
+992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+3cb0854e69a43fc8f645e0e65d870ec5c63eba4e4b299ecb90e2202b1eebf47d
+6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
+
+post_extract() {
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize lib/settings lib/signals lib/rapidjson lib/websocketpp lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
@ 2021-07-26  3:01 ` ericonr
  2021-07-26 17:22 ` 33kk
                   ` (32 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-07-26  3:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-886334098

Comment:
Have you considered asking upstream for prepared tarballs with all the subrepos already inside? :)

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
  2021-07-26  3:01 ` ericonr
@ 2021-07-26 17:22 ` 33kk
  2021-07-26 19:33 ` [PR REVIEW] " ericonr
                   ` (31 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-07-26 17:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-886887243

Comment:
Not sure if that would work, since I'm not downloading some of the submodules

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
  2021-07-26  3:01 ` ericonr
  2021-07-26 17:22 ` 33kk
@ 2021-07-26 19:33 ` ericonr
  2021-07-26 20:40 ` [PR PATCH] [Updated] " 33kk
                   ` (30 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-07-26 19:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r676886355

Comment:
Break at ~80 columns.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (2 preceding siblings ...)
  2021-07-26 19:33 ` [PR REVIEW] " ericonr
@ 2021-07-26 20:40 ` 33kk
  2021-07-26 20:42 ` 33kk
                   ` (29 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-07-26 20:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8056 bytes --]

From c706c979d7fea8b2807aa83dd17ef196238b7db0 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.3.

---
 .../patches/0001-use-system-deps.patch        | 58 -----------
 srcpkgs/chatterino2/template                  | 95 ++++++++++---------
 2 files changed, 49 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..4b1a93a5db0e 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,58 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
-homepage="https://chatterino.com"
+version=2.3.3
+revision=1
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
+homepage="https://chatterino.com/"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/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="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+build_style=cmake
 
-post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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/
-}
+depends="qt5-imageformats qt5-svg"
+hostmakedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel boost-devel openssl-devel rapidjson websocketpp"
+
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="ef8daa14946b8e19f536200e28db2b25e8311ba5"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 
-pre_configure() {
-	# 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' \;
+distfiles=https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz"
+https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/signals/archive/${_signals_commit}.tar.gz
+https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="83d6b39b530ea9fb34a5c6bdbad84610da17a827f3526de3175f9baa6173f64c
+992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+3cb0854e69a43fc8f645e0e65d870ec5c63eba4e4b299ecb90e2202b1eebf47d
+6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
+
+post_extract() {
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (3 preceding siblings ...)
  2021-07-26 20:40 ` [PR PATCH] [Updated] " 33kk
@ 2021-07-26 20:42 ` 33kk
  2021-07-26 20:57 ` [PR PATCH] [Updated] " 33kk
                   ` (28 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-07-26 20:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-887012599

Comment:
I found it to be more readable this way

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (4 preceding siblings ...)
  2021-07-26 20:42 ` 33kk
@ 2021-07-26 20:57 ` 33kk
  2021-07-31  2:20 ` [PR REVIEW] " ericonr
                   ` (27 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-07-26 20:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8056 bytes --]

From eaeba2ea38ff008f09ced8b2f23e7abe8141d3fd Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.3.

---
 .../patches/0001-use-system-deps.patch        | 58 -----------
 srcpkgs/chatterino2/template                  | 95 ++++++++++---------
 2 files changed, 49 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..f236cbb6ba0c 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,58 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
-homepage="https://chatterino.com"
+version=2.3.3
+revision=1
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
+homepage="https://chatterino.com/"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/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="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+build_style=cmake
 
-post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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/
-}
+depends="qt5-imageformats qt5-svg"
+hostmakedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel boost-devel openssl-devel rapidjson websocketpp"
+
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="ef8daa14946b8e19f536200e28db2b25e8311ba5"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 
-pre_configure() {
-	# 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' \;
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/signals/archive/${_signals_commit}.tar.gz
+https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="83d6b39b530ea9fb34a5c6bdbad84610da17a827f3526de3175f9baa6173f64c
+992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+3cb0854e69a43fc8f645e0e65d870ec5c63eba4e4b299ecb90e2202b1eebf47d
+6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
+
+post_extract() {
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (5 preceding siblings ...)
  2021-07-26 20:57 ` [PR PATCH] [Updated] " 33kk
@ 2021-07-31  2:20 ` ericonr
  2021-07-31  2:20 ` ericonr
                   ` (26 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-07-31  2:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r680291555

Comment:
Please still break at ~80 columns.

Where did `makedepends` go?

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (6 preceding siblings ...)
  2021-07-31  2:20 ` [PR REVIEW] " ericonr
@ 2021-07-31  2:20 ` ericonr
  2021-07-31 15:04 ` [PR REVIEW] " 33kk
                   ` (25 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-07-31  2:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-890278135

Comment:
> I found it to be more readable this way

Right, but the main style in void to bundle all the commits on top instead of right before `distfiles`.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (7 preceding siblings ...)
  2021-07-31  2:20 ` ericonr
@ 2021-07-31 15:04 ` 33kk
  2021-08-01  0:57 ` ericonr
                   ` (24 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-07-31 15:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New review comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r680369882

Comment:
Not sure what's the difference between makedepends and hostmakedepends, didn't figure that out after reading the manual. It builds so ¯\\\_(ツ)\_/¯ 

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (8 preceding siblings ...)
  2021-07-31 15:04 ` [PR REVIEW] " 33kk
@ 2021-08-01  0:57 ` ericonr
  2021-08-01  2:43 ` [PR PATCH] [Updated] " 33kk
                   ` (23 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-08-01  0:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r680429865

Comment:
hostmakedepends is for things the build needs to run, makedepends is for things like headers and libraries to link against.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (9 preceding siblings ...)
  2021-08-01  0:57 ` ericonr
@ 2021-08-01  2:43 ` 33kk
  2021-08-01  3:38 ` 33kk
                   ` (22 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-01  2:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8950 bytes --]

From f534a52552c6b713d6817d3a55a1e7b3a1b4d6b2 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.3.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -----------
 srcpkgs/chatterino2/template                  | 95 ++++++++++---------
 3 files changed, 63 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/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
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..90389b6b5114 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,60 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.3
+revision=1
+build_style=cmake
+
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="ef8daa14946b8e19f536200e28db2b25e8311ba5"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+
+hostmakedepends="qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/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="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="83d6b39b530ea9fb34a5c6bdbad84610da17a827f3526de3175f9baa6173f64c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ 3cb0854e69a43fc8f645e0e65d870ec5c63eba4e4b299ecb90e2202b1eebf47d
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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() {
-	# 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' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (10 preceding siblings ...)
  2021-08-01  2:43 ` [PR PATCH] [Updated] " 33kk
@ 2021-08-01  3:38 ` 33kk
  2021-08-03  3:43 ` [PR REVIEW] " ericonr
                   ` (21 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-01  3:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8952 bytes --]

From 05fc68af25bb3941d6092bdb395979a616d48d6f Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.3.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -----------
 srcpkgs/chatterino2/template                  | 96 ++++++++++---------
 3 files changed, 64 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/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
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..38fd0d36101e 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,61 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.3
+revision=1
+
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="ef8daa14946b8e19f536200e28db2b25e8311ba5"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+
+build_style=cmake
+
+hostmakedepends="qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/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="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="83d6b39b530ea9fb34a5c6bdbad84610da17a827f3526de3175f9baa6173f64c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ 3cb0854e69a43fc8f645e0e65d870ec5c63eba4e4b299ecb90e2202b1eebf47d
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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() {
-	# 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' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (11 preceding siblings ...)
  2021-08-01  3:38 ` 33kk
@ 2021-08-03  3:43 ` ericonr
  2021-08-03  3:43 ` ericonr
                   ` (20 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-08-03  3:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r681411168

Comment:
Definitely this one, at least.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (12 preceding siblings ...)
  2021-08-03  3:43 ` [PR REVIEW] " ericonr
@ 2021-08-03  3:43 ` ericonr
  2021-08-03  3:43 ` ericonr
                   ` (19 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-08-03  3:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r681411198

Comment:
And this one.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (13 preceding siblings ...)
  2021-08-03  3:43 ` ericonr
@ 2021-08-03  3:43 ` ericonr
  2021-08-03  8:19 ` [PR PATCH] [Updated] " 33kk
                   ` (18 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-08-03  3:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r681411092

Comment:
Please consider removing the new lines here :p

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (14 preceding siblings ...)
  2021-08-03  3:43 ` ericonr
@ 2021-08-03  8:19 ` 33kk
  2021-08-03  8:21 ` 33kk
                   ` (17 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-03  8:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8952 bytes --]

From 4dfa6486d3bacd166aea7a72e1701f992929bcf6 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.3.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -----------
 srcpkgs/chatterino2/template                  | 96 ++++++++++---------
 3 files changed, 64 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/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
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..38fd0d36101e 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,61 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.3
+revision=1
+
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="ef8daa14946b8e19f536200e28db2b25e8311ba5"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+
+build_style=cmake
+
+hostmakedepends="qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/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="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="83d6b39b530ea9fb34a5c6bdbad84610da17a827f3526de3175f9baa6173f64c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ 3cb0854e69a43fc8f645e0e65d870ec5c63eba4e4b299ecb90e2202b1eebf47d
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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() {
-	# 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' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (15 preceding siblings ...)
  2021-08-03  8:19 ` [PR PATCH] [Updated] " 33kk
@ 2021-08-03  8:21 ` 33kk
  2021-08-03  8:25 ` 33kk
                   ` (16 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-03  8:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8872 bytes --]

From 242a873219a8a1ad5b72555be0e39f94841c16a1 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.3.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 ------------
 srcpkgs/chatterino2/template                  | 91 ++++++++++---------
 3 files changed, 59 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/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
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..9f037369efdb 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,56 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.3
+revision=1
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="ef8daa14946b8e19f536200e28db2b25e8311ba5"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="83d6b39b530ea9fb34a5c6bdbad84610da17a827f3526de3175f9baa6173f64c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ 3cb0854e69a43fc8f645e0e65d870ec5c63eba4e4b299ecb90e2202b1eebf47d
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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() {
-	# 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' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (16 preceding siblings ...)
  2021-08-03  8:21 ` 33kk
@ 2021-08-03  8:25 ` 33kk
  2021-08-03 12:07 ` Francesco149
                   ` (15 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-03  8:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-891644658

Comment:
Hopefully didn't mess anything up this time 🥴

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (17 preceding siblings ...)
  2021-08-03  8:25 ` 33kk
@ 2021-08-03 12:07 ` Francesco149
  2021-08-03 14:13 ` [PR REVIEW] " ericonr
                   ` (14 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: Francesco149 @ 2021-08-03 12:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New comment by Francesco149 on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-891793322

Comment:
> @Francesco149 ok to be adopted?

yep no problem

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (18 preceding siblings ...)
  2021-08-03 12:07 ` Francesco149
@ 2021-08-03 14:13 ` ericonr
  2021-08-03 15:03 ` 33kk
                   ` (13 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-08-03 14:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r681800149

Comment:
I see now from this patch that at least libcommuni and qt keychain didn't need to be submodules. Did you try rebasing the patch?

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (19 preceding siblings ...)
  2021-08-03 14:13 ` [PR REVIEW] " ericonr
@ 2021-08-03 15:03 ` 33kk
  2021-08-03 15:10 ` 33kk
                   ` (12 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-03 15:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New review comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r681847584

Comment:
The patch is for qmake, Chatterino switched to cmake since then, libcommuni doesn't support cmake and Chatterino's fork is used. Not sure about qtkeychain

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (20 preceding siblings ...)
  2021-08-03 15:03 ` 33kk
@ 2021-08-03 15:10 ` 33kk
  2021-08-03 17:27 ` ericonr
                   ` (11 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-03 15:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

New review comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r681853798

Comment:
qtkeychain is also a fork, not sure if it will compile with upstream version https://github.com/Chatterino/qtkeychain/commits/de954627363b0b4bff9a2616f1a409b7e14d5df9

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (21 preceding siblings ...)
  2021-08-03 15:10 ` 33kk
@ 2021-08-03 17:27 ` ericonr
  2021-08-03 21:10 ` 33kk
                   ` (10 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-08-03 17:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r681961550

Comment:
Try adding `qt5-qmake` for the cross builds.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (22 preceding siblings ...)
  2021-08-03 17:27 ` ericonr
@ 2021-08-03 21:10 ` 33kk
  2021-08-05 18:34 ` [PR PATCH] [Updated] " 33kk
                   ` (9 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-03 21:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New review comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r682105311

Comment:
Chatterino doesn't fully work on arm at the moment and only builds with qt6

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.3.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (23 preceding siblings ...)
  2021-08-03 21:10 ` 33kk
@ 2021-08-05 18:34 ` 33kk
  2021-08-05 18:36 ` [PR PATCH] [Updated] chatterino2: update to 2.3.4 33kk
                   ` (8 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-05 18:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.3.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8872 bytes --]

From a54a69afb54f8de5d7f6c7ade85a60a7c93aaf6e Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.3.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 ------------
 srcpkgs/chatterino2/template                  | 91 ++++++++++---------
 3 files changed, 59 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/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
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..0b38189a9c29 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,56 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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() {
-	# 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' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (24 preceding siblings ...)
  2021-08-05 18:34 ` [PR PATCH] [Updated] " 33kk
@ 2021-08-05 18:36 ` 33kk
  2021-08-05 20:18 ` [PR REVIEW] " zneix
                   ` (7 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-05 18:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.4.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8872 bytes --]

From 67aaec547b50f033fa7887cae9f909fa6599f4d0 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 ------------
 srcpkgs/chatterino2/template                  | 91 ++++++++++---------
 3 files changed, 59 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/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
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..0b38189a9c29 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,56 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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() {
-	# 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' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (25 preceding siblings ...)
  2021-08-05 18:36 ` [PR PATCH] [Updated] chatterino2: update to 2.3.4 33kk
@ 2021-08-05 20:18 ` zneix
  2021-08-06 19:01 ` ericonr
                   ` (6 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: zneix @ 2021-08-05 20:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

New review comment by zneix on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r683759512

Comment:
Upstream version might not compile because of our custom hacks in Chatterino's cmake implementation. Chatterino explicitly uses Chatterino/qtkeychain and this is what should be used instead of upstream qtkeychain version.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (26 preceding siblings ...)
  2021-08-05 20:18 ` [PR REVIEW] " zneix
@ 2021-08-06 19:01 ` ericonr
  2021-08-06 19:02 ` ericonr
                   ` (5 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-08-06 19:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r684446277

Comment:
Should chatterino have any code that's arch specific?

Do you mean that we need to build with qt6 for ARM to work? That is an option, since qt6 is in repos.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (27 preceding siblings ...)
  2021-08-06 19:01 ` ericonr
@ 2021-08-06 19:02 ` ericonr
  2021-08-06 19:45 ` [PR PATCH] [Updated] " 33kk
                   ` (4 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ericonr @ 2021-08-06 19:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#discussion_r684446623

Comment:
Anyway, please add `qt5-qmake` so it can get further in the build for errors to appear.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (28 preceding siblings ...)
  2021-08-06 19:02 ` ericonr
@ 2021-08-06 19:45 ` 33kk
  2022-03-01 21:26 ` tibequadorian
                   ` (3 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: 33kk @ 2021-08-06 19:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.4.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8882 bytes --]

From bbe1092c4c493e49a214dc58560eeef57d292ac6 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 ------------
 srcpkgs/chatterino2/template                  | 91 ++++++++++---------
 3 files changed, 59 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/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
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -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>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..2691c2bfb702 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,56 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_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/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	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() {
-	# 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' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (29 preceding siblings ...)
  2021-08-06 19:45 ` [PR PATCH] [Updated] " 33kk
@ 2022-03-01 21:26 ` tibequadorian
  2022-03-01 21:30 ` tibequadorian
                   ` (2 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: tibequadorian @ 2022-03-01 21:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1923 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-1055874732

Comment:
This patch should fix cross builds:

```patch
diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
index 82905436..b0b89a4e 100644
--- a/cmake/FindLRUCache.cmake
+++ b/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/cmake/FindPajladaSerialize.cmake
+++ b/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/cmake/FindPajladaSignals.cmake
+++ b/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)
 
```

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (30 preceding siblings ...)
  2022-03-01 21:26 ` tibequadorian
@ 2022-03-01 21:30 ` tibequadorian
  2022-04-02 21:39 ` paper42
  2022-04-02 21:39 ` [PR PATCH] [Closed]: " paper42
  33 siblings, 0 replies; 35+ messages in thread
From: tibequadorian @ 2022-03-01 21:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-1055879793

Comment:
I'm pretty sure WinToast is not required.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (31 preceding siblings ...)
  2022-03-01 21:30 ` tibequadorian
@ 2022-04-02 21:39 ` paper42
  2022-04-02 21:39 ` [PR PATCH] [Closed]: " paper42
  33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-04-02 21:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32199#issuecomment-1086728900

Comment:
#36170

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Closed]: chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
                   ` (32 preceding siblings ...)
  2022-04-02 21:39 ` paper42
@ 2022-04-02 21:39 ` paper42
  33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-04-02 21:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]

There's a closed pull request on the void-packages repository

chatterino2: update to 2.3.4.
https://github.com/void-linux/void-packages/pull/32199

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2022-04-02 21:39 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
2021-07-26  3:01 ` ericonr
2021-07-26 17:22 ` 33kk
2021-07-26 19:33 ` [PR REVIEW] " ericonr
2021-07-26 20:40 ` [PR PATCH] [Updated] " 33kk
2021-07-26 20:42 ` 33kk
2021-07-26 20:57 ` [PR PATCH] [Updated] " 33kk
2021-07-31  2:20 ` [PR REVIEW] " ericonr
2021-07-31  2:20 ` ericonr
2021-07-31 15:04 ` [PR REVIEW] " 33kk
2021-08-01  0:57 ` ericonr
2021-08-01  2:43 ` [PR PATCH] [Updated] " 33kk
2021-08-01  3:38 ` 33kk
2021-08-03  3:43 ` [PR REVIEW] " ericonr
2021-08-03  3:43 ` ericonr
2021-08-03  3:43 ` ericonr
2021-08-03  8:19 ` [PR PATCH] [Updated] " 33kk
2021-08-03  8:21 ` 33kk
2021-08-03  8:25 ` 33kk
2021-08-03 12:07 ` Francesco149
2021-08-03 14:13 ` [PR REVIEW] " ericonr
2021-08-03 15:03 ` 33kk
2021-08-03 15:10 ` 33kk
2021-08-03 17:27 ` ericonr
2021-08-03 21:10 ` 33kk
2021-08-05 18:34 ` [PR PATCH] [Updated] " 33kk
2021-08-05 18:36 ` [PR PATCH] [Updated] chatterino2: update to 2.3.4 33kk
2021-08-05 20:18 ` [PR REVIEW] " zneix
2021-08-06 19:01 ` ericonr
2021-08-06 19:02 ` ericonr
2021-08-06 19:45 ` [PR PATCH] [Updated] " 33kk
2022-03-01 21:26 ` tibequadorian
2022-03-01 21:30 ` tibequadorian
2022-04-02 21:39 ` paper42
2022-04-02 21:39 ` [PR PATCH] [Closed]: " paper42

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).