summaryrefslogtreecommitdiff
path: root/mail-client/geary/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail-client/geary/files')
-rw-r--r--mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch38
-rw-r--r--mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch40
-rw-r--r--mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch25
3 files changed, 103 insertions, 0 deletions
diff --git a/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch b/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch
new file mode 100644
index 000000000000..5c01bf9a32f7
--- /dev/null
+++ b/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch
@@ -0,0 +1,38 @@
+From 8fb10db1de1fac2ca99fab246a276620ffd6f02b Mon Sep 17 00:00:00 2001
+From: Richard Adenling <dreeze@gmail.com>
+Date: Tue, 10 May 2022 21:18:01 +0200
+Subject: [PATCH] Correct the conditional comments in the test data
+
+This fixes the problem with libxml2 2.9.14 not considering <![ to be a
+valid way to open a tag anymore.
+
+Closes #1367
+---
+ test/engine/rfc822/rfc822-message-data-test.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/engine/rfc822/rfc822-message-data-test.vala b/test/engine/rfc822/rfc822-message-data-test.vala
+index 613e4b9a..d5e25ea0 100644
+--- a/test/engine/rfc822/rfc822-message-data-test.vala
++++ b/test/engine/rfc822/rfc822-message-data-test.vala
+@@ -763,7 +763,7 @@ ttp://p.ebaystatic.com/aw/email/Welcome_Day_0/spacer.gif" width=3D"5" heigh=
+ t=3D"1" alt=3D"" border=3D"0" style=3D"display:block; width: 5px !important=
+ "></td>
+ </tr>
+-<![if ! gte mso 9]>
++<!--[if ! gte mso 9]>
+ <tr>
+ <td style=3D"border-collapse: collapse !important;
+ border-spacing: 0; !important; padding: 0"><img src=3D"http://p.ebaystatic.=
+@@ -803,7 +803,7 @@ ttp://p.ebaystatic.com/aw/email/Welcome_Day_0/spacer.gif" width=3D"5" heigh=
+ t=3D"1" alt=3D"" border=3D"0" style=3D"display:block; width: 5px !important=
+ "></td>
+ </tr>
+-<![if ! gte mso 9]>
++<!--[if ! gte mso 9]>
+ <tr>
+ <td style=3D"border-collapse: collapse !important;
+ border-spacing: 0; !important; padding: 0"><img src=3D"http://p.ebaystatic.=
+--
+2.35.1
+
diff --git a/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
new file mode 100644
index 000000000000..3772fe81c99a
--- /dev/null
+++ b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
@@ -0,0 +1,40 @@
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:31:31 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/client/application/application-client.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
+index 6ce19ce2..e6ba8533 100644
+--- a/src/client/application/application-client.vala
++++ b/src/client/application/application-client.vala
+@@ -8,16 +8,16 @@
+
+ // Defined by CMake build script.
+ extern const string GETTEXT_PACKAGE;
+-extern const string _APP_ID;
+-extern const string _BUILD_ROOT_DIR;
+-extern const string _GSETTINGS_DIR;
+-extern const string _INSTALL_PREFIX;
+-extern const string _NAME_SUFFIX;
++public extern const string _APP_ID;
++public extern const string _BUILD_ROOT_DIR;
++public extern const string _GSETTINGS_DIR;
++public extern const string _INSTALL_PREFIX;
++public extern const string _NAME_SUFFIX;
+ extern const string _PLUGINS_DIR;
+ extern const string _PROFILE;
+ extern const string _REVNO;
+-extern const string _SOURCE_ROOT_DIR;
+-extern const string _VERSION;
++public extern const string _SOURCE_ROOT_DIR;
++public extern const string _VERSION;
+ extern const string _WEB_EXTENSIONS_DIR;
+
+
+--
+2.35.1
+
diff --git a/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
new file mode 100644
index 000000000000..4b9ecbec18b5
--- /dev/null
+++ b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
@@ -0,0 +1,25 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 30 Jan 2022 19:54:11 +0100
+Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
+
+---
+ src/client/util/util-cache.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
+index f054e32e..ecc275e8 100644
+--- a/src/client/util/util-cache.vala
++++ b/src/client/util/util-cache.vala
+@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
+ private class CacheEntry<T> {
+
+
+- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
++ public static int lru_compare(CacheEntry a, CacheEntry b) {
+ if (a.key == b.key) {
+ return 0;
+ }
+--
+2.35.1
+