Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715778673261550"
MIME-Version: 1.0
Date: Wed, 15 May 2024 13:11:13 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/chat/dino
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240515131113.B6277FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715778673261550
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed May 15 13:11:13 UTC 2024

Modified Files:
	pkgsrc/chat/dino: Makefile PLIST distinfo
	pkgsrc/chat/dino/patches: patch-main_CMakeLists.txt

Log Message:
dino: update to 0.4.3nb1.

PKGREVISION=1 because we use post-release branch commits,
directly from upstream.

0.4.3

Maintenance release with bug fixes.

0.4.2

Maintenance release with fix for CVE-2023-28686 and bug fixes.

0.4.1

Maintenance release with bug fixes.

v0.4.0

"Ilulissat"

See the release blog post for details: https://dino.im/blog/2023/02/dino-0.4-release/


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/chat/dino/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/dino/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/chat/dino/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/dino/patches/patch-main_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1715778673261550
Content-Disposition: inline
Content-Length: 7917
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/chat/dino/Makefile
diff -u pkgsrc/chat/dino/Makefile:1.35 pkgsrc/chat/dino/Makefile:1.36
--- pkgsrc/chat/dino/Makefile:1.35	Sun Apr  7 07:33:38 2024
+++ pkgsrc/chat/dino/Makefile	Wed May 15 13:11:13 2024
@@ -1,26 +1,31 @@
-# $NetBSD: Makefile,v 1.35 2024/04/07 07:33:38 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2024/05/15 13:11:13 wiz Exp $
 
-DISTNAME=	dino-0.3.1
-PKGREVISION=	2
-CATEGORIES=	chat
-MASTER_SITES=	${MASTER_SITE_GITHUB:=dino/}
-GITHUB_PROJECT=	dino
-GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+DISTNAME=		dino-0.4.3
+PKGREVISION=		1
+CATEGORIES=		chat
+MASTER_SITES=		${MASTER_SITE_GITHUB:=dino/}
+#GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+# use post-release branch commits to fix a build issue
+GITHUB_TAG=		235efcdab9b792a8cc328f466cbe700c102cd48f
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://github.com/dino/dino/
 COMMENT=	Modern XMPP (Jabber) chat client
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	glib-networking-[0-9]*:../../net/glib-networking
+
 USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
-USE_CMAKE=		yes
-USE_PKGLOCALEDIR=	yes
 
 CMAKE_ARGS+=		-DUSE_SOUP3:BOOL=ON
 
-# Failed with exports/xmpp-vala.vapi target as of 0.1.0.
-MAKE_JOBS_SAFE=		no
+BUILDLINK_TRANSFORM+=	opt:-Wno-incompatible-pointer-types-discards-qualifiers:-Wno-incompatible-pointer-types
+
+# make[2]: don't know how to make exports/xmpp-vala.vapi. Stop
+MAKE_JOBS_SAFE=	no
+
+.include "../../devel/cmake/build.mk"
 
 .include "../../chat/libsignal-protocol-c/buildlink3.mk"
 .include "../../comms/srtp/buildlink3.mk"
@@ -28,17 +33,15 @@ MAKE_JOBS_SAFE=		no
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.24
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libadwaita/buildlink3.mk"
 .include "../../devel/libgee/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../net/libnice/buildlink3.mk"
 .include "../../net/libsoup3/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
-.include "../../textproc/gspell/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/gtk4/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/dino/PLIST
diff -u pkgsrc/chat/dino/PLIST:1.3 pkgsrc/chat/dino/PLIST:1.4
--- pkgsrc/chat/dino/PLIST:1.3	Sun Feb 27 21:56:53 2022
+++ pkgsrc/chat/dino/PLIST	Wed May 15 13:11:13 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/02/27 21:56:53 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/05/15 13:11:13 wiz Exp $
 bin/dino
 include/crypto-vala.h
 include/dino.h
