1 |
commit: 75ae6be0e2590f6ac5e245fac6770ebb63b6a93e |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 15 21:23:46 2017 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 15 21:24:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ae6be0 |
7 |
|
8 |
media-gfx/kphotoalbum: Fix build w/ ecm 5.31 |
9 |
|
10 |
Revision bump adds upstream patches to fix build with next extra cmake modules |
11 |
version. This version adds cflags -fno-operator-names by default, which breaks |
12 |
the build here. |
13 |
|
14 |
Gentoo-bug: 609470 |
15 |
|
16 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
17 |
|
18 |
.../files/kphotoalbum-5.1-ecm531-1.patch | 19 ++++++ |
19 |
.../files/kphotoalbum-5.1-ecm531-2.patch | 39 +++++++++++ |
20 |
.../files/kphotoalbum-5.1-ecm531-3.patch | 56 ++++++++++++++++ |
21 |
.../files/kphotoalbum-5.1-ecm531-4.patch | 19 ++++++ |
22 |
.../files/kphotoalbum-5.1-ecm531-5.patch | 19 ++++++ |
23 |
media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild | 75 ++++++++++++++++++++++ |
24 |
6 files changed, 227 insertions(+) |
25 |
|
26 |
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch |
27 |
new file mode 100644 |
28 |
index 0000000000..bf694951f9 |
29 |
--- /dev/null |
30 |
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch |
31 |
@@ -0,0 +1,19 @@ |
32 |
+commit 8b54a592731e65dec02bbfc83c994fe373bc0dca |
33 |
+Author: Raymond Wooninck <tittiatcoke@×××××.com> |
34 |
+Date: Tue Jan 24 20:55:28 2017 +0100 |
35 |
+ |
36 |
+ Fix build with -fno-operator-names |
37 |
+ |
38 |
+diff --git a/DB/ImageInfo.cpp b/DB/ImageInfo.cpp |
39 |
+index 59c2c6f9..5eadbb10 100644 |
40 |
+--- a/DB/ImageInfo.cpp |
41 |
++++ b/DB/ImageInfo.cpp |
42 |
+@@ -190,7 +190,7 @@ void ImageInfo::rotate( int degrees, RotationMode mode ) |
43 |
+ m_dirty = true; |
44 |
+ m_angle = ( m_angle + degrees ) % 360; |
45 |
+ |
46 |
+- if (degrees == 90 or degrees == 270) { |
47 |
++ if (degrees == 90 || degrees == 270) { |
48 |
+ m_size.transpose(); |
49 |
+ } |
50 |
+ |
51 |
|
52 |
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch |
53 |
new file mode 100644 |
54 |
index 0000000000..11cd87cebe |
55 |
--- /dev/null |
56 |
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch |
57 |
@@ -0,0 +1,39 @@ |
58 |
+commit 8cc8951ba21b1e54a7cd62e50075e09e8e2f9901 |
59 |
+Author: Raymond Wooninck <tittiatcoke@×××××.com> |
60 |
+Date: Tue Jan 24 21:06:31 2017 +0100 |
61 |
+ |
62 |
+ Some more fixes for -fno-operator-names |
63 |
+ |
64 |
+diff --git a/AnnotationDialog/Dialog.cpp b/AnnotationDialog/Dialog.cpp |
65 |
+index 50e18e70..c44d88dc 100644 |
66 |
+--- a/AnnotationDialog/Dialog.cpp |
67 |
++++ b/AnnotationDialog/Dialog.cpp |
68 |
+@@ -1504,7 +1504,7 @@ void AnnotationDialog::Dialog::addTagToCandidateList(QString category, QString t |
69 |
+ void AnnotationDialog::Dialog::removeTagFromCandidateList(QString category, QString tag) |
70 |
+ { |
71 |
+ // Is the deselected tag the last selected positionable tag? |
72 |
+- if (m_lastSelectedPositionableTag.first == category and m_lastSelectedPositionableTag.second == tag) { |
73 |
++ if (m_lastSelectedPositionableTag.first == category && m_lastSelectedPositionableTag.second == tag) { |
74 |
+ m_lastSelectedPositionableTag = QPair<QString, QString>(); |
75 |
+ } |
76 |
+ |
77 |
+@@ -1534,7 +1534,7 @@ void AnnotationDialog::Dialog::slotShowAreas(bool showAreas) |
78 |
+ void AnnotationDialog::Dialog::positionableTagRenamed(QString category, QString oldTag, QString newTag) |
79 |
+ { |
80 |
+ // Is the renamed tag the last selected positionable tag? |
81 |
+- if (m_lastSelectedPositionableTag.first == category and m_lastSelectedPositionableTag.second == oldTag) { |
82 |
++ if (m_lastSelectedPositionableTag.first == category && m_lastSelectedPositionableTag.second == oldTag) { |
83 |
+ m_lastSelectedPositionableTag.second = newTag; |
84 |
+ } |
85 |
+ |
86 |
+@@ -1576,8 +1576,8 @@ void AnnotationDialog::Dialog::checkProposedTagData( |
87 |
+ foreach (ResizableFrame *area, areas()) |
88 |
+ { |
89 |
+ if (area != areaToExclude |
90 |
+- and area->proposedTagData() == tagData |
91 |
+- and area->tagData().first.isEmpty()) { |
92 |
++ && area->proposedTagData() == tagData |
93 |
++ && area->tagData().first.isEmpty()) { |
94 |
+ area->removeProposedTagData(); |
95 |
+ } |
96 |
+ } |
97 |
|
98 |
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch |
99 |
new file mode 100644 |
100 |
index 0000000000..8269676529 |
101 |
--- /dev/null |
102 |
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch |
103 |
@@ -0,0 +1,56 @@ |
104 |
+commit 3e91323f1faea39a950b84b317a511df2f3b8875 |
105 |
+Author: Raymond Wooninck <tittiatcoke@×××××.com> |
106 |
+Date: Tue Jan 24 22:01:16 2017 +0100 |
107 |
+ |
108 |
+ More fixes for -fno-operator-names |
109 |
+ |
110 |
+diff --git a/AnnotationDialog/ImagePreview.cpp b/AnnotationDialog/ImagePreview.cpp |
111 |
+index e83f03aa..34d90b62 100644 |
112 |
+--- a/AnnotationDialog/ImagePreview.cpp |
113 |
++++ b/AnnotationDialog/ImagePreview.cpp |
114 |
+@@ -330,8 +330,8 @@ void ImagePreview::mousePressEvent(QMouseEvent *event) |
115 |
+ } |
116 |
+ |
117 |
+ m_areaStart = event->pos(); |
118 |
+- if (m_areaStart.x() < m_minX or m_areaStart.x() > m_maxX or |
119 |
+- m_areaStart.y() < m_minY or m_areaStart.y() > m_maxY) { |
120 |
++ if (m_areaStart.x() < m_minX || m_areaStart.x() > m_maxX || |
121 |
++ m_areaStart.y() < m_minY || m_areaStart.y() > m_maxY) { |
122 |
+ // Dragging started outside of the preview image |
123 |
+ return; |
124 |
+ } |
125 |
+@@ -374,7 +374,7 @@ void ImagePreview::mouseReleaseEvent(QMouseEvent *event) |
126 |
+ return; |
127 |
+ } |
128 |
+ |
129 |
+- if (event->button() & Qt::LeftButton and m_selectionRect->isVisible()) { |
130 |
++ if (event->button() & Qt::LeftButton && m_selectionRect->isVisible()) { |
131 |
+ m_areaEnd = event->pos(); |
132 |
+ processNewArea(); |
133 |
+ m_selectionRect->hide(); |
134 |
+@@ -583,9 +583,9 @@ bool ImagePreview::fuzzyAreaExists(QList<QRect> &existingAreas, QRect area) |
135 |
+ // maximumDeviation is 15% of the mean value of the width and height of each area |
136 |
+ maximumDeviation = float(existingAreas.at(i).width() + existingAreas.at(i).height()) * 0.075; |
137 |
+ if ( |
138 |
+- distance(existingAreas.at(i).topLeft(), area.topLeft()) < maximumDeviation and |
139 |
+- distance(existingAreas.at(i).topRight(), area.topRight()) < maximumDeviation and |
140 |
+- distance(existingAreas.at(i).bottomLeft(), area.bottomLeft()) < maximumDeviation and |
141 |
++ distance(existingAreas.at(i).topLeft(), area.topLeft()) < maximumDeviation && |
142 |
++ distance(existingAreas.at(i).topRight(), area.topRight()) < maximumDeviation && |
143 |
++ distance(existingAreas.at(i).bottomLeft(), area.bottomLeft()) < maximumDeviation && |
144 |
+ distance(existingAreas.at(i).bottomRight(), area.bottomRight()) < maximumDeviation |
145 |
+ ) { |
146 |
+ return true; |
147 |
+diff --git a/AnnotationDialog/ListSelect.cpp b/AnnotationDialog/ListSelect.cpp |
148 |
+index 6010c692..80fca8e9 100644 |
149 |
+--- a/AnnotationDialog/ListSelect.cpp |
150 |
++++ b/AnnotationDialog/ListSelect.cpp |
151 |
+@@ -413,7 +413,7 @@ void AnnotationDialog::ListSelect::showContextMenu(const QPoint& pos) |
152 |
+ i18n("Really Delete %1?",item->text(0)), |
153 |
+ KGuiItem(i18n("&Delete"),QString::fromLatin1("editdelete")) ); |
154 |
+ if ( code == KMessageBox::Continue ) { |
155 |
+- if (item->checkState(0) == Qt::Checked and m_positionable) { |
156 |
++ if (item->checkState(0) == Qt::Checked && m_positionable) { |
157 |
+ // An area could be linked against this. We can use positionableTagDeselected |
158 |
+ // here, as the procedure is the same as if the tag had been deselected. |
159 |
+ emit positionableTagDeselected(m_category->name(), item->text(0)); |
160 |
|
161 |
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-4.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-4.patch |
162 |
new file mode 100644 |
163 |
index 0000000000..c35f6ae75f |
164 |
--- /dev/null |
165 |
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-4.patch |
166 |
@@ -0,0 +1,19 @@ |
167 |
+commit de72ff88d7b5f69bacfbe556a5175b311657bc49 |
168 |
+Author: Raymond Wooninck <tittiatcoke@×××××.com> |
169 |
+Date: Tue Jan 24 22:07:59 2017 +0100 |
170 |
+ |
171 |
+ And more of the same |
172 |
+ |
173 |
+diff --git a/AnnotationDialog/DescriptionEdit.cpp b/AnnotationDialog/DescriptionEdit.cpp |
174 |
+index 17d12533..dd746fa2 100644 |
175 |
+--- a/AnnotationDialog/DescriptionEdit.cpp |
176 |
++++ b/AnnotationDialog/DescriptionEdit.cpp |
177 |
+@@ -28,7 +28,7 @@ AnnotationDialog::DescriptionEdit::~DescriptionEdit() |
178 |
+ |
179 |
+ void AnnotationDialog::DescriptionEdit::keyPressEvent(QKeyEvent *event) |
180 |
+ { |
181 |
+- if (event->key() == Qt::Key_PageUp or event->key() == Qt::Key_PageDown) { |
182 |
++ if (event->key() == Qt::Key_PageUp || event->key() == Qt::Key_PageDown) { |
183 |
+ emit pageUpDownPressed(event); |
184 |
+ } else { |
185 |
+ QTextEdit::keyPressEvent(event); |
186 |
|
187 |
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-5.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-5.patch |
188 |
new file mode 100644 |
189 |
index 0000000000..e6d0ce05fa |
190 |
--- /dev/null |
191 |
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-5.patch |
192 |
@@ -0,0 +1,19 @@ |
193 |
+commit ea36a73b1e36dc5cf5ca6d78db9491c40c1d6d4c |
194 |
+Author: Jonathan Riddell <jr@××××××××.org> |
195 |
+Date: Fri Jan 27 15:32:22 2017 +0000 |
196 |
+ |
197 |
+ More fixes for -fno-operator-names |
198 |
+ |
199 |
+diff --git a/AnnotationDialog/ResizableFrame.cpp b/AnnotationDialog/ResizableFrame.cpp |
200 |
+index 2251b2e2..e1afbc00 100644 |
201 |
+--- a/AnnotationDialog/ResizableFrame.cpp |
202 |
++++ b/AnnotationDialog/ResizableFrame.cpp |
203 |
+@@ -427,7 +427,7 @@ void AnnotationDialog::ResizableFrame::setTagData(QString category, QString tag, |
204 |
+ if (changeOrigin == ManualChange) { |
205 |
+ m_changed = true; |
206 |
+ |
207 |
+- if (m_detectedFace and ! m_trained and m_previewWidget->automatedTraining()) { |
208 |
++ if (m_detectedFace && ! m_trained && m_previewWidget->automatedTraining()) { |
209 |
+ m_preview->trainRecognitionDatabase(m_actualCoordinates, m_tagData); |
210 |
+ m_trained = true; |
211 |
+ } |
212 |
|
213 |
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild |
214 |
new file mode 100644 |
215 |
index 0000000000..d95c9c1fd7 |
216 |
--- /dev/null |
217 |
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild |
218 |
@@ -0,0 +1,75 @@ |
219 |
+# Copyright 1999-2017 Gentoo Foundation |
220 |
+# Distributed under the terms of the GNU General Public License v2 |
221 |
+# $Id$ |
222 |
+ |
223 |
+EAPI=6 |
224 |
+ |
225 |
+KDE_HANDBOOK="forceoptional" |
226 |
+inherit kde5 |
227 |
+ |
228 |
+DESCRIPTION="Tool for indexing, searching, and viewing images" |
229 |
+HOMEPAGE="http://www.kphotoalbum.org/" |
230 |
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
231 |
+ |
232 |
+LICENSE="GPL-2+ FDL-1.2" |
233 |
+KEYWORDS="~amd64 ~x86" |
234 |
+IUSE="face +kipi +map +raw" |
235 |
+ |
236 |
+COMMON_DEPEND=" |
237 |
+ $(add_frameworks_dep karchive) |
238 |
+ $(add_frameworks_dep kcompletion) |
239 |
+ $(add_frameworks_dep kconfig) |
240 |
+ $(add_frameworks_dep kconfigwidgets) |
241 |
+ $(add_frameworks_dep kcoreaddons) |
242 |
+ $(add_frameworks_dep ki18n) |
243 |
+ $(add_frameworks_dep kiconthemes) |
244 |
+ $(add_frameworks_dep kio) |
245 |
+ $(add_frameworks_dep kjobwidgets) |
246 |
+ $(add_frameworks_dep kservice) |
247 |
+ $(add_frameworks_dep ktextwidgets) |
248 |
+ $(add_frameworks_dep kwidgetsaddons) |
249 |
+ $(add_frameworks_dep kxmlgui) |
250 |
+ $(add_qt_dep qtdbus) |
251 |
+ $(add_qt_dep qtgui) |
252 |
+ $(add_qt_dep qtnetwork) |
253 |
+ $(add_qt_dep qtsql 'sqlite') |
254 |
+ $(add_qt_dep qtwidgets) |
255 |
+ $(add_qt_dep qtxml) |
256 |
+ media-gfx/exiv2:= |
257 |
+ media-libs/phonon[qt5] |
258 |
+ virtual/jpeg:0 |
259 |
+ face? ( $(add_kdeapps_dep libkface) ) |
260 |
+ kipi? ( $(add_kdeapps_dep libkipi) ) |
261 |
+ map? ( $(add_kdeapps_dep libkgeomap) ) |
262 |
+ raw? ( $(add_kdeapps_dep libkdcraw) ) |
263 |
+" |
264 |
+DEPEND="${COMMON_DEPEND} |
265 |
+ sys-devel/gettext |
266 |
+" |
267 |
+RDEPEND="${COMMON_DEPEND} |
268 |
+ media-video/mplayer |
269 |
+ kipi? ( media-plugins/kipi-plugins:5 ) |
270 |
+ !media-gfx/kphotoalbum:4 |
271 |
+" |
272 |
+ |
273 |
+DOCS=( ChangeLog README ) |
274 |
+ |
275 |
+PATCHES=( |
276 |
+ "${FILESDIR}/${P}-ecm531-1.patch" |
277 |
+ "${FILESDIR}/${P}-ecm531-2.patch" |
278 |
+ "${FILESDIR}/${P}-ecm531-3.patch" |
279 |
+ "${FILESDIR}/${P}-ecm531-4.patch" |
280 |
+ "${FILESDIR}/${P}-ecm531-5.patch" |
281 |
+) |
282 |
+ |
283 |
+src_configure() { |
284 |
+ local mycmakeargs=( |
285 |
+ -DENABLE_PLAYGROUND=ON |
286 |
+ $(cmake-utils_use_find_package face KF5KFace) |
287 |
+ $(cmake-utils_use_find_package kipi KF5Kipi) |
288 |
+ $(cmake-utils_use_find_package map KF5KGeoMap) |
289 |
+ $(cmake-utils_use_find_package raw KF5KDcraw) |
290 |
+ ) |
291 |
+ |
292 |
+ kde5_src_configure |
293 |
+} |