From 46a8c1659856c76016f82d2be9a47b68866ff909 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 26 Jun 2013 11:22:25 +0000
Subject: [PATCH] update to darktable 1.2.2

---
 graphics/darktable/Makefile                   |  4 +--
 graphics/darktable/distinfo                   |  4 +--
 ...tch-src_external_LibRaw_src_libraw_cxx_cpp | 28 -------------------
 graphics/darktable/pkg/PLIST                  |  3 +-
 4 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 graphics/darktable/patches/patch-src_external_LibRaw_src_libraw_cxx_cpp

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 62ba2a4537b..565e7bd5117 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.33 2013/06/18 18:45:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2013/06/26 11:22:25 sthen Exp $
 
 # requires SSE
 ONLY_FOR_ARCHS=	i386 amd64
 
 COMMENT=	virtual lighttable and darkroom for photographers
-DISTNAME=	darktable-1.2.1
+DISTNAME=	darktable-1.2.2
 EXTRACT_SUFX=	.tar.xz
 
 SHARED_ONLY=	Yes
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 6f546a13166..dd314884793 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (darktable-1.2.1.tar.xz) = sXVild/aePyChgMDOljyM87RkIuKUOyX0uYA1urPjio=
-SIZE (darktable-1.2.1.tar.xz) = 2273260
+SHA256 (darktable-1.2.2.tar.xz) = EpAujD7xhdIWfOOl+dEe3d52PFo8sOkmf0tHCiUvyFk=
+SIZE (darktable-1.2.2.tar.xz) = 2307300
diff --git a/graphics/darktable/patches/patch-src_external_LibRaw_src_libraw_cxx_cpp b/graphics/darktable/patches/patch-src_external_LibRaw_src_libraw_cxx_cpp
deleted file mode 100644
index a1d52da3b65..00000000000
--- a/graphics/darktable/patches/patch-src_external_LibRaw_src_libraw_cxx_cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_external_LibRaw_src_libraw_cxx_cpp,v 1.1 2013/06/18 18:45:49 sthen Exp $
-
-https://github.com/darktable-org/darktable/commit/796937043871aadbd0c0dc61bc90ea674ec1bc18
-
---- src/external/LibRaw/src/libraw_cxx.cpp.orig	Tue Jun 18 19:21:00 2013
-+++ src/external/LibRaw/src/libraw_cxx.cpp	Tue Jun 18 19:22:02 2013
-@@ -796,8 +796,8 @@ int LibRaw::unpack(void)
-                 S.iheight= S.height;
-                 IO.shrink = 0;
-                 // allocate image as temporary buffer, size 
--                imgdata.rawdata.raw_alloc = calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
--                imgdata.image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
-+                imgdata.rawdata.raw_alloc = 0;
-+                imgdata.image = (ushort (*)[4]) calloc(S.iwidth*S.iheight,sizeof(*imgdata.image)); 
-             }
- 
- 
-@@ -807,8 +807,8 @@ int LibRaw::unpack(void)
-         // recover saved
-         if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY)
-             {
--                imgdata.image = 0; 
--                imgdata.rawdata.color_image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
-+              imgdata.rawdata.raw_alloc = imgdata.rawdata.color_image = imgdata.image;
-+              imgdata.image = 0;  
-             }
- 
-         // calculate channel maximum
diff --git a/graphics/darktable/pkg/PLIST b/graphics/darktable/pkg/PLIST
index 18aa916a829..59e5835c221 100644
--- a/graphics/darktable/pkg/PLIST
+++ b/graphics/darktable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2013/06/18 18:45:49 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.9 2013/06/26 11:22:25 sthen Exp $
 @bin bin/darktable
 @bin bin/darktable-cli
 @bin bin/darktable-cltest
@@ -246,6 +246,7 @@ share/locale/da/LC_MESSAGES/darktable.mo
 share/locale/de/LC_MESSAGES/darktable.mo
 share/locale/es/LC_MESSAGES/darktable.mo
 share/locale/fr/LC_MESSAGES/darktable.mo
+share/locale/it/LC_MESSAGES/darktable.mo
 share/locale/ja/LC_MESSAGES/darktable.mo
 share/locale/nl/LC_MESSAGES/darktable.mo
 share/locale/pl/LC_MESSAGES/darktable.mo