@@ -25,14 +25,6 @@ lib/libxmpp-vala.so.0.1
 share/applications/im.dino.Dino.desktop
 share/dbus-1/services/im.dino.Dino.service
 share/icons/hicolor/scalable/apps/im.dino.Dino.svg
-share/icons/hicolor/scalable/status/dino-changes-prevent-symbolic.svg
-share/icons/hicolor/scalable/status/dino-double-tick-symbolic.svg
-share/icons/hicolor/scalable/status/dino-qr-code-symbolic.svg
-share/icons/hicolor/scalable/status/dino-status-away.svg
-share/icons/hicolor/scalable/status/dino-status-chat.svg
-share/icons/hicolor/scalable/status/dino-status-dnd.svg
-share/icons/hicolor/scalable/status/dino-status-online.svg
-share/icons/hicolor/scalable/status/dino-tick-symbolic.svg
 share/icons/hicolor/symbolic/apps/im.dino.Dino-symbolic.svg
 share/locale/ar/LC_MESSAGES/dino-omemo.mo
 share/locale/ar/LC_MESSAGES/dino-openpgp.mo
@@ -66,7 +58,6 @@ share/locale/fa/LC_MESSAGES/dino-omemo.m
 share/locale/fa/LC_MESSAGES/dino-openpgp.mo
 share/locale/fa/LC_MESSAGES/dino.mo
 share/locale/fi/LC_MESSAGES/dino-omemo.mo
-share/locale/fi/LC_MESSAGES/dino-openpgp.mo
 share/locale/fi/LC_MESSAGES/dino.mo
 share/locale/fr/LC_MESSAGES/dino-omemo.mo
 share/locale/fr/LC_MESSAGES/dino-openpgp.mo
@@ -83,6 +74,8 @@ share/locale/id/LC_MESSAGES/dino.mo
 share/locale/ie/LC_MESSAGES/dino-omemo.mo
 share/locale/ie/LC_MESSAGES/dino-openpgp.mo
 share/locale/ie/LC_MESSAGES/dino.mo
+share/locale/is/LC_MESSAGES/dino-openpgp.mo
+share/locale/is/LC_MESSAGES/dino.mo
 share/locale/it/LC_MESSAGES/dino-omemo.mo
 share/locale/it/LC_MESSAGES/dino-openpgp.mo
 share/locale/it/LC_MESSAGES/dino.mo
@@ -90,6 +83,7 @@ share/locale/ja/LC_MESSAGES/dino-omemo.m
 share/locale/ja/LC_MESSAGES/dino-openpgp.mo
 share/locale/ja/LC_MESSAGES/dino.mo
 share/locale/kab/LC_MESSAGES/dino.mo
+share/locale/ko/LC_MESSAGES/dino-openpgp.mo
 share/locale/ko/LC_MESSAGES/dino.mo
 share/locale/lb/LC_MESSAGES/dino-omemo.mo
 share/locale/lb/LC_MESSAGES/dino-openpgp.mo
@@ -97,15 +91,14 @@ share/locale/lb/LC_MESSAGES/dino.mo
 share/locale/lt/LC_MESSAGES/dino-omemo.mo
 share/locale/lt/LC_MESSAGES/dino-openpgp.mo
 share/locale/lt/LC_MESSAGES/dino.mo
+share/locale/lv/LC_MESSAGES/dino-openpgp.mo
+share/locale/lv/LC_MESSAGES/dino.mo
 share/locale/nb/LC_MESSAGES/dino-omemo.mo
 share/locale/nb/LC_MESSAGES/dino-openpgp.mo
 share/locale/nb/LC_MESSAGES/dino.mo
 share/locale/nl/LC_MESSAGES/dino-omemo.mo
 share/locale/nl/LC_MESSAGES/dino-openpgp.mo
 share/locale/nl/LC_MESSAGES/dino.mo
-share/locale/nl_BE/LC_MESSAGES/dino-omemo.mo
-share/locale/nl_BE/LC_MESSAGES/dino-openpgp.mo
-share/locale/nl_BE/LC_MESSAGES/dino.mo
 share/locale/oc/LC_MESSAGES/dino-omemo.mo
 share/locale/oc/LC_MESSAGES/dino-openpgp.mo
 share/locale/oc/LC_MESSAGES/dino.mo

