diff options
| author |   Sam James <sam@gentoo.org> | 2024-07-03 01:59:07 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-07-03 01:59:07 +0100 |
| commit | 17b280061ae4915912092cb9ea6c7a6b89f6c86b (patch) | |
| tree | a32003a8496d9c7bbe845d6975f4e180b6b1868a /net-im | |
| parent | cmake.eclass: fix copyright (diff) | |
| download | gentoo-17b280061ae4915912092cb9ea6c7a6b89f6c86b.tar.gz gentoo-17b280061ae4915912092cb9ea6c7a6b89f6c86b.tar.bz2 gentoo-17b280061ae4915912092cb9ea6c7a6b89f6c86b.zip | |
net-im/dino: backport new Vala compile fix
This is in 0.4.4 but let's backport it so we can stable it quickly.
Closes: https://bugs.gentoo.org/930539
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/dino/dino-0.4.3-r1.ebuild | 1 | ||||
| -rw-r--r-- | net-im/dino/files/dino-0.4.3-vala-gpgme.patch | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/net-im/dino/dino-0.4.3-r1.ebuild b/net-im/dino/dino-0.4.3-r1.ebuild index 0badcf1fd992..4f9c5a607668 100644 --- a/net-im/dino/dino-0.4.3-r1.ebuild +++ b/net-im/dino/dino-0.4.3-r1.ebuild @@ -63,6 +63,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-c99.patch + "${FILESDIR}"/${P}-vala-gpgme.patch ) src_configure() { diff --git a/net-im/dino/files/dino-0.4.3-vala-gpgme.patch b/net-im/dino/files/dino-0.4.3-vala-gpgme.patch new file mode 100644 index 000000000000..fa609a97d88d --- /dev/null +++ b/net-im/dino/files/dino-0.4.3-vala-gpgme.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/930539 +https://github.com/dino/dino/issues/1576 +https://github.com/dino/dino/commit/a90edd05389d2f8011eccda3acd5f24f3948b8b5 + +From a90edd05389d2f8011eccda3acd5f24f3948b8b5 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Sun, 28 Apr 2024 21:30:12 +0200 +Subject: [PATCH] Annotating with array_null_terminated doesn't imply a missing + array_length + +Taken from https://github.com/GNOME/vala-extra-vapis/commit/6b8a3e4faaabc462f90ffcb0cf0f91991ee58077 +--- + plugins/gpgme-vala/vapi/gpgme_public.vapi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi +index bcf125696..4f9010c98 100644 +--- a/plugins/gpgme-vala/vapi/gpgme_public.vapi ++++ b/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 + |