Gentoo Archives: gentoo-commits

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