Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Jul 2023 11:25:02 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b45b7a2277e1 - main - net-im/chatterino2: Update version 2.3.5=>2.4.0
Message-ID:  <202307161125.36GBP2sc066347@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b45b7a2277e1c040d95a67539515c1e11104436f

commit b45b7a2277e1c040d95a67539515c1e11104436f
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-16 11:21:13 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-16 11:24:44 +0000

    net-im/chatterino2: Update version 2.3.5=>2.4.0
    
    Changelog: https://github.com/Chatterino/chatterino2/releases/tag/v2.4.0
---
 net-im/chatterino2/Makefile                        | 31 +++++++++-------------
 net-im/chatterino2/distinfo                        |  8 +++---
 net-im/chatterino2/files/patch-chatterino.pro      | 24 -----------------
 .../patch-src_providers_twitch_PubsubClient.cpp    | 14 ----------
 4 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/net-im/chatterino2/Makefile b/net-im/chatterino2/Makefile
index b6383dda4f83..b579aef4f379 100644
--- a/net-im/chatterino2/Makefile
+++ b/net-im/chatterino2/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	chatterino2
-PORTVERSION=	2.3.5
+PORTVERSION=	2.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im
 
@@ -10,33 +10,28 @@ WWW=		https://chatterino.com/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	rapidjson>0:devel/rapidjson \
+BUILD_DEPENDS=	${LOCALBASE}/include/magic_enum.hpp:devel/magic_enum \
+		rapidjson>0:devel/rapidjson \
 		websocketpp>=0:devel/websocketpp
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libqt5keychain.so:security/qtkeychain@qt5
 
-USES=		compiler:c++17-lang gl pkgconfig qmake qt:5 ssl
-USE_QT=		concurrent core gui multimedia network svg widgets \
-		buildtools:build qmake:build
-USE_GL=		gl
-
-PLIST_FILES=	bin/chatterino \
-		share/appdata/com.chatterino.chatterino.appdata.xml \
-		share/applications/com.chatterino.chatterino.desktop \
-		share/icons/hicolor/256x256/apps/chatterino.png
-
+USES=		cmake compiler:c++17-lang gl pkgconfig qt:5 ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	chatterino
 GH_TUPLE=	Chatterino:libcommuni:a7b32cd:communi/lib/libcommuni \
+		arsenm:sanitizers-cmake:c3dc841:sanitizers/cmake/sanitizers-cmake \
 		pajlada:serialize:7d37cbf:serialize/lib/serialize \
 		pajlada:settings:04792d8:settings/lib/settings \
 		pajlada:signals:25e4ec3:signals/lib/signals
+USE_GL=	gl
+USE_QT=	concurrent core dbus gui multimedia network svg widgets \
+		buildtools:build qmake:build
+
+CMAKE_ARGS=	-DUSE_SYSTEM_QTKEYCHAIN=on
 
-QMAKE_ENV=	GIT_COMMIT=${COMMIT_ID} \
-		GIT_RELEASE=${DISTVERSIONPREFIX}${PORTVERSION}
-QMAKE_ARGS=	INCLUDEPATH+=${LOCALBASE}/include/qt5keychain \
-		LIBS+=-lqt5keychain \
-		WEBSOCKETPP_SYSTEM=1 \
-		RAPIDJSON_SYSTEM=1
+PLIST_FILES=	bin/chatterino \
+		share/applications/com.chatterino.chatterino.desktop \
+		share/icons/hicolor/256x256/apps/com.chatterino.chatterino.png
 
 .include <bsd.port.mk>
diff --git a/net-im/chatterino2/distinfo b/net-im/chatterino2/distinfo
index fdc9a2a35edf..71c330612017 100644
--- a/net-im/chatterino2/distinfo
+++ b/net-im/chatterino2/distinfo
@@ -1,8 +1,10 @@
-TIMESTAMP = 1689446136
-SHA256 (chatterino-chatterino2-v2.3.5_GH0.tar.gz) = f1fff3523f5a3f633430d44f7ca6c6c718a515258d50004a855e69e4aa989b4e
-SIZE (chatterino-chatterino2-v2.3.5_GH0.tar.gz) = 1753250
+TIMESTAMP = 1689505428
+SHA256 (chatterino-chatterino2-v2.4.0_GH0.tar.gz) = bdd52c380b1c8278d647407b25811c649b4b6edf66b21529cd50a9863859fb45
+SIZE (chatterino-chatterino2-v2.4.0_GH0.tar.gz) = 1987436
 SHA256 (Chatterino-libcommuni-a7b32cd_GH0.tar.gz) = 5441bf53c224f4782efdb58a5045a014d65b8906c1621c417828063e5753b74b
 SIZE (Chatterino-libcommuni-a7b32cd_GH0.tar.gz) = 477616
+SHA256 (arsenm-sanitizers-cmake-c3dc841_GH0.tar.gz) = bc5cddf6451c3edecc75bf605e7976cb47208d31021db6f5bf99c579efc01f5a
+SIZE (arsenm-sanitizers-cmake-c3dc841_GH0.tar.gz) = 7436
 SHA256 (pajlada-serialize-7d37cbf_GH0.tar.gz) = 2699d20509117209fd2995f4c3091f614f8f8f8996f8bc40f5620461b4e0f097
 SIZE (pajlada-serialize-7d37cbf_GH0.tar.gz) = 9039
 SHA256 (pajlada-settings-04792d8_GH0.tar.gz) = 9b39d1f6006e1e0e951a96c7bce19f4b264f8c02114c7f77d2789454033ab37f
diff --git a/net-im/chatterino2/files/patch-chatterino.pro b/net-im/chatterino2/files/patch-chatterino.pro
deleted file mode 100644
index 181a6770cbc1..000000000000
--- a/net-im/chatterino2/files/patch-chatterino.pro
+++ /dev/null
@@ -1,24 +0,0 @@
---- chatterino.pro.orig	2021-05-16 17:29:27 UTC
-+++ chatterino.pro
-@@ -624,6 +624,21 @@ linux {
-     INSTALLS += desktop build_icons icon target
- }
- 
-+freebsd {
-+    desktop.path = $$PREFIX/share/applications
-+    desktop.files = resources/com.chatterino.chatterino.desktop
-+
-+    xml.path = $$PREFIX/share/appdata
-+    xml.files = resources/com.chatterino.chatterino.appdata.xml
-+
-+    icon.path = $$PREFIX/share/icons/hicolor/256x256/apps
-+    icon.extra = cp $$PWD/resources/icon.png $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/256x256/apps/chatterino.png
-+
-+    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-src_providers_twitch_PubsubClient.cpp b/net-im/chatterino2/files/patch-src_providers_twitch_PubsubClient.cpp
deleted file mode 100644
index f0725dc20fce..000000000000
--- a/net-im/chatterino2/files/patch-src_providers_twitch_PubsubClient.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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);
- 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307161125.36GBP2sc066347>