Commit 0941923d authored by Jeremy Bicha's avatar Jeremy Bicha

Drop all patches, applied in new release

parent d6f13109
rygel (0.36.0-1) UNRELEASED; urgency=medium
* New upstream release
* Drop all patches, applied in new release
-- Jeremy Bicha <jbicha@debian.org> Fri, 17 Nov 2017 17:29:29 -0500
......
From: Santiago Vila <sanvila@debian.org>
Subject: Disable rygel-media-engine-test until we know what it segfaults
Bug-Debian: https://bugs.debian.org/841098
--- rygel-0.32.1.orig/tests/Makefile.am
+++ rygel-0.32.1/tests/Makefile.am
@@ -15,8 +15,8 @@ check_PROGRAMS = rygel-regression \
rygel-user-config-test \
rygel-searchable-container-test \
rygel-object-creator-test \
- rygel-database-test \
- rygel-media-engine-test
+ rygel-database-test
+# rygel-media-engine-test
TESTS = $(check_PROGRAMS)
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
}
}
From 8cfa5462bae9fce7e2abffe5d82c539e2df28897 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 28 Jun 2017 23:24:20 +0200
Subject: build: Include tracker-sparql-2.0 in checks
Checked to be compatible for rygel purposes, and expected to remain
like that.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 20d6893..00b94da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -421,7 +421,7 @@ AS_IF([test "x$enable_tracker_plugin" = "xyes"],
[
# Search available Tracker version
trackerpkg=""
- m4_foreach([VERSION], [[1.0], [0.16], [0.15], [0.14]],
+ m4_foreach([VERSION], [[2.0], [1.0], [0.16], [0.15], [0.14]],
[PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_SPARQL_REQUIRED_MIN],
[ trackerpkg="tracker-sparql-VERSION"
tracker_api_version="VERSION"
001-disable-rygel-media-engine-test.patcb
002-fix-build-with-vala36.patch
003-build-with-tracker2.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