Fix build issue with gcc-4.6 and newer boost versions (bug #391427 by Oschtan) and skip tests requiring X (bug #325813).

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 150 insertions, 13 deletions

diff --git a/media-gfx/scantailor/ChangeLog b/media-gfx/scantailor/ChangeLog
index f5eaf810cd6a..3f34173e60c3 100644
--- a/media-gfx/scantailor/ChangeLog
+++ b/media-gfx/scantailor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/scantailor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/ChangeLog,v 1.4 2011/07/31 18:31:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/ChangeLog,v 1.5 2011/12/06 21:14:25 radhermit Exp $
+
+  06 Dec 2011; Tim Harder <radhermit@gentoo.org> +files/scantailor-gcc46.patch,
+  scantailor-0.9.10.ebuild:
+  Fix build issue with gcc-4.6 and newer boost versions (bug #391427 by
+  Oschtan) and skip tests requiring X (bug #325813).
 
 *scantailor-0.9.10 (31 Jul 2011)
 
diff --git a/media-gfx/scantailor/Manifest b/media-gfx/scantailor/Manifest
index fbd0e19f54cf..7ef75275e0d6 100644
--- a/media-gfx/scantailor/Manifest
+++ b/media-gfx/scantailor/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA512
 
 AUX scantailor-0.9.9-environment_flags.patch 732 RMD160 8f4fbde7c63e49bfa078be45d7ddbd1cd3b9a240 SHA1 d2cd2f3223581973adcd621e6083be34f77ace87 SHA256 a346812401027d1f3a21ed5928685c877cf2105d0c1f2fcd7737327d338f76d5
+AUX scantailor-gcc46.patch 3874 RMD160 287ccd06a5a5335abdde85dfd728339baa8f01f4 SHA1 466d7929fe1d1370cc15c0ed7600efc832009ead SHA256 f52312ecbe656353b5fcb69702c5fcb84b5e288453cc8417f4a099fdc6deb68b
 DIST scantailor-0.9.10.tar.gz 1124348 RMD160 548681bbca511e90c52ab3ade6ff6d32729774b6 SHA1 37ed3a4db17e2eaca9f4ada8cc29137df657e5fb SHA256 0b574eabfb65e4dcf3915d00ad3da31d464060458ffaeb49e4257e97301f93a0
 DIST scantailor-0.9.9.2.tar.gz 969691 RMD160 39286377d1b328286c8c35543fb97c1a5695bf73 SHA1 7bdd390a32355685af53160aa5b9bd3b280a0c1a SHA256 b65f45697c196a05ea12910ffb47ad728f98b18937c8c42033865bbdd40211c7
 DIST scantailor-0.9.9.tar.gz 783134 RMD160 99104d310afa56bba8f4fd4e8c5820e8fbc34c02 SHA1 0fc61441cef7a538061a5ee94bd0d8361007e0ec SHA256 0db8a4d32decaaa2cf9442ae1204d504d27a21f64fab42704eb3c5cc0e559be2
-EBUILD scantailor-0.9.10.ebuild 1004 RMD160 2080cf34be890e1fea96ab6e841a55cb30896d0d SHA1 1aa75e118bbfae0f587ff1be416b25d26c2d7735 SHA256 5b0d85b858cc446aacc6cd764a107484472dc7a4901c429c70406c7eda421617
+EBUILD scantailor-0.9.10.ebuild 1185 RMD160 381d789381a0886b3f8b74a3451afb4321eb32c1 SHA1 a3a5b8b3a951208e75fbf0075128504053305f12 SHA256 3af9a69e1dffd02eef1093f25949224d72ba60e7013551128b8e511d74b5eead
 EBUILD scantailor-0.9.9.2.ebuild 1054 RMD160 bdd2435eb7559a4cccb6833e703a7bafa3b20961 SHA1 5e3f0d505e1a9f73a6304fc45305fc17d4abafa9 SHA256 cd59abc0092d4b925c93a7d3a00d6f8d75936ca6469af53b64cfc159451dc954
 EBUILD scantailor-0.9.9.ebuild 1042 RMD160 9d959fb08d1737f9fbae300f1873da49c11a0c99 SHA1 e671a758310f2bb890041b48fcb2f42182f66e7d SHA256 bb96ac5d285fa107f9d28bf38e3b577040afeeb20639b532a8322ae702f1c6fd
-MISC ChangeLog 906 RMD160 1f8ae1adf75f435b18c4a643dd5fbc49a6a5ad9d SHA1 8a322e8c110a1b94f3697b52739dc7039fcfd56d SHA256 d087a70fedd318fda3ee5712bee6ba200ff3b7bac477dcd9e921f0df4efcdde6
+MISC ChangeLog 1140 RMD160 6e2403c2014c7f285dc4509d181b3aef3741a44a SHA1 b6fc8d68428eabc5d345a59fc6f0d7d8ca2737da SHA256 388c4b4a95c300a349ec3ff8ff4afa026207f1c4d41ecd08d20d3d4f4ed827fc
 MISC metadata.xml 252 RMD160 0ffc7bcc2f73a5e67554e1f754c708447aa25ef3 SHA1 dec3e19885be02d101fce48ef7d5365ec77c0a64 SHA256 9a107df8546d260fe9b5156ecd2f21a15c011d65d3434a769c4082d7c0e31e9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJONZ+GAAoJEEqz6FtPBkyjXr0H/iGoZbgJoYC25ODI5PYBREd+
-HBrqT8BqkF2d8cKIAG+OH86PANldahUNzK60SBAfVU5GrHP4HjvkyfTHes+FVzP1
-IGaO62FoTU9xrHehJLROQyD9QDrUE01DOaeXrx3rku7NY+1ol52FutViyAFoK0pn
-SJ91o+VCmlwb3CxiYgkILSJCeaoYKRlMP58wTgeXA8VvGDkDZeUtRRTxaLXY5AjQ
-lIKNFv8AgeM8o3lRp+OZnqg8OY+U3ME9iNQ1y/JnrFtzRXSPbJ6tQAh7h28O1eBX
-0urgISUAutkQ84QfNMZrkMCrp/ghs5OT5ZyNOM6BSJjagtPfA/r5s2rjP7l8k0A=
-=2zvm
+iQEcBAEBCgAGBQJO3oW6AAoJEEqz6FtPBkyj9hEH/jkFbORHaQcA/dszUcNRLUJ3
+X+7vifRzF9quppuswq5IZFKN6RujIYJrjcZIKHSNMXdbSgkzi6JFLcejIfRSif7O
+KAKXQbb6/ZpHZyVAW8kcQoRMtQNH0v+3rQczGVMy2XPdnaA9BiyBOaVH9/tigcKj
+XE/G59/kJsxoeL/BHvIqwPmUlizs5ocBZSFewOO6pQsgffs66ung08dhfFx9pABP
+8hSNGP3GGKN2wGB3Ipd59qBD3weLnmZmThlmf1q+galnXv6ZFS+Y3he+E3cRTQQj
+XDJVdZq0q9OGTDZMqnv0sGioVdW2w4gJEObOFblqgVj+HUVEa6ArbV+0QF/7vTI=
+=eMAL
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/scantailor/files/scantailor-gcc46.patch b/media-gfx/scantailor/files/scantailor-gcc46.patch
new file mode 100644
index 000000000000..8965ab478b1e
--- /dev/null
+++ b/media-gfx/scantailor/files/scantailor-gcc46.patch
@@ -0,0 +1,121 @@
+From a25036fbf37941e241da520fa7fab45e13c9c4a4 Mon Sep 17 00:00:00 2001
+From: Joseph Artsimovich <joseph.artsimovich@gmail.com>
+Date: Sat, 1 Oct 2011 19:37:10 +0100
+Subject: [PATCH] Fix build issues with certain version combinations of boost
+ and gcc.
+
+---
+ ProjectWriter.cpp                      |    1 +
+ compat/boost_multi_index_foreach_fix.h |   46 ++++++++++++++++++++++++++++++++
+ zones/EditableZoneSet.h                |   18 ++++++++++++-
+ 3 files changed, 64 insertions(+), 1 deletions(-)
+ create mode 100644 compat/boost_multi_index_foreach_fix.h
+
+diff --git a/ProjectWriter.cpp b/ProjectWriter.cpp
+index e6e519b..44329d7 100644
+--- a/ProjectWriter.cpp
++++ b/ProjectWriter.cpp
+@@ -25,6 +25,7 @@
+ #include "ImageMetadata.h"
+ #include "AbstractFilter.h"
+ #include "FileNameDisambiguator.h"
++#include "compat/boost_multi_index_foreach_fix.h"
+ #include <QtXml>
+ #include <QFile>
+ #include <QTextStream>
+diff --git a/compat/boost_multi_index_foreach_fix.h b/compat/boost_multi_index_foreach_fix.h
+new file mode 100644
+index 0000000..7800c79
+--- /dev/null
++++ b/compat/boost_multi_index_foreach_fix.h
+@@ -0,0 +1,46 @@
++/*
++    Scan Tailor - Interactive post-processing tool for scanned pages.
++    Copyright (C)  Joseph Artsimovich <joseph.artsimovich@gmail.com>
++
++    This program is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program.  If not, see <http://www.gnu.org/licenses/>.
++*/
++
++#ifndef BOOST_MULTI_INDEX_FOREACH_FIX_H_
++#define BOOST_MULTI_INDEX_FOREACH_FIX_H_
++
++#include <boost/foreach.hpp>
++#include <boost/mpl/bool.hpp>
++#include <boost/multi_index/sequenced_index.hpp>
++
++// BOOST_FOREACH() in boost >= 1.47 has problems with gcc >= 4.6
++// These problems aren't specific to boost::multi_index,
++// but the code below only deals with it.
++// In future versions of boost, they might include equivalent
++// code in boost::multi_index itself, which will lead to build problems.
++// If / when this happens, conditional compilation will be necessary.
++
++namespace boost 
++{
++namespace foreach
++{
++
++template<typename SuperMeta, typename TagList>
++struct is_noncopyable<boost::multi_index::detail::sequenced_index<SuperMeta, TagList> > : mpl::true_
++{
++};
++
++} // namespace foreach
++} // namespace boost
++
++#endif
+diff --git a/zones/EditableZoneSet.h b/zones/EditableZoneSet.h
+index 153693d..4ecfd0d 100644
+--- a/zones/EditableZoneSet.h
++++ b/zones/EditableZoneSet.h
+@@ -1,7 +1,7 @@
+ /*
+ 
+ 	Scan Tailor - Interactive post-processing tool for scanned pages.
+-	Copyright (C) 2007-2009  Joseph Artsimovich <joseph_a@mail.ru>
++	Copyright (C)  Joseph Artsimovich <joseph.artsimovich@gmail.com>
+ 
+ 	This program is free software: you can redistribute it and/or modify
+ 	it under the terms of the GNU General Public License as published by
+@@ -24,6 +24,8 @@
+ #include "PropertySet.h"
+ #include "IntrusivePtr.h"
+ #include <QObject>
++#include <boost/mpl/bool.hpp>
++#include <boost/foreach.hpp>
+ #include <boost/iterator/iterator_facade.hpp>
+ #include <map>
+ 
+@@ -102,4 +104,18 @@ private:
+ 	PropertySet m_defaultProps;
+ };
+ 
++namespace boost
++{
++namespace foreach
++{
++
++// Make BOOST_FOREACH work with the above class (necessary for boost >= 1.46 with gcc >= 4.6)
++template<>
++struct is_noncopyable<EditableZoneSet> : public boost::mpl::true_
++{
++};
++
++} // namespace foreach
++} // namespace boost
++
+ #endif
+-- 
+1.7.8.rc4
+
diff --git a/media-gfx/scantailor/scantailor-0.9.10.ebuild b/media-gfx/scantailor/scantailor-0.9.10.ebuild
index dfe554a763a1..638fa66e3714 100644
--- a/media-gfx/scantailor/scantailor-0.9.10.ebuild
+++ b/media-gfx/scantailor/scantailor-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/scantailor-0.9.10.ebuild,v 1.1 2011/07/31 18:31:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/scantailor-0.9.10.ebuild,v 1.2 2011/12/06 21:14:25 radhermit Exp $
 
 EAPI=4
 inherit cmake-utils eutils
@@ -24,7 +24,17 @@ RDEPEND=">=media-libs/libpng-1.2.43
 DEPEND="${RDEPEND}
 	dev-libs/boost"
 
-PATCHES=( "${FILESDIR}/${PN}-0.9.9-environment_flags.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9-environment_flags.patch
+	"${FILESDIR}"/${PN}-gcc46.patch
+)
+
+src_prepare() {
+	# Skip image processing tests that require X
+	sed -i -e "/^ADD_TEST(ImageProcTests/d" CMakeLists.txt || die
+
+	base_src_prepare
+}
 
 src_configure() {
 	mycmakeargs=(