net-im/chatterino2: update to new snapshot

4 files changed, 14 insertions, 38 deletions

diff --git a/net-im/chatterino2/Makefile b/net-im/chatterino2/Makefile
index 6a90452fc2ce..101d07db2686 100644
--- a/net-im/chatterino2/Makefile
+++ b/net-im/chatterino2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	chatterino2
-PORTVERSION=	g2020083001
+PORTVERSION=	g2020083101
 CATEGORIES=	net-im
 
 MAINTAINER=	swills@FreeBSD.org
@@ -21,20 +21,15 @@ USE_GL=		gl
 
 OPTIONS_DEFINE=	DOCS
 
-DESKTOP_ENTRIES=	"Chatterino" \
-			"" \
-			"chatterino" \
-			"chatterino" \
-			"Network;InstantMessaging;" \
-			""
-
 PLIST_FILES=	bin/chatterino \
 		share/appdata/com.chatterino.chatterino.appdata.xml \
+		share/applications/com.chatterino.chatterino.desktop \
 		share/icons/hicolor/256x256/apps/chatterino.png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chatterino
-GH_TAGNAME=	9ae79e65
+COMMIT_ID=	36b9466f8985769489ed8b05d23fe057bbb75660
+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 \
@@ -42,7 +37,7 @@ GH_TUPLE=	Chatterino:libcommuni:f3e7f97:communi/lib/libcommuni \
 		pajlada:signals:6665cca:signals/lib/signals \
 		ziocleto:websocketpp:1e0138c:websocketpp/lib/websocketpp
 
-QMAKE_ENV=	GIT_COMMIT=${GH_TAGNAME} \
+QMAKE_ENV=	GIT_COMMIT=${COMMIT_ID} \
 		GIT_RELEASE=${DISTVERSIONPREFIX}${PORTVERSION}
 QMAKE_ARGS=	INCLUDEPATH+=${LOCALBASE}/include/qt5keychain \
 		LIBS+=-lqt5keychain PREFIX=${STAGEDIR}${PREFIX} \
@@ -53,13 +48,11 @@ PORTDOCS=	README.md docs/Commands.md docs/ENV.md docs/IMAGEUPLOADER.md \
 
 PORTSCOUT=	skipv:v2.1.7,v2.1.0,v2.0.4,v2.0.3,v2.0.2,v2.0.1,v2.0.0
 
-post-extract:
-	@${RM} ${WRKSRC}/lib/qtkeychain.pri
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/chatterino ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/ ${STAGEDIR}${PREFIX}/share/appdata/
 	${INSTALL_DATA} ${WRKSRC}/resources/icon.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/chatterino.png
+	${INSTALL_DATA} ${WRKSRC}/resources/com.chatterino.chatterino.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/resources/com.chatterino.chatterino.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/
 
 post-install-DOCS-on:
diff --git a/net-im/chatterino2/distinfo b/net-im/chatterino2/distinfo
index d4f3b32ece82..8c9202f32a8d 100644
--- a/net-im/chatterino2/distinfo
+++ b/net-im/chatterino2/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1598879542
-SHA256 (chatterino-chatterino2-g2020083001-9ae79e65_GH0.tar.gz) = 6b535410a2ec3bfd9e4a66a5c60f0ccfc044f586e1cbeb541877a26f861280da
-SIZE (chatterino-chatterino2-g2020083001-9ae79e65_GH0.tar.gz) = 1444440
+TIMESTAMP = 1598902157
+SHA256 (chatterino-chatterino2-g2020083101-36b9466_GH0.tar.gz) = dbabc78fce72617ccc8d7b7e3ff279948cb9388e8f11a98da7631602164b244b
+SIZE (chatterino-chatterino2-g2020083101-36b9466_GH0.tar.gz) = 1444484
 SHA256 (Chatterino-libcommuni-f3e7f97_GH0.tar.gz) = 7e01a92269c043004ce5e6ba8a5ad2c1506d6fc9a03bd74426feb2049ccf4917
 SIZE (Chatterino-libcommuni-f3e7f97_GH0.tar.gz) = 646993
 SHA256 (pajlada-humanize-4e00a03_GH0.tar.gz) = 1d74a2300a8991789212099aba6f89cba3a5eddf82bd804ff5ae18f8cbd84049
diff --git a/net-im/chatterino2/files/patch-chatterino.pro b/net-im/chatterino2/files/patch-chatterino.pro
index 801647fc7e86..fedf47e5755f 100644
--- a/net-im/chatterino2/files/patch-chatterino.pro
+++ b/net-im/chatterino2/files/patch-chatterino.pro
@@ -1,19 +1,12 @@
---- chatterino.pro.orig	2020-08-31 13:27:53 UTC
+--- chatterino.pro.orig	2020-08-31 14:42:30 UTC
 +++ chatterino.pro
-@@ -82,7 +82,6 @@ include(lib/settings.pri)
+@@ -82,7 +82,9 @@ include(lib/settings.pri)
  include(lib/serialize.pri)
  include(lib/winsdk.pri)
  include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
++!freebsd {
+ include(lib/qtkeychain.pri)
++}
  
  exists( $$OUT_PWD/conanbuildinfo.pri ) {
      message("Using conan packages")
-@@ -576,7 +575,7 @@ git_commit=$$system(git rev-parse HEAD)
- isEmpty(git_release) {
- git_release=$$system(git describe)
- }
--git_hash = $$str_member($$git_commit, 0, 8)
-+git_hash = $$git_commit
- 
- # Passing strings as defines requires you to use this weird triple-escape then quotation mark syntax.
- # https://stackoverflow.com/questions/3348711/add-a-define-to-qmake-with-a-value/18343449#18343449
diff --git a/net-im/chatterino2/files/patch-lib_openssl.pri b/net-im/chatterino2/files/patch-lib_openssl.pri
deleted file mode 100644
index 0ee79a4f6646..000000000000
--- a/net-im/chatterino2/files/patch-lib_openssl.pri
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/openssl.pri.orig	2020-08-27 19:18:49 UTC
-+++ lib/openssl.pri
-@@ -11,7 +11,5 @@ win32 {
-     LIBS += -llibssl
-     LIBS += -llibcrypto
- } else {
--    PKGCONFIG += openssl
--
-     LIBS += -lssl -lcrypto
- }