Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2014-07-27 08:24:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-04 17:18:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2014-07-27 08:25:15.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jul 24 14:36:30 UTC 2014 - [email protected] + +- Add shotwell-vala.patch: Fix build with vala 0.25.1 (bgo#733650). + +------------------------------------------------------------------- +Wed Jul 23 16:49:07 UTC 2014 - [email protected] + +- Add + 0001-Remove-photo-from-the-collection-when-deleting-in-si.patch: + fix possible crash after deleting photo (bnc#869348, bgo#732964). + +------------------------------------------------------------------- New: ---- 0001-Remove-photo-from-the-collection-when-deleting-in-si.patch shotwell-vala.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.Fp4tB7/_old 2014-07-27 08:25:15.000000000 +0200 +++ /var/tmp/diff_new_pack.Fp4tB7/_new 2014-07-27 08:25:15.000000000 +0200 @@ -24,6 +24,10 @@ Group: Productivity/Graphics/Viewers Url: http://yorba.org/shotwell/ Source: http://download.gnome.org/sources/shotwell/0.18/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 0001-Remove-photo-from-the-collection-when-deleting-in-si.patch bnc#869348 bgo#732964 [email protected] -- Fix possible crash after removing photo in single page view. +Patch0: 0001-Remove-photo-from-the-collection-when-deleting-in-si.patch +# PATCH-FIX-UPSTREAM shotwell-vala.patch bgo#733650 [email protected] -- Fix build with vala 0.25.1 +Patch1: shotwell-vala.patch BuildRequires: libraw-devel-static BuildRequires: update-desktop-files BuildRequires: vala >= 0.17.2 @@ -62,6 +66,8 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build # We can't use the configure macro: it's not a standard autotools configure script ++++++ 0001-Remove-photo-from-the-collection-when-deleting-in-si.patch ++++++ >From 0ee62bcc4194ce1383bdac7f4d7ebeeafe3d39b0 Mon Sep 17 00:00:00 2001 From: Mike Gorse <[email protected]> Date: Tue, 22 Jul 2014 15:38:39 -0500 Subject: [PATCH] Remove photo from the collection when deleting in single-page view https://bugzilla.gnome.org/show_bug.cgi?id=732964 --- src/PhotoPage.vala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala index 50f0c1a..b91e939 100644 --- a/src/PhotoPage.vala +++ b/src/PhotoPage.vala @@ -1358,7 +1358,7 @@ public abstract class EditingHostPage : SinglePhotoPage { protected override bool on_shift_pressed(Gdk.EventKey? event) { // show quick compare of original only if no tool is in use, the original pixbuf is handy - if (current_tool == null && !get_ctrl_pressed() && !get_alt_pressed()) + if (current_tool == null && !get_ctrl_pressed() && !get_alt_pressed() && has_photo()) swap_in_original(); return base.on_shift_pressed(event); @@ -3144,6 +3144,9 @@ public class LibraryPhotoPage : EditingHostPage { // move on to the next one in the collection on_next_photo(); + + ViewCollection view = get_view(); + view.remove_marked(view.mark(view.get_view_for_source(photo))); if (photo.equals(get_photo())) { // this indicates there is only one photo in the controller, or now zero, so switch // to the Photos page, which is guaranteed to be there -- 1.8.4 ++++++ shotwell-vala.patch ++++++ Index: shotwell-0.18.1/plugins/shotwell-publishing/FacebookPublishing.vala =================================================================== --- shotwell-0.18.1.orig/plugins/shotwell-publishing/FacebookPublishing.vala +++ shotwell-0.18.1/plugins/shotwell-publishing/FacebookPublishing.vala @@ -1494,7 +1494,7 @@ internal class GraphSession { case EXPIRED_SESSION_STATUS_CODE: error = new Spit.Publishing.PublishingError.EXPIRED_SESSION( - "OAuth Access Token has Expired. Logout user.", real_message.get_uri(), msg.status_code); + "OAuth Access Token has Expired. Logout user."); break; case Soup.KnownStatusCode.CANT_RESOLVE: Index: shotwell-0.18.1/plugins/shotwell-publishing/FlickrPublishing.vala =================================================================== --- shotwell-0.18.1.orig/plugins/shotwell-publishing/FlickrPublishing.vala +++ shotwell-0.18.1/plugins/shotwell-publishing/FlickrPublishing.vala @@ -397,7 +397,7 @@ public class FlickrPublisher : Spit.Publ if (split_pair.length != 2) host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE( - "'%s' isn't a valid response to an OAuth authentication request")); + "'%s' isn't a valid response to an OAuth authentication request", response)); if (split_pair[0] == "oauth_token") oauth_token = split_pair[1]; @@ -407,7 +407,7 @@ public class FlickrPublisher : Spit.Publ if (oauth_token == null || oauth_token_secret == null) host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE( - "'%s' isn't a valid response to an OAuth authentication request")); + "'%s' isn't a valid response to an OAuth authentication request", response)); on_authentication_token_available(oauth_token, oauth_token_secret); Index: shotwell-0.18.1/Makefile =================================================================== --- shotwell-0.18.1.orig/Makefile +++ shotwell-0.18.1/Makefile @@ -662,8 +662,6 @@ $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(E $(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \ $(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \ $(foreach vapidir,$(VAPI_DIRS),--vapidir=$(vapidir)) \ - $(foreach def,$(DEFINES),-X -D$(def)) \ - $(foreach hdir,$(HEADER_DIRS),-X -I$(hdir)) \ $(VALAFLAGS) \ $(EXPANDED_SRC_FILES) @touch $@ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
