Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2013-08-10 11:42:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shotwell (Old) and /work/SRC/openSUSE:Factory/.shotwell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shotwell" Changes: -------- --- /work/SRC/openSUSE:Factory/shotwell/shotwell.changes 2013-06-25 14:46:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2013-08-10 11:42:05.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 9 08:46:32 UTC 2013 - dims...@opensuse.org + +- Add shotwell-vala-0.21.1.patch: Fix build with Vala 0.21.1. + +------------------------------------------------------------------- New: ---- shotwell-vala-0.21.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.JavJpZ/_old 2013-08-10 11:42:06.000000000 +0200 +++ /var/tmp/diff_new_pack.JavJpZ/_new 2013-08-10 11:42:06.000000000 +0200 @@ -28,6 +28,8 @@ Patch0: shotwell-no-libexecdir.patch # PATCH-FIX-UPSTREAM shotwell-build-with-LibRaw-0.15.patch zai...@opensuse.org -- Build with new libraw http://redmine.yorba.org/issues/7012 Patch1: shotwell-build-with-LibRaw-0.15.patch +# PATCH-FIX-UPSTREAM shotwell-vala-0.21.1.patch yorba#7254 yorba#7295 dims...@opensuse.org -- Fix build with Vala 0.21.1, taken from upstream git. +Patch2: shotwell-vala-0.21.1.patch BuildRequires: libraw-devel-static BuildRequires: update-desktop-files BuildRequires: vala >= 0.17.2 @@ -67,6 +69,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # We can't use the configure macro: it's not a standard autotools configure script ++++++ shotwell-vala-0.21.1.patch ++++++ commit 9b1d9c50af912a85ae63200d1867da54f75938a7 Author: Joseph Bylund <joseph.byl...@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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
