From owner-svn-ports-all@freebsd.org Tue Nov 17 02:31:58 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2735547C0BD; Tue, 17 Nov 2020 02:31:58 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CZqhZ0fllz3Fdp; Tue, 17 Nov 2020 02:31:58 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 098A918877; Tue, 17 Nov 2020 02:31:58 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AH2Vv57065137; Tue, 17 Nov 2020 02:31:57 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AH2Vvdd065052; Tue, 17 Nov 2020 02:31:57 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202011170231.0AH2Vvdd065052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 17 Nov 2020 02:31:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r555536 - in branches/2020Q4/net-im/chatterino2: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2020Q4/net-im/chatterino2: . files X-SVN-Commit-Revision: 555536 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2020 02:31:58 -0000 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@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 {""}; + }