From 56f903c0398b53ad271f5d4594ee51101bb0871f Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 20 May 2016 23:58:44 +0000
Subject: [PATCH] sanity: use latest git snapshot and patch to fix #599. (#599)

---
 haiku-apps/sanity/patches/sanity-0.6.patchset | 22 +++++++++++++++++++
 haiku-apps/sanity/sanity-0.6.recipe           | 12 +++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 haiku-apps/sanity/patches/sanity-0.6.patchset

diff --git a/haiku-apps/sanity/patches/sanity-0.6.patchset b/haiku-apps/sanity/patches/sanity-0.6.patchset
new file mode 100644
index 000000000..3a92f2a39
--- /dev/null
+++ b/haiku-apps/sanity/patches/sanity-0.6.patchset
@@ -0,0 +1,22 @@
+From 02b4f5b1eaf9997ca1e1b26499089f6442807bd8 Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Fri, 20 May 2016 22:52:29 +0000
+Subject: BLocker assignment operator is private since hrev50310.
+
+
+diff --git a/ScannerOptionView.cpp b/ScannerOptionView.cpp
+index 389ffec..45cb9ab 100644
+--- a/ScannerOptionView.cpp
++++ b/ScannerOptionView.cpp
+@@ -23,7 +23,7 @@ static bool			reload_option(void *ov, void *device);
+ // ------------------------
+ 
+ BList ScannerOptionView::m_options_list = BList();
+-BLocker ScannerOptionView::m_options_list_locker = BLocker();
++BLocker ScannerOptionView::m_options_list_locker;
+ 
+ 
+ // --------------------------------------------------------------
+-- 
+2.7.0
+
diff --git a/haiku-apps/sanity/sanity-0.6.recipe b/haiku-apps/sanity/sanity-0.6.recipe
index 8e1cf6425..7d0398e7e 100644
--- a/haiku-apps/sanity/sanity-0.6.recipe
+++ b/haiku-apps/sanity/sanity-0.6.recipe
@@ -3,12 +3,14 @@ DESCRIPTION="A graphical Haiku scanner application, using SANE.
 SanityTranslator allows applications to use scanner devices through the \
 translation kit."
 HOMEPAGE="http://philippe.houdoin.free.fr/phil/beos/sanity/index-en.html"
-COPYRIGHT="2001-2004, Philippe Houdoin"
+COPYRIGHT="2001-2015 Philippe Houdoin"
 LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="https://github.com/diversys/sanity/archive/f40f575.tar.gz"
-CHECKSUM_SHA256="fdd0cabb3ff5f8718f6cf56190260c7d106c258936b34e3d40607f0edc7f20aa"
-SOURCE_DIR="sanity-f40f57540683ecaade60585de6b379c61aa0ca7c"
+REVISION="3"
+srcGitRev="5ca4267486bf6060389b5352391c2919a37c69ed"
+SOURCE_URI="https://github.com/diversys/sanity/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="04b80d1d6373108223c4a0458f2c5f9625e94e79fca26357673c01486a46b8e4"
+SOURCE_DIR="sanity-$srcGitRev"
+PATCHES="sanity-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 ?x86 !x86_64"