From c32e1bd16a588deaf80b4f813ffd0a28d0454997 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 28 Apr 2015 17:33:45 +0000
Subject: [PATCH] leptonica: bump version

---
 ...nica-1.71.recipe => leptonica-1.72.recipe} |  6 ++--
 ...-1.71.patchset => leptonica-1.72.patchset} | 33 ++++++-------------
 2 files changed, 13 insertions(+), 26 deletions(-)
 rename media-libs/leptonica/{leptonica-1.71.recipe => leptonica-1.72.recipe} (98%)
 rename media-libs/leptonica/patches/{leptonica-1.71.patchset => leptonica-1.72.patchset} (77%)

diff --git a/media-libs/leptonica/leptonica-1.71.recipe b/media-libs/leptonica/leptonica-1.72.recipe
similarity index 98%
rename from media-libs/leptonica/leptonica-1.71.recipe
rename to media-libs/leptonica/leptonica-1.72.recipe
index 9d5d1d627..d86103050 100644
--- a/media-libs/leptonica/leptonica-1.71.recipe
+++ b/media-libs/leptonica/leptonica-1.72.recipe
@@ -9,7 +9,7 @@ and image analysis operations. It's long list of features includes:
 "
 HOMEPAGE="http://code.google.com/p/leptonica"
 SRC_URI="http://www.leptonica.org/source/leptonica-$portVersion.tar.gz"
-CHECKSUM_SHA256="cc5d736e81496eb25e195f380f553537e0410c3f7151a778b2a546e35c7eb848"
+CHECKSUM_SHA256="79d5eadd32658c9fea38700c975d60aa3d088eaa3e307659f004d40834de1f56"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2001-2012 Dan Bloomberg"
 REVISION="1"
@@ -18,7 +18,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	leptonica$secondaryArchSuffix = $portVersion
-	lib:liblept$secondaryArchSuffix = 4.0.2 compat >= 4
+	lib:liblept$secondaryArchSuffix = 4.0.3 compat >= 4
 	"
 
 REQUIRES="
@@ -78,7 +78,7 @@ INSTALL()
 
 PROVIDES_devel="
 	leptonica${secondaryArchSuffix}_devel = $portVersion
-	devel:liblept$secondaryArchSuffix = 4.0.2 compat >= 4
+	devel:liblept$secondaryArchSuffix = 4.0.3 compat >= 4
 	"
 
 REQUIRES_devel="
diff --git a/media-libs/leptonica/patches/leptonica-1.71.patchset b/media-libs/leptonica/patches/leptonica-1.72.patchset
similarity index 77%
rename from media-libs/leptonica/patches/leptonica-1.71.patchset
rename to media-libs/leptonica/patches/leptonica-1.72.patchset
index 25367587d..23a398a35 100644
--- a/media-libs/leptonica/patches/leptonica-1.71.patchset
+++ b/media-libs/leptonica/patches/leptonica-1.72.patchset
@@ -1,22 +1,9 @@
-From f18777c47edebf65bbe85d7e6723c8a4df050be0 Mon Sep 17 00:00:00 2001
+From 91b78c7cdb8b549ea157fd5c27c34a9acd4c5f87 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 31 Mar 2015 10:55:28 +0300
 Subject: Haiku patch
 
 
-diff --git a/configure.ac b/configure.ac
-index 697153e..2c78ed1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,7 +1,7 @@
- AC_PREREQ([2.50])
- AC_INIT([leptonica], [1.71])
- AC_CONFIG_AUX_DIR([config])
--AM_CONFIG_HEADER([config_auto.h:config/config.h.in])
-+AC_CONFIG_HEADERS([config_auto.h:config/config.h.in])
- AC_CONFIG_SRCDIR([src/adaptmap.c])
- 
- AC_CONFIG_MACRO_DIR([m4])
 diff --git a/src/sarray.c b/src/sarray.c
 index 32ff12f..531bb9d 100644
 --- a/src/sarray.c
@@ -48,10 +35,10 @@ index 32ff12f..531bb9d 100644
  #endif
  
 -- 
-2.2.2
+1.8.3.4
 
 
-From c9cc0e51cd0ba40ba342b79ed78e2bc39d4ec180 Mon Sep 17 00:00:00 2001
+From cc2615d0dbf87f8f1d204006d4af9414d245a2bc Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Tue, 31 Mar 2015 10:56:57 +0300
 Subject: gcc2 fixes
@@ -78,10 +65,10 @@ index 9b4705d..eb3813f 100644
      boxGetGeometry(box1, &x1, &y1, &w1, &h1);
      boxGetGeometry(box2, &x2, &y2, &w2, &h2);
 diff --git a/src/compare.c b/src/compare.c
-index c51c607..ce587ba 100644
+index 11f0f37..841d1ca 100644
 --- a/src/compare.c
 +++ b/src/compare.c
-@@ -1908,6 +1908,7 @@ l_int32   *tab;
+@@ -1909,6 +1909,7 @@ l_int32   *tab;
  l_float32  maxscore, score;
  FPIX      *fpix;
  PIX       *pix3, *pix4;
@@ -89,7 +76,7 @@ index c51c607..ce587ba 100644
  
      PROCNAME("pixBestCorrelation");
  
-@@ -1954,7 +1955,6 @@ PIX       *pix3, *pix4;
+@@ -1955,7 +1956,6 @@ PIX       *pix3, *pix4;
  
      if (debugflag > 0) {
          lept_mkdir("lept");
@@ -98,10 +85,10 @@ index c51c607..ce587ba 100644
          pix4 = pixExpandReplicate(pix3, 20);
          snprintf(buf, sizeof(buf), "/tmp/lept/correl_%d.png", debugflag);
 diff --git a/src/recogident.c b/src/recogident.c
-index 9fe2f3e..12726dc 100644
+index 3db8b36..adea42b 100644
 --- a/src/recogident.c
 +++ b/src/recogident.c
-@@ -784,6 +784,7 @@ l_float32   maxscore, score;
+@@ -781,6 +781,7 @@ l_float32   maxscore, score;
  l_float32  *ycent1;
  FPIX       *fpix;
  PIX        *pixt, *pixt1, *pixt2;
@@ -109,7 +96,7 @@ index 9fe2f3e..12726dc 100644
  
      PROCNAME("pixCorrelationBestShift");
  
-@@ -872,7 +873,6 @@ PIX        *pixt, *pixt1, *pixt2;
+@@ -869,7 +870,6 @@ PIX        *pixt, *pixt1, *pixt2;
  
      if (debugflag > 0) {
          lept_mkdir("recog");
@@ -118,5 +105,5 @@ index 9fe2f3e..12726dc 100644
          pixt2 = pixExpandReplicate(pixt1, 5);
          snprintf(buf, sizeof(buf), "/tmp/recog/junkbs_%d.png", debugflag);
 -- 
-2.2.2
+1.8.3.4