Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2013-09-11 13:11:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-10 11:42:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2013-09-11 13:11:22.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 28 21:57:47 UTC 2013 - [email protected] + +- Add shotwell-fix-bnc835758.patch: fix crash on importing AVI + files with "Mon Mar 3 09:44:56 2008" date format (bnc#835758). + +------------------------------------------------------------------- New: ---- shotwell-fix-bnc835758.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.bAUQtU/_old 2013-09-11 13:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.bAUQtU/_new 2013-09-11 13:11:22.000000000 +0200 @@ -30,6 +30,8 @@ Patch1: shotwell-build-with-LibRaw-0.15.patch # PATCH-FIX-UPSTREAM shotwell-vala-0.21.1.patch yorba#7254 yorba#7295 [email protected] -- Fix build with Vala 0.21.1, taken from upstream git. Patch2: shotwell-vala-0.21.1.patch +# PATCH-FIX-UPSTREAM shotwell-fix-bnc835758.patch yorba#7413 bnc#835758 [email protected] -- fix crash on importing AVI files +Patch3: shotwell-fix-bnc835758.patch BuildRequires: libraw-devel-static BuildRequires: update-desktop-files BuildRequires: vala >= 0.17.2 @@ -70,6 +72,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # We can't use the configure macro: it's not a standard autotools configure script ++++++ shotwell-fix-bnc835758.patch ++++++ Index: shotwell-0.14.1/src/VideoMetadata.vala =================================================================== --- shotwell-0.14.1.orig/src/VideoMetadata.vala +++ shotwell-0.14.1/src/VideoMetadata.vala @@ -459,14 +459,14 @@ private class AVIMetadataLoader { } else { // Format is: Mon Mar 3 09:44:56 2008 int year, day, hour, min, sec; - string weekday = ""; - string monthstr = ""; + char weekday[4]; + char monthstr[4]; int result = sdate.scanf("%3s %3s %d %d:%d:%d %d", weekday, monthstr, out day, out hour, out min, out sec, out year); if (7 != result) { return 0; // Error } - date.set_dmy((DateDay) day, month_from_string(monthstr), (DateYear) year); + date.set_dmy((DateDay) day, month_from_string((string) monthstr), (DateYear) year); seconds = sec + min * 60 + hour * 3600; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
