net-im/purple-gowhatsapp: Update to 1.15.0

PR:		279342

3 files changed, 59 insertions, 51 deletions

diff --git a/net-im/purple-gowhatsapp/Makefile b/net-im/purple-gowhatsapp/Makefile
index 1fe761c10052..402bdf5ed9bb 100644
--- a/net-im/purple-gowhatsapp/Makefile
+++ b/net-im/purple-gowhatsapp/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	purple-gowhatsapp
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.13.0
-PORTREVISION=	6
+DISTVERSION=	1.15.0
 CATEGORIES=	net-im
 
 MAINTAINER=	ports@virtual-estates.net
@@ -15,9 +14,11 @@ LIB_DEPENDS=	libpurple.so:net-im/libpurple	\
 		libopusfile.so:audio/opusfile
 
 USES=		go:no_targets cmake dos2unix localbase:ldflags pkgconfig
+USES+=		gnome gettext-runtime
+USE_GNOME=	gdkpixbuf2 glib20
 
 OPTIONS_MULTI=			DB-backend
-OPTIONS_MULTI_DB-backend=	SQLITE3 PGSQL MYSQL
+OPTIONS_MULTI_DB-backend=	SQLITE3 PGSQL
 OPTIONS_DEFAULT=SQLITE3
 .for o in ${OPTIONS_MULTI_DB-backend}
 $o_DESC=	Support use of $o for storing account information
@@ -33,32 +34,35 @@ EXTRACT_AFTER_ARGS=--exclude vendor
 MAKE_ENV+=	${GO_ENV}
 
 GH_TUPLE=	\
-		FiloSottile:edwards25519:v1.0.0:filosottile_edwards25519/vendor/filippo.io/edwards25519 \
+		FiloSottile:edwards25519:v1.1.0:FiloSottile_edwards25519/vendor/filippo.io/edwards25519 \
 		alfg:mp4:55ea58c08aeb:alfg_mp4/vendor/github.com/alfg/mp4 \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		google:go-cmp:v0.5.9:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:go-cmp:v0.6.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		gorilla:websocket:v1.5.1:gorilla_websocket/vendor/github.com/gorilla/websocket \
 		mdp:qrterminal:v3.2.0:mdp_qrterminal/vendor/github.com/mdp/qrterminal \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		skip2:go-qrcode:da1b6568686e:skip2_go_qrcode/vendor/github.com/skip2/go-qrcode \
-		stretchr:testify:v1.8.4:stretchr_testify/vendor/github.com/stretchr/testify \
+		stretchr:testify:v1.9.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		tulir:libsignal-protocol-go:v0.1.0:tulir_libsignal_protocol_go/vendor/go.mau.fi/libsignal \
-		mautrix:go-util:v0.3.0:mautrix_go_util/vendor/go.mau.fi/util \
-		tulir:whatsmeow:66c756f1ba45:tulir_whatsmeow/vendor/go.mau.fi/whatsmeow \
-		golang:crypto:v0.18.0:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:v0.20.0:golang_net/vendor/golang.org/x/net \
-		golang:sys:v0.16.0:golang_sys/vendor/golang.org/x/sys \
-		golang:term:v0.16.0:golang_term/vendor/golang.org/x/term \
-		golang:text:v0.14.0:golang_text/vendor/golang.org/x/text \
-		golang:xerrors:9bdfabe68543:golang_xerrors/vendor/golang.org/x/xerrors \
-		protocolbuffers:protobuf-go:v1.32.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		mattn:go-colorable:v0.1.13:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mautrix:go-util:v0.4.2:mautrix_go_util/vendor/go.mau.fi/util \
+		tulir:whatsmeow:7f13c31:tulir_whatsmeow/vendor/go.mau.fi/whatsmeow \
+		golang:crypto:v0.23.0:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:v0.25.0:golang_net/vendor/golang.org/x/net \
+		golang:sys:v0.20.0:golang_sys/vendor/golang.org/x/sys \
+		golang:term:v0.20.0:golang_term/vendor/golang.org/x/term \
+		golang:text:v0.15.0:golang_text/vendor/golang.org/x/text \
+		golang:xerrors:104605ab7028:golang_xerrors/vendor/golang.org/x/xerrors \
+		google:uuid:v1.6.0:google_uuid/vendor/github.com/google/uuid \
+		protocolbuffers:protobuf-go:v1.34.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
+		rs:zerolog:v1.33.0:rs_zerolog/vendor/github.com/rs/zerolog \
 		rsc:qr:v0.2.0:rsc_qr/vendor/rsc.io/qr
 
 SQLITE3_GH_TUPLE=\
 		mattn:go-sqlite3:v1.14.19:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3
 PGSQL_GH_TUPLE=	lib:pq:v1.10.9:lib_pq/vendor/github.com/lib/pq
