1 |
commit: c2c8c3c26c83247638796fc718e1f7cd8105e68f |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 3 17:55:38 2017 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 3 17:55:38 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c8c3c2 |
7 |
|
8 |
media-gfx/scantailor: Remove 0.9.11.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
media-gfx/scantailor/Manifest | 2 - |
13 |
...cantailor-0.9.11.1-boost-lambda-namespace.patch | 144 --------------------- |
14 |
.../files/scantailor-0.9.9-environment_flags.patch | 24 ---- |
15 |
media-gfx/scantailor/scantailor-0.9.11.1.ebuild | 54 -------- |
16 |
4 files changed, 224 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/scantailor/Manifest b/media-gfx/scantailor/Manifest |
19 |
index b0ab6bae868..b81f80b5053 100644 |
20 |
--- a/media-gfx/scantailor/Manifest |
21 |
+++ b/media-gfx/scantailor/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST scantailor-0.9.11.1-boost-join-moc.patch 53044 SHA256 c00772facafdb696bf0e36ba216050cf3ec5b45c15e0099e6ef4935bffa9ba00 SHA512 77c6ee7988834c8694f9c09182fcdf87bdba64f3e69c9cc9b8347c4980a56c484a4368643f1c608ebbaeb469d4d6bc8d1a62f95fce18bc41dfce68137a457a61 WHIRLPOOL 0e5b04a65a5c47deeea6b3ec192549e50b22825df506bda2b87fbc1aa0254993a33c7c7907af1520c7e0ae4264a9a00b9e92d6114b1aee664408c69bb9bdcf00 |
24 |
-DIST scantailor-0.9.11.1.tar.gz 1190198 SHA256 881647a4172c55a067a7b6687965441cf21176d79d93075b22a373ea9accd8d3 SHA512 cec327fd12144f7cee5043adfee3880c75fb147474e4c3b5166385f7a8f47cb5650ed2df930bbe1f4b8ac2c7229a887ecba1ca105b47b1023f5d3d7d7b54bdb4 WHIRLPOOL c064837bd4d5f4c3fbfa260493f3eccecff59910c934005148975f2f00511539ae0e66535d0a57bbf0458022c8ec249faa7f3df40ed8d89b2683530b885e4f6b |
25 |
DIST scantailor-0.9.12.2.tar.gz 1207379 SHA256 1f7b96bbe5179d46e332aea8d51ba50545fe7c510811e51588b6a4919e4feeab SHA512 d98603c5b3dfadeae3bda66d8b5ea085107edf9ee03efd299d50bf88a01f2b1092957f1ed4abe1a5d53b9028b7dec16dc5a8452d1a197fe0f3aaddeff6d02793 WHIRLPOOL 2ab46657538b5d95e2a564aa70775fdac8854136708f482c24c61507af217c75cb8974ace731a87b9a59d7e7da3788b23e28c178099fa479e2e01c3b767eb10c |
26 |
|
27 |
diff --git a/media-gfx/scantailor/files/scantailor-0.9.11.1-boost-lambda-namespace.patch b/media-gfx/scantailor/files/scantailor-0.9.11.1-boost-lambda-namespace.patch |
28 |
deleted file mode 100644 |
29 |
index 411341c9d1b..00000000000 |
30 |
--- a/media-gfx/scantailor/files/scantailor-0.9.11.1-boost-lambda-namespace.patch |
31 |
+++ /dev/null |
32 |
@@ -1,144 +0,0 @@ |
33 |
-Namespace qualify bind, in order to avoid clashes with boost::placeholder |
34 |
-Patches taken from FreeBSD: |
35 |
-https://svnweb.freebsd.org/ports?view=revision&revision=408592 |
36 |
- |
37 |
---- scantailor-0.9.11.1/filters/deskew/Filter.cpp |
38 |
-+++ scantailor-0.9.11.1/filters/deskew/Filter.cpp |
39 |
-@@ -85,9 +85,9 @@ |
40 |
- |
41 |
- QDomElement filter_el(doc.createElement("deskew")); |
42 |
- writer.enumPages( |
43 |
-- bind( |
44 |
-+ boost::lambda::bind( |
45 |
- &Filter::writePageSettings, |
46 |
-- this, boost::ref(doc), var(filter_el), _1, _2 |
47 |
-+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 |
48 |
- ) |
49 |
- ); |
50 |
- |
51 |
---- scantailor-0.9.11.1/filters/fix_orientation/Filter.cpp |
52 |
-+++ scantailor-0.9.11.1/filters/fix_orientation/Filter.cpp |
53 |
-@@ -100,9 +100,9 @@ |
54 |
- |
55 |
- QDomElement filter_el(doc.createElement("fix-orientation")); |
56 |
- writer.enumImages( |
57 |
-- bind( |
58 |
-+ boost::lambda::bind( |
59 |
- &Filter::writeImageSettings, |
60 |
-- this, boost::ref(doc), var(filter_el), _1, _2 |
61 |
-+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 |
62 |
- ) |
63 |
- ); |
64 |
- |
65 |
---- scantailor-0.9.11.1/filters/output/Filter.cpp |
66 |
-+++ scantailor-0.9.11.1/filters/output/Filter.cpp |
67 |
-@@ -93,9 +93,9 @@ |
68 |
- |
69 |
- QDomElement filter_el(doc.createElement("output")); |
70 |
- writer.enumPages( |
71 |
-- bind( |
72 |
-+ boost::lambda::bind( |
73 |
- &Filter::writePageSettings, |
74 |
-- this, boost::ref(doc), var(filter_el), _1, _2 |
75 |
-+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 |
76 |
- ) |
77 |
- ); |
78 |
- |
79 |
---- scantailor-0.9.11.1/filters/page_layout/Filter.cpp |
80 |
-+++ scantailor-0.9.11.1/filters/page_layout/Filter.cpp |
81 |
-@@ -136,9 +136,9 @@ |
82 |
- |
83 |
- QDomElement filter_el(doc.createElement("page-layout")); |
84 |
- writer.enumPages( |
85 |
-- bind( |
86 |
-+ boost::lambda::bind( |
87 |
- &Filter::writePageSettings, |
88 |
-- this, boost::ref(doc), var(filter_el), _1, _2 |
89 |
-+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 |
90 |
- ) |
91 |
- ); |
92 |
- |
93 |
---- scantailor-0.9.11.1/filters/page_split/Filter.cpp |
94 |
-+++ scantailor-0.9.11.1/filters/page_split/Filter.cpp |
95 |
-@@ -110,9 +110,9 @@ |
96 |
- ); |
97 |
- |
98 |
- writer.enumImages( |
99 |
-- bind( |
100 |
-+ boost::lambda::bind( |
101 |
- &Filter::writeImageSettings, |
102 |
-- this, boost::ref(doc), var(filter_el), _1, _2 |
103 |
-+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 |
104 |
- ) |
105 |
- ); |
106 |
- |
107 |
---- scantailor-0.9.11.1/filters/select_content/Filter.cpp |
108 |
-+++ scantailor-0.9.11.1/filters/select_content/Filter.cpp |
109 |
-@@ -119,9 +119,9 @@ |
110 |
- |
111 |
- QDomElement filter_el(doc.createElement("select-content")); |
112 |
- writer.enumPages( |
113 |
-- bind( |
114 |
-+ boost::lambda::bind( |
115 |
- &Filter::writePageSettings, |
116 |
-- this, boost::ref(doc), var(filter_el), _1, _2 |
117 |
-+ this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 |
118 |
- ) |
119 |
- ); |
120 |
- |
121 |
---- scantailor-0.9.11.1/MainWindow.cpp |
122 |
-+++ scantailor-0.9.11.1/MainWindow.cpp |
123 |
-@@ -1898,8 +1898,8 @@ |
124 |
- ImageFileInfo image_file_info(file_info, std::vector<ImageMetadata>()); |
125 |
- |
126 |
- ImageMetadataLoader::Status const status = ImageMetadataLoader::load( |
127 |
-- files.at(i), bind(&std::vector<ImageMetadata>::push_back, |
128 |
-- boost::ref(image_file_info.imageInfo()), _1) |
129 |
-+ files.at(i), boost::lambda::bind(&std::vector<ImageMetadata>::push_back, |
130 |
-+ boost::ref(image_file_info.imageInfo()), boost::lambda::_1) |
131 |
- ); |
132 |
- |
133 |
- if (status == ImageMetadataLoader::LOADED) { |
134 |
-@@ -1921,7 +1921,7 @@ |
135 |
- } |
136 |
- |
137 |
- // Check if there is at least one DPI that's not OK. |
138 |
-- if (std::find_if(new_files.begin(), new_files.end(), !bind(&ImageFileInfo::isDpiOK, _1)) != new_files.end()) { |
139 |
-+ if (std::find_if(new_files.begin(), new_files.end(), !boost::lambda::bind(&ImageFileInfo::isDpiOK, boost::lambda::_1)) != new_files.end()) { |
140 |
- |
141 |
- std::auto_ptr<FixDpiDialog> dpi_dialog(new FixDpiDialog(new_files, this)); |
142 |
- dpi_dialog->setWindowModality(Qt::WindowModal); |
143 |
---- scantailor-0.9.11.1/ThumbnailSequence.cpp |
144 |
-+++ scantailor-0.9.11.1/ThumbnailSequence.cpp |
145 |
-@@ -491,7 +491,7 @@ |
146 |
- m_pSelectionLeader(0) |
147 |
- { |
148 |
- m_graphicsScene.setContextMenuEventCallback( |
149 |
-- bind(&Impl::sceneContextMenuEvent, this, _1) |
150 |
-+ boost::lambda::bind(&Impl::sceneContextMenuEvent, this, boost::lambda::_1) |
151 |
- ); |
152 |
- } |
153 |
- |
154 |
-@@ -605,7 +605,7 @@ |
155 |
- { |
156 |
- ItemsById::iterator const id_it(m_itemsById.find(page_info.id())); |
157 |
- if (id_it != m_itemsById.end()) { |
158 |
-- m_itemsById.modify(id_it, bind(&Item::pageInfo, _1) = page_info); |
159 |
-+ m_itemsById.modify(id_it, boost::lambda::bind(&Item::pageInfo, boost::lambda::_1) = page_info); |
160 |
- invalidateThumbnailImpl(id_it); |
161 |
- } |
162 |
- } |
163 |
-@@ -725,10 +725,10 @@ |
164 |
- // Sort pages in m_itemsInOrder using m_ptrOrderProvider. |
165 |
- if (m_ptrOrderProvider.get()) { |
166 |
- m_itemsInOrder.sort( |
167 |
-- bind( |
168 |
-+ boost::lambda::bind( |
169 |
- &PageOrderProvider::precedes, m_ptrOrderProvider.get(), |
170 |
-- bind(&Item::pageId, _1), bind(&Item::incompleteThumbnail, _1), |
171 |
-- bind(&Item::pageId, _2), bind(&Item::incompleteThumbnail, _2) |
172 |
-+ boost::lambda::bind(&Item::pageId, boost::lambda::_1), bind(&Item::incompleteThumbnail, boost::lambda::_1), |
173 |
-+ boost::lambda::bind(&Item::pageId, boost::lambda::_2), bind(&Item::incompleteThumbnail, boost::lambda::_2) |
174 |
- ) |
175 |
- ); |
176 |
- } |
177 |
|
178 |
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 |
179 |
deleted file mode 100644 |
180 |
index 70d860ec3be..00000000000 |
181 |
--- a/media-gfx/scantailor/files/scantailor-0.9.9-environment_flags.patch |
182 |
+++ /dev/null |
183 |
@@ -1,24 +0,0 @@ |
184 |
---- cmake/SetDefaultGccFlags.cmake.orig 2010-06-22 14:39:55.000000000 +0300 |
185 |
-+++ cmake/SetDefaultGccFlags.cmake 2010-06-22 14:44:27.000000000 +0300 |
186 |
-@@ -24,21 +24,6 @@ |
187 |
- ENDIF(visibility_supported_) |
188 |
- |
189 |
- IF(NOT COMPILER_FLAGS_OVERRIDDEN) |
190 |
-- # Flags common for all build configurations. |
191 |
-- SET( |
192 |
-- CMAKE_C_FLAGS |
193 |
-- "-Wall -Wno-unused -ffast-math" |
194 |
-- CACHE STRING "Common C flags for all build configurations." FORCE |
195 |
-- ) |
196 |
-- SET( |
197 |
-- CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}" |
198 |
-- CACHE STRING "Common C++ flags for all build configurations." FORCE |
199 |
-- ) |
200 |
-- SET( |
201 |
-- CMAKE_EXE_LINKER_FLAGS "" CACHE STRING |
202 |
-- "Common link flags for all build configurations." FORCE |
203 |
-- ) |
204 |
-- |
205 |
- # Release |
206 |
- SET( |
207 |
- CMAKE_C_FLAGS_RELEASE |
208 |
|
209 |
diff --git a/media-gfx/scantailor/scantailor-0.9.11.1.ebuild b/media-gfx/scantailor/scantailor-0.9.11.1.ebuild |
210 |
deleted file mode 100644 |
211 |
index 6b38259a17f..00000000000 |
212 |
--- a/media-gfx/scantailor/scantailor-0.9.11.1.ebuild |
213 |
+++ /dev/null |
214 |
@@ -1,54 +0,0 @@ |
215 |
-# Copyright 1999-2016 Gentoo Foundation |
216 |
-# Distributed under the terms of the GNU General Public License v2 |
217 |
- |
218 |
-EAPI=4 |
219 |
-inherit cmake-utils eutils virtualx toolchain-funcs |
220 |
- |
221 |
-DESCRIPTION="A interactive post-processing tool for scanned pages" |
222 |
-HOMEPAGE="http://scantailor.sourceforge.net/" |
223 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz |
224 |
- https://dev.gentoo.org/~soap/distfiles/${P}-boost-join-moc.patch" |
225 |
- |
226 |
-LICENSE="GPL-2 GPL-3 public-domain" |
227 |
-SLOT="0" |
228 |
-KEYWORDS="amd64 x86" |
229 |
-IUSE="opengl" |
230 |
- |
231 |
-RDEPEND=">=media-libs/libpng-1.2.43 |
232 |
- >=media-libs/tiff-3.9.4 |
233 |
- sys-libs/zlib |
234 |
- virtual/jpeg |
235 |
- x11-libs/libXrender |
236 |
- dev-qt/qtgui:4 |
237 |
- opengl? ( dev-qt/qtopengl:4 )" |
238 |
-DEPEND="${RDEPEND} |
239 |
- dev-libs/boost" |
240 |
- |
241 |
-src_prepare() { |
242 |
- epatch -p1 \ |
243 |
- "${DISTDIR}/${P}-boost-join-moc.patch" \ |
244 |
- "${FILESDIR}/${P}-boost-lambda-namespace.patch" |
245 |
-} |
246 |
- |
247 |
-src_configure() { |
248 |
- tc-export CXX |
249 |
- |
250 |
- mycmakeargs=( |
251 |
- -DCOMPILER_FLAGS_OVERRIDDEN=ON |
252 |
- $(cmake-utils_use_enable opengl) |
253 |
- ) |
254 |
- |
255 |
- cmake-utils_src_configure |
256 |
-} |
257 |
- |
258 |
-src_test() { |
259 |
- cd "${CMAKE_BUILD_DIR}" || die |
260 |
- Xemake test |
261 |
-} |
262 |
- |
263 |
-src_install() { |
264 |
- cmake-utils_src_install |
265 |
- |
266 |
- newicon resources/appicon.svg ${PN}.svg |
267 |
- make_desktop_entry ${PN} "Scan Tailor" |
268 |
-} |