[gentoo-commits] repo/gentoo:master commit in: net-im/dino/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/dino/files/

[Conrad Kostecki]

commit:     0bec45d1980d33b086b536ff998925fd8431008d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Oct 31 18:47:42 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 12:05:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bec45d1

net-im/dino: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-im/dino/files/dino-0.4.3-c99.patch        | 57 ---------------------------
 net-im/dino/files/dino-0.4.3-vala-gpgme.patch | 32 ---------------
 2 files changed, 89 deletions(-)

diff --git a/net-im/dino/files/dino-0.4.3-c99.patch b/net-im/dino/files/dino-0.4.3-c99.patch
deleted file mode 100644
index d21ff5e4adec..000000000000
--- a/net-im/dino/files/dino-0.4.3-c99.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/926073
-https://github.com/dino/dino/commit/0c45387bf903e5b0d02502d27642dd2a78aa6539
-
-From 0c45387bf903e5b0d02502d27642dd2a78aa6539 Mon Sep 17 00:00:00 2001
-From: fiaxh <git@lightrise.org>
-Date: Sat, 7 Oct 2023 13:56:38 +0200
-Subject: [PATCH] Fix implicit-function-declaration compiler warnings
-
---- a/xmpp-vala/src/module/xep/0384_omemo/omemo_encryptor.vala
-+++ b/xmpp-vala/src/module/xep/0384_omemo/omemo_encryptor.vala
-@@ -72,27 +72,27 @@ namespace Xmpp.Xep.Omemo {
-     }
- 
-     public class EncryptionResult {
--        public int lost { get; internal set; }
--        public int success { get; internal set; }
--        public int unknown { get; internal set; }
--        public int failure { get; internal set; }
-+        public int lost { get; set; }
-+        public int success { get; set; }
-+        public int unknown { get; set; }
-+        public int failure { get; set; }
-     }
- 
-     public class EncryptState {
--        public bool encrypted { get; internal set; }
--        public int other_devices { get; internal set; }
--        public int other_success { get; internal set; }
--        public int other_lost { get; internal set; }
--        public int other_unknown { get; internal set; }
--        public int other_failure { get; internal set; }
--        public int other_waiting_lists { get; internal set; }
--
--        public int own_devices { get; internal set; }
--        public int own_success { get; internal set; }
--        public int own_lost { get; internal set; }
--        public int own_unknown { get; internal set; }
--        public int own_failure { get; internal set; }
--        public bool own_list { get; internal set; }
-+        public bool encrypted { get; set; }
-+        public int other_devices { get; set; }
-+        public int other_success { get; set; }
-+        public int other_lost { get; set; }
-+        public int other_unknown { get; set; }
-+        public int other_failure { get; set; }
-+        public int other_waiting_lists { get; set; }
-+
-+        public int own_devices { get; set; }
-+        public int own_success { get; set; }
-+        public int own_lost { get; set; }
-+        public int own_unknown { get; set; }
-+        public int own_failure { get; set; }
-+        public bool own_list { get; set; }
- 
-         public void add_result(EncryptionResult enc_res, bool own) {
-             if (own) {
-

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
deleted file mode 100644
index fa609a97d88d..000000000000
--- a/net-im/dino/files/dino-0.4.3-vala-gpgme.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-