1 |
commit: 31d115347979a361eb9e0aa666c5333a9b9591b2 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 9 22:08:09 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 22:27:52 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d11534 |
7 |
|
8 |
media-gfx/kphotoalbum: Fix crash when associating a tag with an area |
9 |
|
10 |
Upstream commit 583e10e8356d2ed64f0358ebf107bff35a98db31 |
11 |
|
12 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/kphotoalbum-5.6-crashfix.patch | 41 +++++++++++++ |
16 |
media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild | 69 ++++++++++++++++++++++ |
17 |
2 files changed, 110 insertions(+) |
18 |
|
19 |
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..96b752bf075 |
22 |
--- /dev/null |
23 |
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch |
24 |
@@ -0,0 +1,41 @@ |
25 |
+From 583e10e8356d2ed64f0358ebf107bff35a98db31 Mon Sep 17 00:00:00 2001 |
26 |
+From: Johannes Zarl-Zierl <johannes@××××××××××.at> |
27 |
+Date: Sun, 9 Feb 2020 22:51:15 +0100 |
28 |
+Subject: Fix crash when associating a tag with an area. |
29 |
+ |
30 |
+If a tag is being associated with an area, the context menu has two |
31 |
+levels: the direct "associate with <last added tag>" and the sub-menu |
32 |
+"associate with..." followed by a list of tags. |
33 |
+ |
34 |
+Each version uses a different function signature for |
35 |
+ResizableFrame::associateTags. When refactoring connections to the "new" |
36 |
+signal-slot syntax in commit c38f5136 (thus released in version 5.6), I |
37 |
+applied the wrong signature to the connect statement. |
38 |
+ |
39 |
+This resulted in a crash/failed assertion when selecting a tag in the |
40 |
+described way. |
41 |
+--- |
42 |
+ AnnotationDialog/ResizableFrame.cpp | 4 ++-- |
43 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
44 |
+ |
45 |
+diff --git a/AnnotationDialog/ResizableFrame.cpp b/AnnotationDialog/ResizableFrame.cpp |
46 |
+index f2dba86..44175fb 100644 |
47 |
+--- a/AnnotationDialog/ResizableFrame.cpp |
48 |
++++ b/AnnotationDialog/ResizableFrame.cpp |
49 |
+@@ -1,4 +1,4 @@ |
50 |
+-/* Copyright (C) 2014-2019 The KPhotoAlbum Development Team |
51 |
++/* Copyright (C) 2014-2020 The KPhotoAlbum Development Team |
52 |
+ |
53 |
+ This program is free software; you can redistribute it and/or |
54 |
+ modify it under the terms of the GNU General Public |
55 |
+@@ -522,7 +522,7 @@ void AnnotationDialog::ResizableFrame::addTagActions(QMenu *menu) |
56 |
+ submenu->addAction(createAssociateTagAction(tag)); |
57 |
+ } |
58 |
+ |
59 |
+- connect(submenu, &QMenu::triggered, this, QOverload<>::of(&ResizableFrame::associateTag)); |
60 |
++ connect(submenu, &QMenu::triggered, this, QOverload<QAction *>::of(&ResizableFrame::associateTag)); |
61 |
+ } |
62 |
+ } |
63 |
+ } |
64 |
+-- |
65 |
+cgit v1.1 |
66 |
|
67 |
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild |
68 |
new file mode 100644 |
69 |
index 00000000000..5c27d00b9ab |
70 |
--- /dev/null |
71 |
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild |
72 |
@@ -0,0 +1,69 @@ |
73 |
+# Copyright 1999-2020 Gentoo Authors |
74 |
+# Distributed under the terms of the GNU General Public License v2 |
75 |
+ |
76 |
+EAPI=7 |
77 |
+ |
78 |
+ECM_HANDBOOK="forceoptional" |
79 |
+KFMIN=5.60.0 |
80 |
+QTMIN=5.12.3 |
81 |
+inherit ecm kde.org |
82 |
+ |
83 |
+DESCRIPTION="Tool for indexing, searching, and viewing images" |
84 |
+HOMEPAGE="https://www.kphotoalbum.org/" |
85 |
+ |
86 |
+if [[ ${KDE_BUILD_TYPE} != live ]]; then |
87 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
88 |
+ KEYWORDS="~amd64 ~x86" |
89 |
+fi |
90 |
+ |
91 |
+LICENSE="GPL-2+ FDL-1.2" |
92 |
+SLOT="5" |
93 |
+IUSE="+kipi map +raw share" |
94 |
+ |
95 |
+DEPEND=" |
96 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
97 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
98 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
99 |
+ >=dev-qt/qtsql-${QTMIN}:5[sqlite] |
100 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
101 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
102 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
103 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
104 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
105 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
106 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
107 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
108 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
109 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
110 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
111 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
112 |
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
113 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
114 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
115 |
+ media-gfx/exiv2:= |
116 |
+ media-libs/phonon[qt5(+)] |
117 |
+ virtual/jpeg:0 |
118 |
+ kipi? ( kde-apps/libkipi:5= ) |
119 |
+ map? ( kde-apps/libkgeomap:5 ) |
120 |
+ raw? ( kde-apps/libkdcraw:5 ) |
121 |
+ share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) |
122 |
+" |
123 |
+RDEPEND="${DEPEND} |
124 |
+ media-video/ffmpeg |
125 |
+ kipi? ( kde-apps/kipi-plugins:5 ) |
126 |
+" |
127 |
+ |
128 |
+DOCS=( ChangeLog README.md ) |
129 |
+ |
130 |
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) |
131 |
+ |
132 |
+src_configure() { |
133 |
+ local mycmakeargs=( |
134 |
+ $(cmake_use_find_package kipi KF5Kipi) |
135 |
+ $(cmake_use_find_package map KF5KGeoMap) |
136 |
+ $(cmake_use_find_package raw KF5KDcraw) |
137 |
+ $(cmake_use_find_package share KF5Purpose) |
138 |
+ ) |
139 |
+ |
140 |
+ ecm_src_configure |
141 |
+} |