diff options
author | gls <gls> | 2011-07-31 17:37:00 +0000 |
---|---|---|
committer | gls <gls> | 2011-07-31 17:37:00 +0000 |
commit | f7eec74c763f332950c09f84917a7d8ec7aa2cc5 (patch) | |
tree | 02d44bda3510035f67c97afdb24e5980a9630044 /graphics | |
parent | 47829072141de01ce2403a4e883c90b17704ac8c (diff) | |
download | pkgsrc-f7eec74c763f332950c09f84917a7d8ec7aa2cc5.tar.gz |
Add two patches from upstream to fix importing raws with libraw 0.13.6 and 0.13.7
PKGREV++
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/shotwell/Makefile | 3 | ||||
-rw-r--r-- | graphics/shotwell/distinfo | 4 | ||||
-rw-r--r-- | graphics/shotwell/patches/patch-src_photos_GRaw.vala | 38 | ||||
-rw-r--r-- | graphics/shotwell/patches/patch-vapi_libraw.vapi | 19 |
4 files changed, 62 insertions, 2 deletions
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index beb98a8ea05..21271b86791 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2011/07/12 19:00:57 drochner Exp $ +# $NetBSD: Makefile,v 1.21 2011/07/31 17:37:00 gls Exp $ # DISTNAME= shotwell-0.10.1 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://yorba.org/download/shotwell/0.10/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo index 9c6c1732393..9aa25b85183 100644 --- a/graphics/shotwell/distinfo +++ b/graphics/shotwell/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.9 2011/07/12 19:00:57 drochner Exp $ +$NetBSD: distinfo,v 1.10 2011/07/31 17:37:00 gls Exp $ SHA1 (shotwell-0.10.1.tar.bz2) = abd6e771168910943101b62d76f7768a49e69be9 RMD160 (shotwell-0.10.1.tar.bz2) = 44cccbebf4f1bf024229da9afbcc6d4db510be96 Size (shotwell-0.10.1.tar.bz2) = 1483679 bytes SHA1 (patch-aa) = 8eed6766df5ef9084a47c92fdbd85d3fc0f60827 SHA1 (patch-ab) = 07503807a44fe20ba33481eb3d8fde9e34c460c0 +SHA1 (patch-src_photos_GRaw.vala) = a66ec94eeacef7270c46afb3635e1582eda5e33c +SHA1 (patch-vapi_libraw.vapi) = b3c4a64717a51f45ebb9b2e70916f77f91b0d606 diff --git a/graphics/shotwell/patches/patch-src_photos_GRaw.vala b/graphics/shotwell/patches/patch-src_photos_GRaw.vala new file mode 100644 index 00000000000..3f9655e9d3b --- /dev/null +++ b/graphics/shotwell/patches/patch-src_photos_GRaw.vala @@ -0,0 +1,38 @@ +$NetBSD: patch-src_photos_GRaw.vala,v 1.1 2011/07/31 17:37:01 gls Exp $ + +Fix importing with libraw 0.13.6 & 0.13.7 +Taken from upstream: http://redmine.yorba.org/issues/3868 + +--- src/photos/GRaw.vala.orig 2011-05-26 23:43:17.000000000 +0000 ++++ src/photos/GRaw.vala +@@ -110,8 +110,8 @@ public class ProcessedImage { + } + + public ProcessedImage(LibRaw.Processor proc) throws Exception { +- LibRaw.Result result; +- image = proc.make_mem_image(out result); ++ LibRaw.Result result = LibRaw.Result.SUCCESS; ++ image = proc.make_mem_image(ref result); + throw_exception("ProcessedImage", result); + assert(image != null); + +@@ -122,8 +122,8 @@ public class ProcessedImage { + } + + public ProcessedImage.from_thumb(LibRaw.Processor proc) throws Exception { +- LibRaw.Result result; +- image = proc.make_mem_thumb(out result); ++ LibRaw.Result result = LibRaw.Result.SUCCESS; ++ image = proc.make_mem_thumb(ref result); + throw_exception("ProcessedImage.from_thumb", result); + assert(image != null); + +@@ -280,7 +280,7 @@ private void throw_exception(string call + if (result == LibRaw.Result.SUCCESS) + return; + else if (result > 0) +- throw new Exception.SYSTEM_ERROR("System error %d: %s", (int) result, strerror(result)); ++ throw new Exception.SYSTEM_ERROR("%s: System error %d: %s", caller, (int) result, strerror(result)); + + string msg = "%s: %s".printf(caller, result.to_string()); + diff --git a/graphics/shotwell/patches/patch-vapi_libraw.vapi b/graphics/shotwell/patches/patch-vapi_libraw.vapi new file mode 100644 index 00000000000..63e0dc999bf --- /dev/null +++ b/graphics/shotwell/patches/patch-vapi_libraw.vapi @@ -0,0 +1,19 @@ +$NetBSD: patch-vapi_libraw.vapi,v 1.1 2011/07/31 17:37:01 gls Exp $ + +Fix importing with libraw 0.13.6 & 0.13.7 +Taken from upstream: http://redmine.yorba.org/issues/3868 + +--- vapi/libraw.vapi.orig 2011-05-26 23:43:17.000000000 +0000 ++++ vapi/libraw.vapi +@@ -182,9 +182,9 @@ public class Processor { + public unowned ImageSizes get_sizes() { return sizes; } + public unowned Thumbnail get_thumbnail() { return thumbnail; } + [CCode (cname="libraw_dcraw_make_mem_image")] +- public ProcessedImage make_mem_image(out Result result); ++ public ProcessedImage make_mem_image(ref Result result); + [CCode (cname="libraw_dcraw_make_mem_thumb")] +- public ProcessedImage make_mem_thumb(out Result result); ++ public ProcessedImage make_mem_thumb(ref Result result); + public Result open_buffer(uint8[] buffer); + public Result open_file(string filename); + [CCode (cname="libraw_dcraw_process")] |