svn commit: r555536 - in branches/2020Q4/net-im/chatterino2: . files

[Steve Wills]

Author: swills
Date: Tue Nov 17 02:31:57 2020
New Revision: 555536
URL: https://svnweb.freebsd.org/changeset/ports/555536

Log:
  MFH: r555535
  
  net-im/chatterino2: fix crash on startup
  
  Obtained from:	https://github.com/Chatterino/chatterino2/pull/2192
  
  Approved by:	ports-secteam (implicit)

Added:
  branches/2020Q4/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp
     - copied unchanged from r555535, head/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp
Modified:
  branches/2020Q4/net-im/chatterino2/Makefile
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/net-im/chatterino2/Makefile
==============================================================================
--- branches/2020Q4/net-im/chatterino2/Makefile	Tue Nov 17 02:29:28 2020	(r555535)
+++ branches/2020Q4/net-im/chatterino2/Makefile	Tue Nov 17 02:31:57 2020	(r555536)
@@ -2,6 +2,7 @@
 
 PORTNAME=	chatterino2
 PORTVERSION=	g2020090101
+PORTREVISION=	1
 CATEGORIES=	net-im
 
 MAINTAINER=	swills at FreeBSD.org
@@ -46,7 +47,7 @@ QMAKE_ARGS=	INCLUDEPATH+=${LOCALBASE}/include/qt5keych
 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

Copied: branches/2020Q4/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp (from r555535, head/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q4/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp	Tue Nov 17 02:31:57 2020	(r555536, copy of r555535, head/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp)
@@ -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 {""};
+         }