From a54614e80a0b40331fa49953f86384962e059d79 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 16 Jun 2017 22:44:32 -0400
Subject: [PATCH 2/3] Fix build with vala 0.36
Closes: #864916
---
debian/patches/0015-Fix-build-with-vala-0.36.patch | 43 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 44 insertions(+)
create mode 100644 debian/patches/0015-Fix-build-with-vala-0.36.patch
diff --git a/debian/patches/0015-Fix-build-with-vala-0.36.patch b/debian/patches/0015-Fix-build-with-vala-0.36.patch
new file mode 100644
index 0000000..912db08
--- /dev/null
+++ b/debian/patches/0015-Fix-build-with-vala-0.36.patch
@@ -0,0 +1,43 @@
+From 9f90412582145f55933408e372f6fa598226ebe4 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbi...@ubuntu.com>
+Date: Fri, 16 Jun 2017 22:38:03 -0400
+Subject: [PATCH] Fix build with vala 0.36
+
+---
+ src/browsers/gmpc-metadata-browser2.vala | 6 +++++-
+ src/browsers/gmpc-nowplaying2.vala | 4 ++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/browsers/gmpc-metadata-browser2.vala b/src/browsers/gmpc-metadata-browser2.vala
+index 704bc01..99ab84d 100644
+--- a/src/browsers/gmpc-metadata-browser2.vala
++++ b/src/browsers/gmpc-metadata-browser2.vala
+@@ -2691,7 +2691,11 @@ public class Gmpc.Browsers.Metadata : Gmpc.Plugin.Base, Gmpc.Plugin.BrowserIfac
+ Gtk.TreeIter iter;
+ if(model.get_iter(out iter, path))
+ {
+- model.remove(iter);
++#if VALA_0_36
++ model.remove(ref iter);
++#else
++ model.remove(iter);
++#endif
+ }
+ }
+ rref = null;
+diff --git a/src/browsers/gmpc-nowplaying2.vala b/src/browsers/gmpc-nowplaying2.vala
+index 5be7d32..6b41398 100644
+--- a/src/browsers/gmpc-nowplaying2.vala
++++ b/src/browsers/gmpc-nowplaying2.vala
+@@ -100,7 +100,11 @@ namespace Gmpc {
+ Gtk.TreeIter iter;
+ if(model.get_iter(out iter, path))
+ {
++#if VALA_0_36
++ model.remove(ref iter);
++#else
+ model.remove(iter);
++#endif
+ }
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 48d9958..8521186 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
0012-Disable-htbackdrops-plugin.patch
0013-Link-with-math.patch
0014-Updates-for-vala-0.18.patch
+0015-Fix-build-with-vala-0.36.patch
--
2.11.0
From 89b3de722f0b2b4a638f2cf63d0c91e7733e558f Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 16 Jun 2017 23:10:22 -0400
Subject: [PATCH 3/3] Add generated files to POTFILES.skip
---
...0016-Add-generated-files-to-POTFILES.skip.patch | 25 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 26 insertions(+)
create mode 100644 debian/patches/0016-Add-generated-files-to-POTFILES.skip.patch
diff --git a/debian/patches/0016-Add-generated-files-to-POTFILES.skip.patch b/debian/patches/0016-Add-generated-files-to-POTFILES.skip.patch
new file mode 100644
index 0000000..2d12004
--- /dev/null
+++ b/debian/patches/0016-Add-generated-files-to-POTFILES.skip.patch
@@ -0,0 +1,25 @@
+From 8a0fdde23e4b61908ff85ed87b38918732195eb0 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbi...@ubuntu.com>
+Date: Fri, 16 Jun 2017 23:08:21 -0400
+Subject: [PATCH] Add generated files to POTFILES.skip
+
+---
+ po/POTFILES.skip | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index a2e331f..acc3cde 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -8,3 +8,8 @@ src/gmpc-clicklabel.c
+ src/gmpc-meta-watcher.c
+ src/gmpc-profiles.c
+ src/gmpc-stats-label.c
++src/Providers/ChartLyrics.c
++src/Providers/HTBackdrops.c
++src/Providers/LyrDB.c
++src/Providers/RenderCover.c
++
+--
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 8521186..6d48a24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
0013-Link-with-math.patch
0014-Updates-for-vala-0.18.patch
0015-Fix-build-with-vala-0.36.patch
+0016-Add-generated-files-to-POTFILES.skip.patch
--
2.11.0
