Github messages for voidlinux
 help / color / mirror / Atom feed
From: 33kk <33kk@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
Date: Fri, 06 Aug 2021 21:45:45 +0200	[thread overview]
Message-ID: <20210806194545.JXKMccGA2RZsvWRU6a6IQ0nqVdW8CIaUiF2oWayR1Jk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32199@inbox.vuxu.org>

[-- 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() {

  parent reply	other threads:[~2021-08-06 19:45 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` 33kk [this message]
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
2022-03-16 12:15 [PR PATCH] " tibequadorian
2022-03-16 12:56 ` [PR PATCH] [Updated] " tibequadorian
2022-03-16 12:57 ` tibequadorian
2022-03-16 12:58 ` tibequadorian
2022-03-16 13:19 ` tibequadorian
2022-03-28 17:28 ` tibequadorian
2022-03-28 18:02 ` tibequadorian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210806194545.JXKMccGA2RZsvWRU6a6IQ0nqVdW8CIaUiF2oWayR1Jk@z \
    --to=33kk@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).