Index: pkgsrc/chat/dino/distinfo
diff -u pkgsrc/chat/dino/distinfo:1.9 pkgsrc/chat/dino/distinfo:1.10
--- pkgsrc/chat/dino/distinfo:1.9	Thu Nov 30 10:35:02 2023
+++ pkgsrc/chat/dino/distinfo	Wed May 15 13:11:13 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2023/11/30 10:35:02 nros Exp $
+$NetBSD: distinfo,v 1.10 2024/05/15 13:11:13 wiz Exp $
 
-BLAKE2s (dino-0.3.1.tar.gz) = 9ea52fa6960dc8bc3c2ec4c63f471a1bcbe7c93456979e0efa039580fe7040a2
-SHA512 (dino-0.3.1.tar.gz) = 971ac9e9c86187a5dc39453a656b9551a94a51bfefa25a2dabc0610e93ae70d9c5b1a9214633339bf2056ba216214766060c08f740e2f7007ed11e7ea914af2a
-Size (dino-0.3.1.tar.gz) = 806613 bytes
-SHA1 (patch-main_CMakeLists.txt) = 8e6ddf182ba3b60d14d41b6dd902d473ae3b9ffe
+BLAKE2s (dino-0.4.3-235efcdab9b792a8cc328f466cbe700c102cd48f.tar.gz) = 8b3304ecc63af660fdf26327aa9330aa7e66f6c04c3122edc824684635171079
+SHA512 (dino-0.4.3-235efcdab9b792a8cc328f466cbe700c102cd48f.tar.gz) = bad7ff657f0b4f59913ffce2408651ee37fc761225f10ddbbd179b35944884f562ed9980c8a31f77b808c1a9881e06db1cc948975dd5c1bda965567888b10e4e
+Size (dino-0.4.3-235efcdab9b792a8cc328f466cbe700c102cd48f.tar.gz) = 885546 bytes
+SHA1 (patch-main_CMakeLists.txt) = 9e965d1b271e11fbcaf93965ce18a1ec68079b25

Index: pkgsrc/chat/dino/patches/patch-main_CMakeLists.txt
diff -u pkgsrc/chat/dino/patches/patch-main_CMakeLists.txt:1.1 pkgsrc/chat/dino/patches/patch-main_CMakeLists.txt:1.2
--- pkgsrc/chat/dino/patches/patch-main_CMakeLists.txt:1.1	Fri Jun 12 14:20:51 2020
+++ pkgsrc/chat/dino/patches/patch-main_CMakeLists.txt	Wed May 15 13:11:13 2024
@@ -1,12 +1,16 @@
-$NetBSD: patch-main_CMakeLists.txt,v 1.1 2020/06/12 14:20:51 ryoon Exp $
+$NetBSD: patch-main_CMakeLists.txt,v 1.2 2024/05/15 13:11:13 wiz Exp $
 
+Always export symbols to fix startup on BSDs 
 https://github.com/dino/dino/issues/438
 
---- main/CMakeLists.txt.orig	2020-01-29 19:11:48.000000000 +0000
+--- main/CMakeLists.txt.orig	2024-05-15 13:01:44.837890255 +0000
 +++ main/CMakeLists.txt
-@@ -198,3 +198,5 @@ install(FILES
- DESTINATION
-     ${ICON_INSTALL_DIR}/hicolor/scalable/status
- )
-+
+@@ -233,6 +233,8 @@ add_dependencies(dino ${GETTEXT_PACKAGE}
+ target_include_directories(dino PRIVATE src)
+ target_link_libraries(dino libdino ${MAIN_PACKAGES})
+ 
 +set_target_properties(dino PROPERTIES ENABLE_EXPORTS TRUE)
++
+ if(WIN32)
+     target_link_libraries(dino -mwindows)
+ endif(WIN32)


--_----------=_1715778673261550--