Fix building with -scrollview (bug 556448)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

5 files changed, 60 insertions, 23 deletions

diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog
index 80d9ed09fce1..d13b0ac180dd 100644
--- a/app-text/tesseract/ChangeLog
+++ b/app-text/tesseract/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/tesseract
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.61 2015/08/04 08:02:52 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.62 2015/08/05 07:14:51 tomka Exp $
+
+  05 Aug 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/tesseract-3.04.00-fix-scrollview-disabled.patch,
+  tesseract-3.04.00-r1.ebuild, tesseract-3.04.00.ebuild:
+  Fix building with -scrollview (bug 556448)
 
   04 Aug 2015; Thomas Kahle <tomka@gentoo.org> tesseract-3.04.00-r1.ebuild:
   Fix URI and other things (bug 556590)
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 817a59c0069d..5eadbf0452e9 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX tesseract-2.04-gcc44.patch 440 SHA256 f0e0004621a0be2ba475bafa812fbe7af13dd187fd6d55650df0569831383025 SHA512 4d1538d0a124de7c89d4a2a6c8cd3f38b623e9c5405affe8c59d9d8a3be1df10853a4a794197453e516965a99f898dc2a0552c7a23e68182e444c8d85802b8f6 WHIRLPOOL 1eba35e9579b26c7a92cd3dbacd81e869f73db2231c324c1d751c6320eae5be828c136dbcecdd1cc584aa032f1c97d0f0bbc55dc93b7a31c9eaaf12b43da1976
 AUX tesseract-2.04-gcc47.patch 289 SHA256 746c23a72b12df832d7b4a4c5d5be2307ae628960a57f517a3f11e8106cb28c4 SHA512 fc4cf373b97369063a3034f4155c6c314902f5c33e5bae4df89e7aea8b1843ee25a62787a32d377d893622a1bbdc6fe44759ec0d034df5c0200fb75e4028db59 WHIRLPOOL a7a124671f1dc97811b18abea06b892e91469233eb52bf7a89d23840a0f014481ae230c93a15208c9dcb0b38b7a7f7de2eefb767aad253311dbfaf149b45c1ba
+AUX tesseract-3.04.00-fix-scrollview-disabled.patch 1286 SHA256 7bd8dc1e0e5357fdc224b60ec1a635971d268d6dbc65d06730eca6ac26dae751 SHA512 378b478c91c8a73f6aaa81a4b35024333b327e43f8ab584407df59b66dfd02e0e0af64b789049bdee4924efa1366b74e7f6ab805522588f5daf42c50449285cf WHIRLPOOL bd8657b987da3732a704e296cc4943782197dc36ff1d8b23802a69f55d7de36bc486566c7ee07a438846081279c67469278bca59c9946d5ee9e27082273bff2d
 DIST 3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
 DIST ara.traineddata-3.04.00 6315068 SHA256 21c98aaf7aeba2271ac0cc4a363d364d806649d7cb0bcab85d4b9a385f49645a SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b WHIRLPOOL d258d6eecb01feca9f0de5c973ab4a3c952db764b624ba98732e58af18a88332daa746e19194bcee8ed6fe1abe2a8d42b0b8976f0c9bde66e9831482b389f038
 DIST bul.traineddata-3.04.00 6026234 SHA256 ca0bd253b4ab6202db5e8b2cecbc4219b4f725e51468cabf5bc99338e2c3de33 SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c WHIRLPOOL 1bc19032224a6d4f94aae67fd8f5caabbcc00c00b0329513bf23c7a978f01269edec965e6090564b345862dc8810c2bc9c6fd04c736b7f4180998dd0cb8cb8fa
@@ -107,26 +108,14 @@ DIST vie.traineddata.gz 1575539 SHA256 5f61c32daf9a7071ff0dc95415aed752765388133
 EBUILD tesseract-2.04-r1.ebuild 2728 SHA256 f92d34a25a4124fdc22160c2dca0685eb4037b75d8812681c9ceb50af83e33f8 SHA512 2768705c7d50e86ba2b26915aceae591856482b0c0c98531afd22459456bb91cbffc93e71b3a90468847d4713a76c3d2c838ada1132edecc7aeb7dc957c2e06f WHIRLPOOL b795eb0c124e998ce83bf1c428c98364ee33e0806343a82beec658775c28a521fbe0b32b42341b2b0748454a35523bde3af0a0cc91be5c5ffaf02501b74cae83
 EBUILD tesseract-3.03_rc1-r1.ebuild 4302 SHA256 031d1459401863b53eba39f599ee4d52a9cdbc553e08f805638afb6895b69087 SHA512 2fe80e7edf13f8f0a27fc7a69e3f278426f601e9be806930c8d09ecab604b66bc50501bb202f027984ae294c70cf803c8f9975709afecad387502a7856164b33 WHIRLPOOL 5dd65b2510bbd1c4622e10819a25746edf18f455578a2daccc1c040be7921b65bb6541e756f755fde454e073c8e133cb436e425eb13f9c253878f5b665ad04ab
 EBUILD tesseract-3.03_rc1.ebuild 4156 SHA256 dac031b9ab35c77fd438737101e97426e02d67423d886ff2ef73bc5109df03a5 SHA512 2849db643eb8ae7dcc1bbf4980735360bd3cbe7ef2f7dce2d7098b860d18d4789e27b872a462d933c961266868c7a0a2887ddddfc629e33daf200f40caa868cc WHIRLPOOL cc9143a36f44e5c7cbcb771d98f86756d58b48e720e97101803a01bdfe442b3ab1748757e8d3d56de06f76a600691c78718175c5f2cffe346be29a15dd86cdb1
