diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/scantailor | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/scantailor')
-rw-r--r-- | media-gfx/scantailor/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/scantailor/files/scantailor-0.9.9-environment_flags.patch | 24 | ||||
-rw-r--r-- | media-gfx/scantailor/files/scantailor-gcc46.patch | 121 | ||||
-rw-r--r-- | media-gfx/scantailor/metadata.xml | 8 | ||||
-rw-r--r-- | media-gfx/scantailor/scantailor-0.9.10.ebuild | 50 | ||||
-rw-r--r-- | media-gfx/scantailor/scantailor-0.9.11.1.ebuild | 48 |
6 files changed, 253 insertions, 0 deletions
diff --git a/media-gfx/scantailor/Manifest b/media-gfx/scantailor/Manifest new file mode 100644 index 000000000000..919e60172c3e --- /dev/null +++ b/media-gfx/scantailor/Manifest @@ -0,0 +1,2 @@ +DIST scantailor-0.9.10.tar.gz 1124348 SHA256 0b574eabfb65e4dcf3915d00ad3da31d464060458ffaeb49e4257e97301f93a0 +DIST scantailor-0.9.11.1.tar.gz 1190198 SHA256 881647a4172c55a067a7b6687965441cf21176d79d93075b22a373ea9accd8d3 SHA512 cec327fd12144f7cee5043adfee3880c75fb147474e4c3b5166385f7a8f47cb5650ed2df930bbe1f4b8ac2c7229a887ecba1ca105b47b1023f5d3d7d7b54bdb4 WHIRLPOOL c064837bd4d5f4c3fbfa260493f3eccecff59910c934005148975f2f00511539ae0e66535d0a57bbf0458022c8ec249faa7f3df40ed8d89b2683530b885e4f6b diff --git a/media-gfx/scantailor/files/scantailor-0.9.9-environment_flags.patch b/media-gfx/scantailor/files/scantailor-0.9.9-environment_flags.patch new file mode 100644 index 000000000000..70d860ec3bef --- /dev/null +++ b/media-gfx/scantailor/files/scantailor-0.9.9-environment_flags.patch @@ -0,0 +1,24 @@ +--- cmake/SetDefaultGccFlags.cmake.orig 2010-06-22 14:39:55.000000000 +0300 ++++ cmake/SetDefaultGccFlags.cmake 2010-06-22 14:44:27.000000000 +0300 +@@ -24,21 +24,6 @@ + ENDIF(visibility_supported_) + + IF(NOT COMPILER_FLAGS_OVERRIDDEN) +- # Flags common for all build configurations. +- SET( +- CMAKE_C_FLAGS +- "-Wall -Wno-unused -ffast-math" +- CACHE STRING "Common C flags for all build configurations." FORCE +- ) +- SET( +- CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}" +- CACHE STRING "Common C++ flags for all build configurations." FORCE +- ) +- SET( +- CMAKE_EXE_LINKER_FLAGS "" CACHE STRING +- "Common link flags for all build configurations." FORCE +- ) +- + # Release + SET( + CMAKE_C_FLAGS_RELEASE 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/metadata.xml b/media-gfx/scantailor/metadata.xml new file mode 100644 index 000000000000..84bf0479f90f --- /dev/null +++ b/media-gfx/scantailor/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>graphics</herd> + <upstream> + <remote-id type="sourceforge">scantailor</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-gfx/scantailor/scantailor-0.9.10.ebuild b/media-gfx/scantailor/scantailor-0.9.10.ebuild new file mode 100644 index 000000000000..62ff3ecc8c9a --- /dev/null +++ b/media-gfx/scantailor/scantailor-0.9.10.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit cmake-utils eutils virtualx + +DESCRIPTION="A interactive post-processing tool for scanned pages" +HOMEPAGE="http://scantailor.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2 GPL-3 public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="opengl" + +RDEPEND=">=media-libs/libpng-1.2.43 + >=media-libs/tiff-3.9.4 + sys-libs/zlib + virtual/jpeg + x11-libs/libXrender + dev-qt/qtgui:4 + opengl? ( dev-qt/qtopengl:4 )" +DEPEND="${RDEPEND} + dev-libs/boost" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9.9-environment_flags.patch + "${FILESDIR}"/${PN}-gcc46.patch +) + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_enable opengl) + ) + + cmake-utils_src_configure +} + +src_test() { + cd "${CMAKE_BUILD_DIR}" || die + Xemake test +} + +src_install() { + cmake-utils_src_install + + newicon resources/appicon.svg ${PN}.svg + make_desktop_entry ${PN} "Scan Tailor" +} diff --git a/media-gfx/scantailor/scantailor-0.9.11.1.ebuild b/media-gfx/scantailor/scantailor-0.9.11.1.ebuild new file mode 100644 index 000000000000..1f4f61818d20 --- /dev/null +++ b/media-gfx/scantailor/scantailor-0.9.11.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit cmake-utils eutils virtualx toolchain-funcs + +DESCRIPTION="A interactive post-processing tool for scanned pages" +HOMEPAGE="http://scantailor.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2 GPL-3 public-domain" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="opengl" + +RDEPEND=">=media-libs/libpng-1.2.43 + >=media-libs/tiff-3.9.4 + sys-libs/zlib + virtual/jpeg + x11-libs/libXrender + dev-qt/qtgui:4 + opengl? ( dev-qt/qtopengl:4 )" +DEPEND="${RDEPEND} + dev-libs/boost" + +src_configure() { + tc-export CXX + + mycmakeargs=( + -DCOMPILER_FLAGS_OVERRIDDEN=ON + $(cmake-utils_use_enable opengl) + ) + + cmake-utils_src_configure +} + +src_test() { + cd "${CMAKE_BUILD_DIR}" || die + Xemake test +} + +src_install() { + cmake-utils_src_install + + newicon resources/appicon.svg ${PN}.svg + make_desktop_entry ${PN} "Scan Tailor" +} |