From 08aa35caa57df6b84b86e0b08f67f41ea7dc99c1 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Sat, 12 Sep 2020 14:24:37 -0700
Subject: [PATCH] temp/gnome-contacts: add patch to fix compilation on vala
 0.50.0 (MR 1546)

This patch is from upstream gnome-contacts:
https://gitlab.gnome.org/GNOME/gnome-contacts/-/commit/22ac2c6fecc98efd11d96dc3e04938b8777a3510

Purism doesn't have it in their fork:
https://source.puri.sm/Librem5/gnome-contacts/-/issues/43

[ci:skip-vercheck]: some of these have pkgrel>0 - let's keep that in
order to have less differences with v20.05.
[ci:skip-build]: generated log is too long, CI fails
---
 temp/gnome-contacts/APKBUILD                  | 10 +++++---
 .../Dont-use-unsupported-vala-syntax.patch    | 25 +++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 temp/gnome-contacts/Dont-use-unsupported-vala-syntax.patch

diff --git a/temp/gnome-contacts/APKBUILD b/temp/gnome-contacts/APKBUILD
index c05a89e72..4c50df87d 100644
--- a/temp/gnome-contacts/APKBUILD
+++ b/temp/gnome-contacts/APKBUILD
@@ -1,7 +1,7 @@
 # Forked from Alpine to apply Purism's mobile patches
 pkgname=gnome-contacts
 pkgver=9999_git20200619
-pkgrel=0
+pkgrel=1
 _commit="334f9cdb5173358221da9be5b83a796b1c285904"
 pkgdesc="A contacts manager for GNOME"
 url="https://wiki.gnome.org/Apps/Contacts"
@@ -12,7 +12,10 @@ makedepends="meson vala folks-dev libgee-dev glib-dev gnome-desktop-dev
 	libhandy-dev gtk+3.0-dev"
 checkdepends="appstream-glib desktop-file-utils"
 subpackages="$pkgname-lang $pkgname-doc"
-source="https://source.puri.sm/Librem5/gnome-contacts/-/archive/$_commit/gnome-contacts-$_commit.tar.bz2"
+source="
+	https://source.puri.sm/Librem5/gnome-contacts/-/archive/$_commit/gnome-contacts-$_commit.tar.bz2
+	Dont-use-unsupported-vala-syntax.patch
+	"
 builddir="$srcdir/$pkgname-$_commit"
 
 build() {
@@ -34,4 +37,5 @@ package() {
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
-sha512sums="c984391a9fe4fab76da168a521a08b3c2798d152266dfe1af7172dcb74c9fe3a0c41534dc55f41ebfca16ab24d928e12b19fd5b278136c5ab2945d810bd42cb8  gnome-contacts-334f9cdb5173358221da9be5b83a796b1c285904.tar.bz2"
+sha512sums="c984391a9fe4fab76da168a521a08b3c2798d152266dfe1af7172dcb74c9fe3a0c41534dc55f41ebfca16ab24d928e12b19fd5b278136c5ab2945d810bd42cb8  gnome-contacts-334f9cdb5173358221da9be5b83a796b1c285904.tar.bz2
+9b01a7ac134b254a4f240d77cb40384c59d47881b6dafaa53092ba8b254e58cb5e23f3e27c077d10c135c2648aff732b5708879485ac79310a49250c3116eba7  Dont-use-unsupported-vala-syntax.patch"
diff --git a/temp/gnome-contacts/Dont-use-unsupported-vala-syntax.patch b/temp/gnome-contacts/Dont-use-unsupported-vala-syntax.patch
new file mode 100644
index 000000000..fa51bd961
--- /dev/null
+++ b/temp/gnome-contacts/Dont-use-unsupported-vala-syntax.patch
@@ -0,0 +1,25 @@
+From 22ac2c6fecc98efd11d96dc3e04938b8777a3510 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Thu, 2 Jul 2020 15:34:42 +0200
+Subject: [PATCH] Don't use unsupported vala syntax
+
+---
+ src/contacts-avatar-utils.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/contacts-avatar-utils.vala b/src/contacts-avatar-utils.vala
+index 15e84164..c5c6d61d 100644
+--- a/src/contacts-avatar-utils.vala
++++ b/src/contacts-avatar-utils.vala
+@@ -126,7 +126,7 @@ namespace Contacts.AvatarUtils {
+ 
+   public Gdk.RGBA get_color_for_name(string name) {
+     // https://gitlab.gnome.org/Community/Design/HIG-app-icons/blob/master/GNOME%20HIG.gpl
+-    const double[,3] GNOME_COLOR_PALETTE = {
++    const double[,] GNOME_COLOR_PALETTE = {
+       {  98, 160, 234 },
+       {  53, 132, 228 },
+       {  28, 113, 216 },
+-- 
+GitLab
+