-EBUILD tesseract-3.04.00-r1.ebuild 5247 SHA256 19ea8bf64eee44ded64cb3eea959d5b0d87e13d54fb94cddfda1980446cb6a24 SHA512 9469a7f43d5f44ee21d6e91e1077266d0f70781cf1bb64b1b62f0bd1efbf247a025260217c0eb5373cbb20a5a45310fe42e94397d262205311a25e555014c1af WHIRLPOOL 40258ea18ab4906124a2240a007dad754087ae5ed04b3cb9154697020e464e84f49eb9d77312e13a9f78ef9661764b90e20a2961cd04b2e6ce513a1dc84c6152
-EBUILD tesseract-3.04.00.ebuild 4256 SHA256 a70d6c4a5ab35c2c46bbc9c802deccc037dcb58f042a5ae4619186330e2a3a3d SHA512 9f875182bdbc3871c369fd128e7d0db327bb746ed243f9a9f66d9a9a1af7c6b6df1c53d397603710c7a689a7af67ceef3a4c2958482af307f04f8b9428213753 WHIRLPOOL c42e75a2cb4c2c272e4ca4ceef636e9c84fe5115a2cc6a887de1e3ea767e9184d705f5006e426a3dbf383f2878a87b9e4bd9a1921b1d5ebe9fbb46aa55ee7cc6
-MISC ChangeLog 9164 SHA256 c2411b5b3e115c9834b9f13830d71af07c6341703be53e4dddae380cfadc7a4b SHA512 5b9834de9acf28d01e51f8986a83c7da0543c1b363b5d220f3a64ce746178ac6e89b929b0d3b4966e26d06263e4f98e308a3a20bfb829b5002af4630aada0104 WHIRLPOOL 01089b8fdbf99c323b36c9ec31f0c76d6a26b8d4fc7859e26592b4f49921dd3f1ed63c6317221f1ab57277d55d926e7d4dc71efba3368df4fb89addb4deb2b96
+EBUILD tesseract-3.04.00-r1.ebuild 5297 SHA256 da7d11c7e2b26246bae90263e151fc6471bfad076fe24a64c409aebe87ee7f10 SHA512 1be72b0b36e885413519b86334fb0007d8972c75ee37c67b9b391988222dbdee196e09a721b9b5d214d65d9a0ec4036d618b72bbdc9f965993459d9d54b11d87 WHIRLPOOL 3b6198137f0c167a7876e46ccaeb1e17e09df370c8bd783a3e02343153c9a6c96dcd3403610c880c04717499b1e3bebc7f2d8f0e90de386399ddeaa25662da2e
+EBUILD tesseract-3.04.00.ebuild 4306 SHA256 092ff47d26d8921beaea24933995b180761bdc1028276a51eb4becaf33448931 SHA512 f7679af9a44dd60cafc5cddf5ba2c7f4081d8d58edefb79b80860bfa45134028903849602d66ece54672be8495277854354f6c1dcdabb6d3651801e3ca91a651 WHIRLPOOL f8dcfff42f00eab72150ba6a6454e906f6fd5647e24923556a96bebf88915b895f254c0599e8a180a7b32c655ff8b535925027996437598621f592e9020527c0
+MISC ChangeLog 9372 SHA256 0e3db28103b0954119c44be961dfb06f8a62d29f67f6e314f05ceb30aa8c0033 SHA512 bf33c8ca4355633528881d07197ec3fcfda79a9e6f7823edb4f41ba2eeef7ba76c065030bc2d5e347af3fd96d2b6522037a4174ca09f38129ad3c878d544be8d WHIRLPOOL 41c75f4a74b577dbe5c4a187ec3abe959ef0b42d5d7f95c5c3dc51bc91885db0bb3ca1f5e4f1aad5bc96d53f656929e8bcbc6d8011ece93e876d3625924b7513
 MISC metadata.xml 1203 SHA256 7c71aa9071e8f23ab145df34f5afc607366aa361868e886107115ad0bc9dd19a SHA512 18d58d76ad6ae43f435e2b9cf3995ad936ed4a97f160a5b4bffadc8d7212580049c11e8f254044b9bff82a817f187eb345f25cdac2560ee2aa6d30212d76cb80 WHIRLPOOL ed3885131c1a5ccd3e7a91f5d49ab39a973faae6cfc2bdd9f0f8ee81ca72bf6a9cfa93c4c335521453d0105a0751fd112b18b6803438800222e53e45126cc527
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVwH+6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixRMP/Rz1fi5uS7QqhKgOowgP6UAU
-TrNUBGTHrA+mmfOoBrEZTGUEu02TKQ1rEuWSgl1eyGtZiqqvDM3RnJITdtsDLJlV
-RWCIoI7pZ6XbSVwqmJy1sXby/11vQeOQGrl7L4c1JNgCS8bCjI0aiMS7uusklctf
-VjEBQ5J9j0wLrJLVYt65/Tms0/YO+h8w+cMZ5Sw1B5mq1fVuuenL3R8P4jAzSdu/
-nv5n56Qs3PKqYSLIin6RBOt3s2vwz9cHrZSLDKSVkWHv07j0FlyPnqnTZPudCFHz
-i8AZlbUTsP6b8KDQWxK/27uGbyj1sPJtd+MK+IAy1C4mPYgL69bZgcoOlnhZISbe
-HUCnf9ubNTxppWstV6xYQsuAc1hnrnSBRBp3DyIK6S0JT5tjCwtLoC8BroyJU8Kv
-2gIdFtxf+aMzXAegJKK/VxHh2cahXWkweFgtbG81ompjjhJi9qSvd2RtcJuaxkNr
-oly/ckPgzAGvCpQK7Zd5JK5GzSOPi22OvoeFRgxoz4YinuLASq+18EIuVvqj87YV
-c+C/sxXtQbIRVQf0Tj6VUo1G/fhjkJOF+o/I298yx2imIq20wKuMZGke8fXpqHq7
-P0yAc4NAkzeaHl4+8CxnnGLuGo0GZfb2H7Qt6xEfIUOP4ZZ7FED40+qOlzg2p3fP
-oS8VcbUs4xOgSSBq+udF
-=s+tW
+iF4EAREIAAYFAlXBt+8ACgkQid6yGVZcMryy3AD+I2q7DtflOcYkLHon86QSH80V
+n6C065off8h4rIa2n9kA/0Kq2gVlP/hJEzNqvnccG4SLD+Q48aQqQ6wb5xKb/DM5
+=b5EH
 -----END PGP SIGNATURE-----
