Index | Thread | Search

From:
Solene Rapenne <solene@perso.pw>
Subject:
unbreak net/dino
To:
Klemens Nanni <kn@openbsd.org>, ports@openbsd.org
Date:
Tue, 30 Apr 2024 15:52:14 +0200

Download raw body.

Thread
since kn@ reported dino build issue upstream, a fix was released

I adapted the fix to work on latest release because it was done
on a file that does not exist yet in the tarball (got renamed?)

tested on amd64, works fine again

make update-patches insisted to add the "No newline at end of file",
I'm not happy about it but I guess it's better to include it?

diff --git a/net/dino/Makefile b/net/dino/Makefile
index 2ca126f6482..abc2a214758 100644
--- a/net/dino/Makefile
+++ b/net/dino/Makefile
@@ -1,5 +1,3 @@
-BROKEN=	build failure with vala-0.56.17 https://github.com/dino/dino/issues/1576
-
 COMMENT=	XMPP desktop client
 VERSION=	0.4.3
 DISTNAME=	dino-${VERSION}
diff --git a/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi b/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi
new file mode 100644
index 00000000000..c72bc260f95
--- /dev/null
+++ b/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi
@@ -0,0 +1,25 @@
+Fix to build dino since vala-c 0.56.17
+https://github.com/dino/dino/issues/1576
+
+Index: plugins/gpgme-vala/vapi/gpgme_public.vapi
+--- plugins/gpgme-vala/vapi/gpgme_public.vapi.orig
++++ plugins/gpgme-vala/vapi/gpgme_public.vapi
+@@ -22,9 +22,9 @@ public class Key {
+     public string issuer_name;
+     public string chain_id;
+     public Validity owner_trust;
+-    [CCode(array_null_terminated = true)]
++    [CCode(array_length = false, array_null_terminated = true)]
+     public SubKey[] subkeys;
+-    [CCode(array_null_terminated = true)]
++    [CCode(array_length = false, array_null_terminated = true)]
+     public UserID[] uids;
+     public KeylistMode keylist_mode;
+     // public string fpr; // requires gpgme >= 1.7.0
+@@ -159,4 +159,4 @@ public enum Validity {
+     ULTIMATE
+ }
+ 
+-}
+\ No newline at end of file
++}