cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r555535

Browse Source 
net-im/chatterino2: fix crash on startup

Obtained from:	https://github.com/Chatterino/chatterino2/pull/2192

Approved by:	ports-secteam (implicit)
This commit is contained in:
Steve Wills 2020-11-17 02:31:57 +00:00
parent fc3cf49733
commit dea575c533
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=555536
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net-im/chatterino2/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= chatterino2
PORTVERSION= g2020090101
PORTREVISION= 1
CATEGORIES= net-im
MAINTAINER= swills@FreeBSD.org
@ -46,7 +47,7 @@ QMAKE_ARGS= INCLUDEPATH+=${LOCALBASE}/include/qt5keychain \
PORTDOCS= README.md docs/Commands.md docs/ENV.md docs/IMAGEUPLOADER.md \
docs/README.md docs/Regex.md
PORTSCOUT= skipv:v2.1.7,v2.1.0,v2.0.4,v2.0.3,v2.0.2,v2.0.1,v2.0.0
PORTSCOUT= skipv:v2.2.2,v2.2.1,v2.2.0,v2.1.7,v2.1.6,v2.1.5,v2.1.4,v2.1.3,v2.1.2,v2.1.0,v2.0.4,v2.0.3,v2.0.2,v2.0.1,v2.0.0
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/docs

11
net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/providers/ffz/FfzEmotes.cpp.orig 2020-11-16 21:05:47 UTC
+++ src/providers/ffz/FfzEmotes.cpp
@@ -14,7 +14,7 @@ namespace {
Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
{
auto emote = urls.value(emoteScale);
- if (emote.isUndefined())
+ if (emote.isUndefined() || emote.type() == QJsonValue::Null)
{
return {""};
}