File shotwell-vala-0.21.1.patch of Package shotwell
commit 9b1d9c50af912a85ae63200d1867da54f75938a7
Author: Joseph Bylund <joseph.bylund@gmail.com>
Date: Mon Aug 5 15:06:09 2013 -0700
Doesn't build with Vala 0.21.1, "close" conflict in GTK 3.10: Closes #7295, Closes #7254
The number of deprecated classes and methods in GTK 3.10 is too much work
simply to get Shotwell to compile, so that's been moved to #7301. This
patch fixes some "hard" compile errors and disables warnings for deprecated
symbols.
Index: shotwell-0.14.1/src/AppWindow.vala
===================================================================
--- shotwell-0.14.1.orig/src/AppWindow.vala
+++ shotwell-0.14.1/src/AppWindow.vala
@@ -156,7 +156,7 @@ public class FullscreenWindow : PageWind
AppWindow.get_instance().end_fullscreen();
}
- public void close() {
+ public new void close() {
on_close();
}
Index: shotwell-0.14.1/src/Dialogs.vala
===================================================================
--- shotwell-0.14.1.orig/src/Dialogs.vala
+++ shotwell-0.14.1/src/Dialogs.vala
@@ -1470,7 +1470,7 @@ public class ProgressDialog : Gtk.Window
return keep_going;
}
- public void close() {
+ public new void close() {
#if UNITY_SUPPORT
//UnityProgressBar: reset
uniprobar.reset();
Index: shotwell-0.14.1/thumbnailer/shotwell-video-thumbnailer.vala
===================================================================
--- shotwell-0.14.1.orig/thumbnailer/shotwell-video-thumbnailer.vala
+++ shotwell-0.14.1/thumbnailer/shotwell-video-thumbnailer.vala
@@ -78,7 +78,7 @@ class ShotwellThumbnailer {
if (sample != null) {
Gst.Buffer buffer;
Gst.Caps caps;
- Gst.Structure s;
+ unowned Gst.Structure s;
Gst.MapInfo mapinfo;
// Get the snapshot buffer format now. We set the caps on the appsink so