Bug#873872: font-manager FTBFS with vala 0.36

[Jeremy Bicha]

Dear maintainer,

I've prepared an NMU for font-manager (versioned as 0.7.3-1.1) to fix
this RC bug and uploaded it to DELAYED/9. Please feel free to tell me
if I should delay it longer.

https://bugs.debian.org/873872

Thanks,
Jeremy Bicha
From 985397017cda10c295ba951cac76c766a59639a0 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha 
Date: Wed, 20 Sep 2017 16:05:21 -0400
Subject: [PATCH 3/3] Finalize changelog

---
 debian/changelog | 9 +
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9a034a4..975424a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+font-manager (0.7.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add add-ref-keyword.patch, fix-incompatible-types.patch:
+- Backport git patches to fix build with vala 0.36 (Closes: #873872)
+  * Update Vcs fields
+
+ -- Jeremy Bicha   Wed, 20 Sep 2017 16:05:07 -0400
+
 font-manager (0.7.3-1) unstable; urgency=medium
 
   * Imported Upstream version 0.7.3:
-- 
2.14.1

Bug#873872: font-manager FTBFS with vala 0.36

[Jeremy Bicha]

Here's another patch to point the Vcs fields to the right location.

Thanks,
Jeremy Bicha
From 1430e4343939faf4306321968d94d1e64726a858 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha 
Date: Thu, 7 Sep 2017 10:53:45 -0400
Subject: [PATCH 2/2] Update Vcs fields

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 2531f07..998f085 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends:
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.8
 Homepage: http://fontmanager.github.io/
-Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/font-manager.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/font-manager.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/font-manager.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/font-manager.git
 
 Package: font-manager
 Architecture: any
-- 
2.14.1

Bug#873872: font-manager FTBFS with vala 0.36

[Jeremy Bicha]

Control: tags -1 patch

This issue was fixed in Ubuntu by backporting 2 patches from git
master. I'm attaching a patch for you.

Thanks,
Jeremy Bicha
From aff0551a3427a223e96f4c78dd860dbcd1703dc7 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha 
Date: Thu, 7 Sep 2017 10:48:24 -0400
Subject: [PATCH] Backport 2 git patches to fix build with vala 0.36

Closes: #873872
---
 debian/patches/add-ref-keyword.patch| 35 +
 debian/patches/fix-incompatible-types.patch | 24 
 debian/patches/series   |  2 ++
 3 files changed, 61 insertions(+)
 create mode 100644 debian/patches/add-ref-keyword.patch
 create mode 100644 debian/patches/fix-incompatible-types.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/add-ref-keyword.patch b/debian/patches/add-ref-keyword.patch
new file mode 100644
index 000..734a955
--- /dev/null
+++ b/debian/patches/add-ref-keyword.patch
@@ -0,0 +1,35 @@
+From 0bb30410cc882dab7836d18baa5b987bcf63d96b Mon Sep 17 00:00:00 2001
+From: Andrew Low 
+Date: Fri, 12 May 2017 16:23:25 +0100
+Subject: [PATCH] vala 0.36 requires ref keyword in function param (#33)
+
+* vala 0.36 requires ref keyword in function param
+
+* wrap with if clauses for maximum support
+---
+ src/font-manager/Compare.vala | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/font-manager/Compare.vala b/src/font-manager/Compare.vala
+index 841243e..9246d18 100755
+--- a/src/font-manager/Compare.vala
 b/src/font-manager/Compare.vala
+@@ -280,9 +280,17 @@ namespace FontManager {
+  * the iter was always being set to null after calling remove.
+  */
+ string iter_as_string = store.get_string_from_iter(iter);
++#if VALA_0_36
++store.remove(ref iter);
++#else
+ store.remove(iter);
++#endif
+ store.get_iter_from_string(out iter, iter_as_string);
++#if VALA_0_36
++bool still_valid = store.remove(ref iter);
++#else
+ bool still_valid = store.remove(iter);
++#endif
+ /* Set the cursor to a remaining row instead of having the cursor disappear.
+  * This allows for easy deletion of multiple previews by hitting the remove
+  * button repeatedly.
+
diff --git a/debian/patches/fix-incompatible-types.patch b/debian/patches/fix-incompatible-types.patch
new file mode 100644
index 000..ad8f479
--- /dev/null
+++ b/debian/patches/fix-incompatible-types.patch
@@ -0,0 +1,24 @@
+From b39c4969a80b643ac0eabbb7ea0ae75dca76c257 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz 
+Date: Thu, 16 Feb 2017 16:30:50 +0100
+Subject: [PATCH] Fix incompatible types
+
+- Fixes build with valac 0.35.x
+---
+ lib/UX/Models/CollectionModel.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/UX/Models/CollectionModel.vala b/lib/UX/Models/CollectionModel.vala
+index 841b9e5..6dc8685 100755
+--- a/lib/UX/Models/CollectionModel.vala
 b/lib/UX/Models/CollectionModel.vala
+@@ -104,7 +104,7 @@ namespace FontManager {
+ return sorted;
+ }
+ 
+-void insert_children (Gee.ArrayList  groups, Gtk.TreeIter parent) {
++void insert_children (Gee.ArrayList  groups, Gtk.TreeIter parent) {
+ var sorted = sort_groups(groups);
+ foreach(var child in sorted) {
+ Gtk.TreeIter _iter;
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..35593d9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+add-ref-keyword.patch
+fix-incompatible-types.patch
-- 
2.14.1

Bug#873872: font-manager FTBFS with vala 0.36

[Adrian Bunk]

Source: font-manager
Version: 0.7.3-1
Severity: serious
Tags: buster sid

https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/font-manager.html

...
UX/Models/CollectionModel.vala:108.38-108.43: error: Argument 1: Cannot convert 
from `Gee.ArrayList' to 
`Gee.Collection'
var sorted = sort_groups(groups);
 ^^
Compilation failed: 1 error(s), 0 warning(s)
Makefile:2116: recipe for target 'libfontmanager_la_vala.stamp' failed
make[2]: *** [libfontmanager_la_vala.stamp] Error 1