From owner-dev-commits-ports-all@freebsd.org Sat Aug 28 00:11:24 2021 Return-Path: Delivered-To: dev-commits-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 E660666A073; Sat, 28 Aug 2021 00:11:24 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GxH7J65C6z3FH3; Sat, 28 Aug 2021 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B98745083; Sat, 28 Aug 2021 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17S0BORL080115; Sat, 28 Aug 2021 00:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17S0BO8Z080114; Sat, 28 Aug 2021 00:11:24 GMT (envelope-from git) Date: Sat, 28 Aug 2021 00:11:24 GMT Message-Id: <202108280011.17S0BO8Z080114@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Steve Wills Subject: git: f865a62a34ca - main - net-im/chatterino2: update to 2.3.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: swills X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f865a62a34ca5b1b26ec6ac7da96cf2c0a2214a3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2021 00:11:25 -0000 The branch main has been updated by swills: URL: https://cgit.FreeBSD.org/ports/commit/?id=f865a62a34ca5b1b26ec6ac7da96cf2c0a2214a3 commit f865a62a34ca5b1b26ec6ac7da96cf2c0a2214a3 Author: Steve Wills AuthorDate: 2021-08-28 00:11:02 +0000 Commit: Steve Wills CommitDate: 2021-08-28 00:11:13 +0000 net-im/chatterino2: update to 2.3.4 --- net-im/chatterino2/Makefile | 34 ++++++---------------- net-im/chatterino2/distinfo | 26 +++++++---------- net-im/chatterino2/files/patch-chatterino.pro | 16 +++++----- net-im/chatterino2/files/patch-docs_README.md | 19 ------------ .../files/patch-src_providers_ffz_FfzEmotes.cpp | 11 ------- .../patch-src_providers_twitch_PubsubClient.cpp | 14 +++++++++ 6 files changed, 42 insertions(+), 78 deletions(-) diff --git a/net-im/chatterino2/Makefile b/net-im/chatterino2/Makefile index 99a5c59ceb4c..41648b21f85c 100644 --- a/net-im/chatterino2/Makefile +++ b/net-im/chatterino2/Makefile @@ -1,6 +1,6 @@ PORTNAME= chatterino2 -PORTVERSION= g2020090101 -PORTREVISION= 2 +PORTVERSION= 2.3.4 +DISTVERSIONPREFIX= v CATEGORIES= net-im MAINTAINER= swills@FreeBSD.org @@ -9,7 +9,8 @@ COMMENT= Twitch chat client LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= rapidjson>0:devel/rapidjson +BUILD_DEPENDS= rapidjson>0:devel/rapidjson \ + websocketpp>=0:devel/websocketpp LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libqt5keychain.so:security/qtkeychain @@ -18,8 +19,6 @@ USE_QT= concurrent core gui multimedia network svg widgets \ buildtools_build qmake_build USE_GL= gl -OPTIONS_DEFINE= DOCS - PLIST_FILES= bin/chatterino \ share/appdata/com.chatterino.chatterino.appdata.xml \ share/applications/com.chatterino.chatterino.desktop \ @@ -27,31 +26,16 @@ PLIST_FILES= bin/chatterino \ USE_GITHUB= yes GH_ACCOUNT= chatterino -COMMIT_ID= cbcd5f3863b6edf22b6d6ffb625bd338f3ea112d -GH_TAGNAME= ${COMMIT_ID:C|(.......).*|\1|} -GH_TUPLE= Chatterino:libcommuni:f3e7f97:communi/lib/libcommuni \ - pajlada:humanize:4e00a03:humanize/lib/humanize \ - pajlada:serialize:130ffc3:serialize/lib/serialize \ - pajlada:settings:6de3a27:settings/lib/settings \ - pajlada:signals:6665cca:signals/lib/signals \ - ziocleto:websocketpp:1e0138c:websocketpp/lib/websocketpp +GH_TUPLE= Chatterino:libcommuni:c613600e:communi/lib/libcommuni \ + pajlada:serialize:7d37cbf:serialize/lib/serialize \ + pajlada:settings:7cf8431d:settings/lib/settings \ + pajlada:signals:baf5bb0:signals/lib/signals QMAKE_ENV= GIT_COMMIT=${COMMIT_ID} \ GIT_RELEASE=${DISTVERSIONPREFIX}${PORTVERSION} QMAKE_ARGS= INCLUDEPATH+=${LOCALBASE}/include/qt5keychain \ LIBS+=-lqt5keychain \ + WEBSOCKETPP_SYSTEM=1 \ RAPIDJSON_SYSTEM=1 -PORTDOCS= README.md docs/Commands.md docs/ENV.md docs/IMAGEUPLOADER.md \ - docs/README.md docs/Regex.md - -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 - ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/ -.for DOC in docs/Commands.md docs/ENV.md docs/IMAGEUPLOADER.md docs/README.md docs/Regex.md - ${INSTALL_DATA} ${WRKSRC}/${DOC} ${STAGEDIR}${DOCSDIR}/docs -.endfor - .include diff --git a/net-im/chatterino2/distinfo b/net-im/chatterino2/distinfo index 684f797c4c46..fb44fd613120 100644 --- a/net-im/chatterino2/distinfo +++ b/net-im/chatterino2/distinfo @@ -1,15 +1,11 @@ -TIMESTAMP = 1598993043 -SHA256 (chatterino-chatterino2-g2020090101-cbcd5f3_GH0.tar.gz) = 8940b4e233368a4a7966962275d26907f5382eeba55d84e6a310bc3705de70e4 -SIZE (chatterino-chatterino2-g2020090101-cbcd5f3_GH0.tar.gz) = 1444819 -SHA256 (Chatterino-libcommuni-f3e7f97_GH0.tar.gz) = 7e01a92269c043004ce5e6ba8a5ad2c1506d6fc9a03bd74426feb2049ccf4917 -SIZE (Chatterino-libcommuni-f3e7f97_GH0.tar.gz) = 646993 -SHA256 (pajlada-humanize-4e00a03_GH0.tar.gz) = 1d74a2300a8991789212099aba6f89cba3a5eddf82bd804ff5ae18f8cbd84049 -SIZE (pajlada-humanize-4e00a03_GH0.tar.gz) = 82768 -SHA256 (pajlada-serialize-130ffc3_GH0.tar.gz) = 3559e487215dcc3d4ac73148efdba0e3b6b66ce9b124cdfd9003907ad53c8908 -SIZE (pajlada-serialize-130ffc3_GH0.tar.gz) = 7739 -SHA256 (pajlada-settings-6de3a27_GH0.tar.gz) = 1a00fe1fcae6bffeca5bfa09c5c59d623fa3157c134c6ca558e585cd991fb639 -SIZE (pajlada-settings-6de3a27_GH0.tar.gz) = 104263 -SHA256 (pajlada-signals-6665cca_GH0.tar.gz) = 989d9238a5900847275ae13804ea6592f868b12b339d6c9650755a1d168add1e -SIZE (pajlada-signals-6665cca_GH0.tar.gz) = 8773 -SHA256 (ziocleto-websocketpp-1e0138c_GH0.tar.gz) = 4c76ffdc2449cef01e4ae81b184ed4f1748378951cab5de8c42341bf686e74b5 -SIZE (ziocleto-websocketpp-1e0138c_GH0.tar.gz) = 699473 +TIMESTAMP = 1630105614 +SHA256 (chatterino-chatterino2-v2.3.4_GH0.tar.gz) = 27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c +SIZE (chatterino-chatterino2-v2.3.4_GH0.tar.gz) = 1680775 +SHA256 (Chatterino-libcommuni-c613600e_GH0.tar.gz) = f99749e3ba09dd8c54ac96a968813d741c4157d92663786cbb1496bfa89aafe4 +SIZE (Chatterino-libcommuni-c613600e_GH0.tar.gz) = 475895 +SHA256 (pajlada-serialize-7d37cbf_GH0.tar.gz) = 2699d20509117209fd2995f4c3091f614f8f8f8996f8bc40f5620461b4e0f097 +SIZE (pajlada-serialize-7d37cbf_GH0.tar.gz) = 9039 +SHA256 (pajlada-settings-7cf8431d_GH0.tar.gz) = 18f01f1fd0f9c7707b311695703765aeb27ee480bd613fdd12f2a73801e69f17 +SIZE (pajlada-settings-7cf8431d_GH0.tar.gz) = 110989 +SHA256 (pajlada-signals-baf5bb0_GH0.tar.gz) = ca8385e823fb0fddd7edfd66d456d47d79f997793beaa1269b37195eccafc5df +SIZE (pajlada-signals-baf5bb0_GH0.tar.gz) = 9555 diff --git a/net-im/chatterino2/files/patch-chatterino.pro b/net-im/chatterino2/files/patch-chatterino.pro index dd8e9a35d2e7..181a6770cbc1 100644 --- a/net-im/chatterino2/files/patch-chatterino.pro +++ b/net-im/chatterino2/files/patch-chatterino.pro @@ -1,11 +1,9 @@ ---- chatterino.pro.orig 2020-08-31 14:42:30 UTC +--- chatterino.pro.orig 2021-05-16 17:29:27 UTC +++ chatterino.pro -@@ -565,6 +567,21 @@ linux { - target.path = $$PREFIX/bin - +@@ -624,6 +624,21 @@ linux { INSTALLS += desktop build_icons icon target -+} -+ + } + +freebsd { + desktop.path = $$PREFIX/share/applications + desktop.files = resources/com.chatterino.chatterino.desktop @@ -19,6 +17,8 @@ + target.path = $$PREFIX/bin + + INSTALLS += desktop icon target xml - } - ++} ++ git_commit=$$(GIT_COMMIT) + git_release=$$(GIT_RELEASE) + # Git data diff --git a/net-im/chatterino2/files/patch-docs_README.md b/net-im/chatterino2/files/patch-docs_README.md deleted file mode 100644 index 2a878bf66f5d..000000000000 --- a/net-im/chatterino2/files/patch-docs_README.md +++ /dev/null @@ -1,19 +0,0 @@ ---- docs/README.md.orig 2020-08-27 20:38:05 UTC -+++ docs/README.md -@@ -6,16 +6,4 @@ Table of contents: - - [Environment variables](ENV.md) - - [Commands](Commands.md) - - [Regex](Regex.md) -- - [Notes](notes/README.md) -- - [TCaccountmanager](notes/TCaccountmanager.md) -- - [TCappearanceSettings.md](notes/TCappearanceSettings.md) -- - [TCchannelNavigation.md](notes/TCchannelNavigation.md) -- - [TCchatterinoFeatures.md](notes/TCchatterinoFeatures.md) -- - [TCchatting.md](notes/TCchatting.md) -- - [TCchatWindowNavigation.md](notes/TCchatWindowNavigation.md) -- - [TCemotes.md](notes/TCemotes.md) -- - [TCgeneral.md](notes/TCgeneral.md) -- - [TChighlighting.md](notes/TChighlighting.md) -- - [TCtabsAndSplits.md](notes/TCtabsAndSplits.md) -- - [TCusernameTabbing.md](notes/TCusernameTabbing.md) - diff --git a/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp b/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp deleted file mode 100644 index b3d2aa41e761..000000000000 --- a/net-im/chatterino2/files/patch-src_providers_ffz_FfzEmotes.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 {""}; - } diff --git a/net-im/chatterino2/files/patch-src_providers_twitch_PubsubClient.cpp b/net-im/chatterino2/files/patch-src_providers_twitch_PubsubClient.cpp new file mode 100644 index 000000000000..f0725dc20fce --- /dev/null +++ b/net-im/chatterino2/files/patch-src_providers_twitch_PubsubClient.cpp @@ -0,0 +1,14 @@ +--- src/providers/twitch/PubsubClient.cpp.orig 2021-05-21 15:21:21 UTC ++++ src/providers/twitch/PubsubClient.cpp +@@ -803,7 +803,11 @@ PubSub::PubSub() + // qCDebug(chatterinoPubsub) << QString::fromStdString(rj::stringify(data)); + }; + ++#ifdef DEBUG_OFF ++ this->websocketClient.set_access_channels(websocketpp::log::alevel::none); ++#else + this->websocketClient.set_access_channels(websocketpp::log::alevel::all); ++#endif + this->websocketClient.clear_access_channels( + websocketpp::log::alevel::frame_payload); +