-MYSQL_GH_TUPLE=	go-sql-driver:mysql:v1.7.1:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql
 
 CMAKE_ARGS=	-DPURPLE_INCLUDE_DIRS=${LOCALBASE}/include/libpurple	\
 		-DPURPLE_LIBRARY_DIRS=${LOCALBASE}/lib	\
@@ -66,7 +70,7 @@ CMAKE_ARGS=	-DPURPLE_INCLUDE_DIRS=${LOCALBASE}/include/libpurple	\
 		-DPURPLE_DATA_DIR=${PREFIX}/share
 
 post-configure:
-	${MKDIR} ${CONFIGURE_WRKSRC}/src/go/go
-	${LN} -sf ${WRKSRC}/vendor ${CONFIGURE_WRKSRC}/src/go/go/src
+	${MKDIR} ${CONFIGURE_WRKSRC}/src/go/_go
+	${LN} -sf ${WRKSRC}/vendor ${CONFIGURE_WRKSRC}/src/go/_go/src
 
 .include <bsd.port.mk>
diff --git a/net-im/purple-gowhatsapp/distinfo b/net-im/purple-gowhatsapp/distinfo
index 096a3accf2af..7643d387ce02 100644
--- a/net-im/purple-gowhatsapp/distinfo
+++ b/net-im/purple-gowhatsapp/distinfo
@@ -1,50 +1,56 @@
-TIMESTAMP = 1705857834
-SHA256 (hoehermann-purple-gowhatsapp-v1.13.0_GH0.tar.gz) = 153229acd476ff1f98497074402944869c73e85ad06d6cfa8529bf4861960c96
-SIZE (hoehermann-purple-gowhatsapp-v1.13.0_GH0.tar.gz) = 140285
-SHA256 (FiloSottile-edwards25519-v1.0.0_GH0.tar.gz) = 05d9c82855140397e949e13aac20194c5dd17d2c9a3e6887765bf4e7c46e1c39
-SIZE (FiloSottile-edwards25519-v1.0.0_GH0.tar.gz) = 39883
+TIMESTAMP = 1716772028
+SHA256 (hoehermann-purple-gowhatsapp-v1.15.0_GH0.tar.gz) = 4907bd3c141cf18d5460af5c11d26c2b7f27442c36d006bd0d4d369d4e769235
+SIZE (hoehermann-purple-gowhatsapp-v1.15.0_GH0.tar.gz) = 146238
+SHA256 (FiloSottile-edwards25519-v1.1.0_GH0.tar.gz) = b480c71e26d7a65e468a4f0cc2a414302dc89c6be4e58fe34779b0c9f12cac60
+SIZE (FiloSottile-edwards25519-v1.1.0_GH0.tar.gz) = 47125
 SHA256 (alfg-mp4-55ea58c08aeb_GH0.tar.gz) = 1c2c9140d7650aaa7384b8ff1099ee698c933f814fd89d2aeb858db1cb3e6be6
 SIZE (alfg-mp4-55ea58c08aeb_GH0.tar.gz) = 2883648
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (google-go-cmp-v0.6.0_GH0.tar.gz) = d14f7d57b0f6d25771bee3d7d5d038f532539e71bfc934772b1c0467ab90fa86
+SIZE (google-go-cmp-v0.6.0_GH0.tar.gz) = 104784
 SHA256 (gorilla-websocket-v1.5.1_GH0.tar.gz) = b8c9f291d12c1b2fcbc64b4862bead21d709c2884fe4b3e35ae1e5485c039d8d
 SIZE (gorilla-websocket-v1.5.1_GH0.tar.gz) = 61416
-SHA256 (google-go-cmp-v0.5.9_GH0.tar.gz) = 41a074c2fcfc72f813736f8ca8e3116e260a6b79af407d9da0d4c5e4c3f61acf
-SIZE (google-go-cmp-v0.5.9_GH0.tar.gz) = 104427
 SHA256 (mdp-qrterminal-v3.2.0_GH0.tar.gz) = 3eee590ea7f2798def75a77c51b68e033d4a38846885d30f04f090e3d1b36b47
 SIZE (mdp-qrterminal-v3.2.0_GH0.tar.gz) = 25348
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (skip2-go-qrcode-da1b6568686e_GH0.tar.gz) = af179c37da861a43242fb4383186724b34866d7b5bd3e54ca44031a2b9f92046
 SIZE (skip2-go-qrcode-da1b6568686e_GH0.tar.gz) = 36693