diff --git a/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch b/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch
new file mode 100644
index 000000000000..7523e3b44960
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch
@@ -0,0 +1,41 @@
+From 27b8a5cc89898c3f12dae57a58b15efddee9fe18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= <zdenop@gmail.com>
+Date: Thu, 23 Jul 2015 23:14:53 +0200
+Subject: [PATCH] fix GRAPHICS_DISABLED build
+
+---
+ ccstruct/imagedata.cpp | 4 ++++
+ ccstruct/split.cpp     | 5 +++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/ccstruct/imagedata.cpp b/ccstruct/imagedata.cpp
+index 4016a92..3c244c7 100644
+--- a/ccstruct/imagedata.cpp
++++ b/ccstruct/imagedata.cpp
+@@ -17,6 +17,10 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
+ 
+ #include "imagedata.h"
+ 
+diff --git a/ccstruct/split.cpp b/ccstruct/split.cpp
+index 24650d4..6e6ea44 100644
+--- a/ccstruct/split.cpp
++++ b/ccstruct/split.cpp
+@@ -25,6 +25,11 @@
+ /*----------------------------------------------------------------------
+               I n c l u d e s
+ ----------------------------------------------------------------------*/
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "split.h"
+ #include "coutln.h"
+ #include "tprintf.h"
diff --git a/app-text/tesseract/tesseract-3.04.00-r1.ebuild b/app-text/tesseract/tesseract-3.04.00-r1.ebuild
index 2be8e0376988..958057a31c7e 100644
--- a/app-text/tesseract/tesseract-3.04.00-r1.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild,v 1.3 2015/08/04 08:02:52 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild,v 1.4 2015/08/05 07:14:51 tomka Exp $
 
 EAPI=5
 
@@ -73,6 +73,7 @@ DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
 
 PATCHES=(
 	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
 )
 
 src_unpack() {
diff --git a/app-text/tesseract/tesseract-3.04.00.ebuild b/app-text/tesseract/tesseract-3.04.00.ebuild
index 9fb747d32b77..dd4542816393 100644
--- a/app-text/tesseract/tesseract-3.04.00.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00.ebuild,v 1.2 2015/08/03 15:29:30 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00.ebuild,v 1.3 2015/08/05 07:14:51 tomka Exp $
 
 EAPI=5
 
@@ -76,6 +76,7 @@ DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
 
 PATCHES=(
 	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
 )
 
 src_configure() {