Commit 16bd72d8 authored by Jeremy Bicha's avatar Jeremy Bicha

Add 002-fix-build-with-vala36.patch

Closes: #873867
parent 27537b13
rygel (0.32.1-4) UNRELEASED; urgency=medium
rygel (0.32.1-5) UNRELEASED; urgency=medium
[ Andreas Henriksson ]
* Fix rygel.trigger to be interested in correct plugin path
-- Andreas Henriksson <andreas@fatal.se> Tue, 20 Jun 2017 10:27:11 +0200
[ Jeremy Bicha ]
* Add 002-fix-build-with-vala36.patch (Closes: #873867)
-- Jeremy Bicha <jbicha@debian.org> Wed, 13 Sep 2017 16:44:22 -0400
rygel (0.32.1-3) unstable; urgency=medium
......
From: Jens Georg <mail@jensge.org>
Date: Fri, 24 Feb 2017 20:12:27 +0100
Subject: ui: Fix for upcoming Vala 0.36
Signed-off-by: Jens Georg <mail@jensge.org>
---
src/librygel-server/rygel-http-time-seek-response.vala | 6 +++---
src/plugins/external/rygel-external-variant-util.vala | 2 +-
src/ui/rygel-media-pref-section.vala | 4 ++++
src/ui/rygel-network-pref-section.vala | 8 ++++++++
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/librygel-server/rygel-http-time-seek-response.vala b/src/librygel-server/rygel-http-time-seek-response.vala
index 4feb9af..9f0eb0c 100644
--- a/src/librygel-server/rygel-http-time-seek-response.vala
+++ b/src/librygel-server/rygel-http-time-seek-response.vala
@@ -160,9 +160,9 @@ public class Rygel.HTTPTimeSeekResponse : Rygel.HTTPResponseElement {
public HTTPTimeSeekResponse.from_request
(HTTPTimeSeekRequest time_seek_request,
int64 total_duration ) {
- HTTPTimeSeekResponse.time_only (time_seek_request.start_time,
- time_seek_request.end_time,
- total_duration );
+ this.time_only (time_seek_request.start_time,
+ time_seek_request.end_time,
+ total_duration);
}
public override void add_response_headers (Rygel.HTTPRequest request) {
diff --git a/src/plugins/external/rygel-external-variant-util.vala b/src/plugins/external/rygel-external-variant-util.vala
index 0e54f3e..f9cf125 100644
--- a/src/plugins/external/rygel-external-variant-util.vala
+++ b/src/plugins/external/rygel-external-variant-util.vala
@@ -19,7 +19,7 @@
*/
namespace Rygel.External {
- public static string MANDATORY_MISSING_MESSAGE =
+ public const string MANDATORY_MISSING_MESSAGE =
N_("External provider %s did not provide mandatory property \"%s\"");
public static Variant? get_mandatory
diff --git a/src/ui/rygel-media-pref-section.vala b/src/ui/rygel-media-pref-section.vala
index fae34f4..1b283cb 100644
--- a/src/ui/rygel-media-pref-section.vala
+++ b/src/ui/rygel-media-pref-section.vala
@@ -152,7 +152,11 @@ public class Rygel.MediaPrefSection : PreferencesSection {
var path = row_ref.get_path ();
this.liststore.get_iter (out iter, path);
+#if VALA_0_36
+ this.liststore.remove (ref iter);
+#else
this.liststore.remove (iter);
+#endif
}
}
diff --git a/src/ui/rygel-network-pref-section.vala b/src/ui/rygel-network-pref-section.vala
index e47f366..3e32d03 100644
--- a/src/ui/rygel-network-pref-section.vala
+++ b/src/ui/rygel-network-pref-section.vala
@@ -137,7 +137,11 @@ public class Rygel.NetworkPrefSection : PreferencesSection {
TreeIter iter;
if (this.find_interface (context.interface, out iter)) {
+#if VALA_0_36
+ this.iface_store.remove (ref iter);
+#else
this.iface_store.remove (iter);
+#endif
}
}
@@ -158,7 +162,11 @@ public class Rygel.NetworkPrefSection : PreferencesSection {
var path = row_ref.get_path ();
this.networks_store.get_iter (out iter, path);
+#if VALA_0_36
+ this.networks_store.remove (ref iter);
+#else
this.networks_store.remove (iter);
+#endif
}
}
001-disable-rygel-media-engine-test.patcb
002-fix-build-with-vala36.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment