r23697 - in /packages/unstable/gnome-dvb-daemon/debian: changelog patches/ patches/01_vala-0.8.0.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sun Apr 11 08:52:12 UTC 2010
Author: slomo
Date: Sun Apr 11 08:52:10 2010
New Revision: 23697
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23697
Log:
* debian/patches/01_vala-0.8.0.patch:
+ Fix build with Vala 0.8.0, patches from upstream
bzr (revisions 931, 932, 933) (Closes: #577293).
Added:
packages/unstable/gnome-dvb-daemon/debian/patches/
packages/unstable/gnome-dvb-daemon/debian/patches/01_vala-0.8.0.patch
packages/unstable/gnome-dvb-daemon/debian/patches/series
Modified:
packages/unstable/gnome-dvb-daemon/debian/changelog
Modified: packages/unstable/gnome-dvb-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/changelog?rev=23697&op=diff
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-dvb-daemon/debian/changelog [utf-8] Sun Apr 11 08:52:10 2010
@@ -1,3 +1,11 @@
+gnome-dvb-daemon (0.1.16-2) unstable; urgency=low
+
+ * debian/patches/01_vala-0.8.0.patch:
+ + Fix build with Vala 0.8.0, patches from upstream
+ bzr (revisions 931, 932, 933) (Closes: #577293).
+
+ -- Sebastian Dröge <slomo at debian.org> Sun, 11 Apr 2010 10:51:09 +0200
+
gnome-dvb-daemon (0.1.16-1) unstable; urgency=low
[ Sebastian Reichel ]
Added: packages/unstable/gnome-dvb-daemon/debian/patches/01_vala-0.8.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/patches/01_vala-0.8.0.patch?rev=23697&op=file
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/patches/01_vala-0.8.0.patch (added)
+++ packages/unstable/gnome-dvb-daemon/debian/patches/01_vala-0.8.0.patch [utf-8] Sun Apr 11 08:52:10 2010
@@ -1,0 +1,177 @@
+=== modified file 'src/Recorder.vala'
+--- a/src/Recorder.vala 2010-03-23 22:07:57 +0000
++++ b/src/Recorder.vala 2010-04-08 13:49:40 +0000
+@@ -167,8 +167,12 @@
+
+ if (!has_conflict) {
+ this.timers.set (new_timer.Id, new_timer);
+- Factory.get_timers_store ().add_timer_to_device_group (new_timer,
+- this.DeviceGroup);
++ try {
++ Factory.get_timers_store ().add_timer_to_device_group (new_timer,
++ this.DeviceGroup);
++ } catch (SqlError e) {
++ critical ("%s", e.message);
++ }
+ this.changed (new_timer.Id, ChangeType.ADDED);
+
+ if (this.timers.size == 1 && !this.have_check_timers_timeout) {
+@@ -233,8 +237,12 @@
+ this.stop_recording (timer);
+ }
+ this.timers.remove (timer_id);
+- Factory.get_timers_store ().remove_timer_from_device_group (
+- timer_id, this.DeviceGroup);
++ try {
++ Factory.get_timers_store ().remove_timer_from_device_group (
++ timer_id, this.DeviceGroup);
++ } catch (SqlError e) {
++ critical ("%s", e.message);
++ }
+ this.changed (timer_id, ChangeType.DELETED);
+ val = true;
+ } else {
+
+=== modified file 'src/Schedule.vala'
+--- a/src/Schedule.vala 2009-11-17 14:17:18 +0000
++++ b/src/Schedule.vala 2010-04-08 13:49:40 +0000
+@@ -111,8 +111,12 @@
+
+ this.event_id_map.remove (element.id);
+ this.events.remove (iter);
+- this.epgstore.remove_event (
+- element.id, this.channel.Sid, this.channel.GroupId);
++ try {
++ this.epgstore.remove_event (element.id,
++ this.channel.Sid, this.channel.GroupId);
++ } catch (SqlError e) {
++ critical ("%s", e.message);
++ }
+ }
+ }
+ }
+@@ -138,8 +142,12 @@
+ this.create_and_add_event_element (event);
+ }
+
+- this.epgstore.add_or_update_event (event, this.channel.Sid,
+- this.channel.GroupId);
++ try {
++ this.epgstore.add_or_update_event (event, this.channel.Sid,
++ this.channel.GroupId);
++ } catch (SqlError e) {
++ critical ("%s", e.message);
++ }
+ }
+ }
+
+
+=== modified file 'src/Manager.vala'
+--- a/src/Manager.vala 2010-03-22 11:32:56 +0000
++++ b/src/Manager.vala 2010-04-08 13:58:06 +0000
+@@ -66,7 +66,7 @@
+ lock (m.scanners) {
+ foreach (Scanner scanner in m.scanners.values) {
+ debug ("Stopping scanner");
+- scanner.Destroy ();
++ scanner.do_destroy ();
+ }
+ m.scanners.clear ();
+ }
+
+=== modified file 'src/Recorder.vala'
+--- a/src/Recorder.vala 2010-04-08 13:49:40 +0000
++++ b/src/Recorder.vala 2010-04-08 13:58:06 +0000
+@@ -228,10 +228,14 @@
+ * active timer recording is aborted.
+ */
+ public bool DeleteTimer (uint32 timer_id) throws DBus.Error {
++ return this.delete_timer (timer_id);
++ }
++
++ protected bool delete_timer (uint32 timer_id) {
+ bool val;
+ lock (this.timers) {
+ if (this.timers.contains (timer_id)) {
+- if (this.IsTimerActive (timer_id)) {
++ if (this.is_timer_active (timer_id)) {
+ // Abort recording
+ Timer timer = this.timers.get (timer_id);
+ this.stop_recording (timer);
+@@ -492,6 +496,10 @@
+ * @returns: TRUE if timer is currently active
+ */
+ public bool IsTimerActive (uint32 timer_id) throws DBus.Error {
++ return this.is_timer_active (timer_id);
++ }
++
++ protected bool is_timer_active (uint32 timer_id) {
+ return this.active_timers.contains (timer_id);
+ }
+
+@@ -790,7 +798,7 @@
+
+ // Delete items from this.timers using this.DeleteTimer
+ for (int i=0; i<deleteable_items.length(); i++) {
+- this.DeleteTimer (deleteable_items.nth_data (i));
++ this.delete_timer (deleteable_items.nth_data (i));
+ }
+
+ if (this.timers.size == 0 && this.active_timers.size == 0) {
+
+=== modified file 'src/Scanner.vala'
+--- a/src/Scanner.vala 2010-04-02 15:19:18 +0000
++++ b/src/Scanner.vala 2010-04-08 13:58:06 +0000
+@@ -183,7 +183,7 @@
+ this.do_destroy ();
+ }
+
+- protected void do_destroy () {
++ public void do_destroy () {
+ this.remove_check_for_lock_timeout ();
+ this.remove_wait_for_tables_timeout ();
+ this.clear_and_reset_all ();
+
+=== modified file 'src/ChannelFactory.vala'
+--- a/src/ChannelFactory.vala 2010-02-05 17:52:07 +0000
++++ b/src/ChannelFactory.vala 2010-04-08 14:13:46 +0000
+@@ -201,24 +201,24 @@
+ create_channel = false;
+ }
+ }
+- }
+
+- if (create_channel) {
+- ChannelElements celems = new ChannelElements ();
+- celems.sid = channel_sid;
+- celems.sinks = new ArrayList<Gst.Element> ();
+- celems.sinks.add (bin);
+- celems.tee = tee;
+- celems.forced = forced;
+- celems.notify_func = notify_func;
++ if (create_channel) {
++ ChannelElements celems = new ChannelElements ();
++ celems.sid = channel_sid;
++ celems.sinks = new ArrayList<Gst.Element> ();
++ celems.sinks.add (bin);
++ celems.tee = tee;
++ celems.forced = forced;
++ celems.notify_func = notify_func;
+
+- lock (this.elements_map) {
+- this.elements_map.set (channel_sid, celems);
++ lock (this.elements_map) {
++ this.elements_map.set (channel_sid, celems);
++ }
++ this.active_channels.add (channel);
+ }
+- this.active_channels.add (channel);
++
++ return bin;
+ }
+-
+- return bin;
+ }
+
+ private Gst.Element add_sink_bin (Gst.Element sink_element) {
+
Added: packages/unstable/gnome-dvb-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/patches/series?rev=23697&op=file
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/patches/series (added)
+++ packages/unstable/gnome-dvb-daemon/debian/patches/series [utf-8] Sun Apr 11 08:52:10 2010
@@ -1,0 +1,1 @@
+01_vala-0.8.0.patch
More information about the pkg-gnome-commits
mailing list