Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2013-06-25 07:39:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-08 14:56:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2013-06-25 14:46:23.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jun 23 11:38:50 UTC 2013 - [email protected] + +- Add shotwell-build-with-LibRaw-0.15.patch, fix build with + LibRaw-0.15. + +------------------------------------------------------------------- New: ---- shotwell-build-with-LibRaw-0.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.3doCIE/_old 2013-06-25 14:46:23.000000000 +0200 +++ /var/tmp/diff_new_pack.3doCIE/_new 2013-06-25 14:46:23.000000000 +0200 @@ -26,6 +26,8 @@ Source: http://yorba.org/download/shotwell/0.14/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM shotwell-no-libexecdir.patch [email protected] -- Move from /usr/libexec to /usr/lib. http://redmine.yorba.org/issues/5050 Patch0: shotwell-no-libexecdir.patch +# PATCH-FIX-UPSTREAM shotwell-build-with-LibRaw-0.15.patch [email protected] -- Build with new libraw http://redmine.yorba.org/issues/7012 +Patch1: shotwell-build-with-LibRaw-0.15.patch BuildRequires: libraw-devel-static BuildRequires: update-desktop-files BuildRequires: vala >= 0.17.2 @@ -64,6 +66,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build # We can't use the configure macro: it's not a standard autotools configure script ++++++ shotwell-build-with-LibRaw-0.15.patch ++++++ commit 89aa167726d12f9ae0b53c01a2fdc54601fc3cc5 Author: Jim Nelson <[email protected]> Date: Wed May 29 11:52:09 2013 -0700 Build with LibRaw 0.15: Closes #7012 LibRaw 0.15 removed document-mode processing, which, as their release notes say, "no one uses". Compile error were nothing more than missing symbols -- Shotwell wasn't using it either. diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala index f57886e..b7c3922 100644 --- a/src/photos/GRaw.vala +++ b/src/photos/GRaw.vala @@ -21,12 +21,6 @@ public enum Colorspace { XYZ = 5 } -public enum DocMode { - STANDARD = 0, - GRAYSCALE = 1, - GRAYSCALE_NO_WHITE_BALANCE = 2 -} - public errordomain Exception { UNSPECIFIED, UNSUPPORTED_FILE, @@ -167,10 +161,6 @@ public class Processor { throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); } - public void document_mode_processing() throws Exception { - throw_exception("document_mode_processing", proc.document_mode_processing()); - } - public unowned LibRaw.ImageOther get_image_other() { return proc.get_image_other(); } @@ -244,7 +234,6 @@ public class Processor { // threshold output_params->half_size = half_size; // four_color_rgb - output_params->document_mode = GRaw.DocMode.STANDARD; output_params->highlight = GRaw.HighlightMode.CLIP; output_params->use_auto_wb = true; output_params->use_camera_wb = true; diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi index 05de461..a8a0a4d 100644 --- a/vapi/libraw.vapi +++ b/vapi/libraw.vapi @@ -104,7 +104,6 @@ public struct OutputParams { public float threshold; public bool half_size; public bool four_color_rgb; - public int document_mode; public int highlight; public bool use_auto_wb; public bool use_camera_wb; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