-SHA256 (stretchr-testify-v1.8.4_GH0.tar.gz) = 0d3e82b04a05d9428a2a2aec8776bd0a07f14f5d1b4fa0a3676526ca8259fd62
-SIZE (stretchr-testify-v1.8.4_GH0.tar.gz) = 104427
+SHA256 (stretchr-testify-v1.9.0_GH0.tar.gz) = ee651d4d4427d55096007190398102383498e6b5cf97ea9e89ad6e72b4115fbb
+SIZE (stretchr-testify-v1.9.0_GH0.tar.gz) = 108663
 SHA256 (tulir-libsignal-protocol-go-v0.1.0_GH0.tar.gz) = a4cd4c0bf5f6736ce0a2cac6cfdb89049c765c24e79b791e9696056fe73ed990
 SIZE (tulir-libsignal-protocol-go-v0.1.0_GH0.tar.gz) = 78276
-SHA256 (mautrix-go-util-v0.3.0_GH0.tar.gz) = 0cde4bc98c95186ce619e89daf444a8743fcdd4c3d598a4ff2953c3e12f51762
-SIZE (mautrix-go-util-v0.3.0_GH0.tar.gz) = 47949
-SHA256 (tulir-whatsmeow-66c756f1ba45_GH0.tar.gz) = 927b8dcd214cc0fef1a58a34749d5519558533fc037b9f13a10ed191be591db7
-SIZE (tulir-whatsmeow-66c756f1ba45_GH0.tar.gz) = 312996
-SHA256 (golang-crypto-v0.18.0_GH0.tar.gz) = 65cc44408170afc3f58d242ec1bf5c2ded68ae9d0847652eb3dca51a86ff7c34
-SIZE (golang-crypto-v0.18.0_GH0.tar.gz) = 1809280
-SHA256 (golang-net-v0.20.0_GH0.tar.gz) = bae5107274cce60331dbc29301657afd86e5fb92a2e545f159e992eda8a9133d
-SIZE (golang-net-v0.20.0_GH0.tar.gz) = 1486820
-SHA256 (golang-sys-v0.16.0_GH0.tar.gz) = 9c17b728aa75f4fc4743c3f5c0dccdc3b7f9ac7c12b3124b666672cc571f657e
-SIZE (golang-sys-v0.16.0_GH0.tar.gz) = 1444155
-SHA256 (golang-term-v0.16.0_GH0.tar.gz) = ef42ee56088af7aaa2135998e9ac08514133621e0b368c26ddef7eb737f892f6
-SIZE (golang-term-v0.16.0_GH0.tar.gz) = 14735
-SHA256 (golang-text-v0.14.0_GH0.tar.gz) = c80295e75bda599d17ccf74038139b0957b9915fae4e60d8b46f89454ef171a0
-SIZE (golang-text-v0.14.0_GH0.tar.gz) = 8974094
-SHA256 (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 54bb4d99e6cba2e3e5331d064f46640cc01a0e630ee6a684ae810bd94a7e4eb7
-SIZE (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 13657
-SHA256 (protocolbuffers-protobuf-go-v1.32.0_GH0.tar.gz) = 816e0babc183807928c4ede81999dc1e33bfe6e7eca9ccebe0409974e68559db
-SIZE (protocolbuffers-protobuf-go-v1.32.0_GH0.tar.gz) = 1324049
+SHA256 (mattn-go-colorable-v0.1.13_GH0.tar.gz) = c3b62c76d365906bba9aa9d9ec048fd33a2a5742299d6482a08e7466d4c52d77
+SIZE (mattn-go-colorable-v0.1.13_GH0.tar.gz) = 9762
+SHA256 (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 18fc42a278e60fb7a1dffa72f20539ae88d0e292db55b513ef514b7d369883a6
+SIZE (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 4713
+SHA256 (mautrix-go-util-v0.4.2_GH0.tar.gz) = 363123533198a5b7c171dd4be6e65226971e11730c363411dfca486c13a8b5e4
+SIZE (mautrix-go-util-v0.4.2_GH0.tar.gz) = 54815
+SHA256 (tulir-whatsmeow-7f13c31_GH0.tar.gz) = f5958a59ba5acea21c1cb034b743d699884653dcc55943e7e9191eff5bc54adc
+SIZE (tulir-whatsmeow-7f13c31_GH0.tar.gz) = 430438
+SHA256 (golang-crypto-v0.23.0_GH0.tar.gz) = e6cfbf5f44d6b89b748c87fdbabd04c9634c5b825e39032a69854c300be9fb43
+SIZE (golang-crypto-v0.23.0_GH0.tar.gz) = 1813872
+SHA256 (golang-net-v0.25.0_GH0.tar.gz) = aadaa826201391d12437e61b1680276ce4a270439f8f390af7f506fd0e499f64
+SIZE (golang-net-v0.25.0_GH0.tar.gz) = 1510596
+SHA256 (golang-sys-v0.20.0_GH0.tar.gz) = eb2569cab8d7a92ce3afa9119538b61fc03d575c01f1548ec1e152c330ac591d
+SIZE (golang-sys-v0.20.0_GH0.tar.gz) = 1494604
+SHA256 (golang-term-v0.20.0_GH0.tar.gz) = 24181920eafbcd9e9e550a1cc829cb6edeec0d70e3c2c59610b86c3472959a1e
+SIZE (golang-term-v0.20.0_GH0.tar.gz) = 14741
+SHA256 (golang-text-v0.15.0_GH0.tar.gz) = 6b3893012ab61dacc64efc47574b2554e4cfbeb5e453a3b39e500713614cd63d
+SIZE (golang-text-v0.15.0_GH0.tar.gz) = 8974475
+SHA256 (golang-xerrors-104605ab7028_GH0.tar.gz) = b1c0f6912b3bd5ad711e5bce41a5ba64ff839416f4b85231f8d457e8817954c0
+SIZE (golang-xerrors-104605ab7028_GH0.tar.gz) = 13742
+SHA256 (google-uuid-v1.6.0_GH0.tar.gz) = ee63376b5675376c60e055ed66e5f3651ccc703bd580c022b8ad00cea309252d
+SIZE (google-uuid-v1.6.0_GH0.tar.gz) = 20896
+SHA256 (protocolbuffers-protobuf-go-v1.34.1_GH0.tar.gz) = 8aff9ec0c28a926daeedb1ce1f87a284e22fc5a892e9e5f7c850881137c85000
+SIZE (protocolbuffers-protobuf-go-v1.34.1_GH0.tar.gz) = 1507906
 SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5
 SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173
+SHA256 (rs-zerolog-v1.33.0_GH0.tar.gz) = 7a32947b007164edb7a888048f8bec6d7de9cf503e79e099d6b6814fad0f6ac7
+SIZE (rs-zerolog-v1.33.0_GH0.tar.gz) = 216046
 SHA256 (rsc-qr-v0.2.0_GH0.tar.gz) = a39800570e994df470ff3917b2131d80829ae447d3aac794034ef87cb93d1a66
 SIZE (rsc-qr-v0.2.0_GH0.tar.gz) = 18808
-SHA256 (go-sql-driver-mysql-v1.7.1_GH0.tar.gz) = c6aaf1309cbeabdc43414a1230257b8943800643c581a3e2211d1efd5495a9c2
-SIZE (go-sql-driver-mysql-v1.7.1_GH0.tar.gz) = 95747
 SHA256 (lib-pq-v1.10.9_GH0.tar.gz) = b150b286d59b5f0bdde499112e2f01881773ff5bfdff023802e9e01b7314a06f
 SIZE (lib-pq-v1.10.9_GH0.tar.gz) = 114490
 SHA256 (mattn-go-sqlite3-v1.14.19_GH0.tar.gz) = 883841af9b993c6f297c8974ea992540cd9aa525b42ff7d874ff6d31be00e643
diff --git a/net-im/purple-gowhatsapp/files/patch-configure b/net-im/purple-gowhatsapp/files/patch-configure
index 327bd7a9b6b3..1a9382950c20 100644
--- a/net-im/purple-gowhatsapp/files/patch-configure
+++ b/net-im/purple-gowhatsapp/files/patch-configure
@@ -11,18 +11,16 @@
 -include(cpack.cmake)
 --- src/go/go.mod.in	2023-09-01 16:15:26.000000000 -0400
 +++ src/go/go.mod.in	2024-01-19 23:14:27.315646000 -0500
-@@ -2,13 +2,2 @@
+@@ -2,11 +2,2 @@
  
- go 1.18
+ go 1.21
 -
 -require (
 -	github.com/alfg/mp4 v0.0.0-20210728035756-55ea58c08aeb
--	github.com/go-sql-driver/mysql v1.6.0
 -	github.com/lib/pq v1.10.4
 -	github.com/mattn/go-sqlite3 v1.14.10
 -	github.com/mdp/qrterminal/v3 v3.0.0
 -	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
--	golang.org/x/net v0.5.0 
 -	go.mau.fi/whatsmeow latest
 -)
 --- src/go/CMakeLists.txt	2023-09-01 16:15:26.000000000 -0400