1 |
kensington 14/12/01 12:27:16 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: digikam-4.4.0-r1.ebuild |
5 |
Log: |
6 |
Backport patch from upstream to solve a hang wrt bug #521992. |
7 |
|
8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.269 media-gfx/digikam/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.269&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.269&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?r1=1.268&r2=1.269 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v |
20 |
retrieving revision 1.268 |
21 |
retrieving revision 1.269 |
22 |
diff -u -r1.268 -r1.269 |
23 |
--- ChangeLog 30 Oct 2014 20:08:53 -0000 1.268 |
24 |
+++ ChangeLog 1 Dec 2014 12:27:16 -0000 1.269 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for media-gfx/digikam |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.268 2014/10/30 20:08:53 dilfridge Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.269 2014/12/01 12:27:16 kensington Exp $ |
30 |
+ |
31 |
+*digikam-4.4.0-r1 (01 Dec 2014) |
32 |
+ |
33 |
+ 01 Dec 2014; Michael Palimaka <kensington@g.o> |
34 |
+ +digikam-4.4.0-r1.ebuild, +files/digikam-4.4.0-hang.patch: |
35 |
+ Backport patch from upstream to solve a hang wrt bug #521992. |
36 |
|
37 |
30 Oct 2014; Andreas K. Huettel <dilfridge@g.o> digikam-4.2.0.ebuild: |
38 |
Fix lensfun dependency, bug 526092 |
39 |
|
40 |
|
41 |
|
42 |
1.1 media-gfx/digikam/digikam-4.4.0-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: digikam-4.4.0-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2014 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.1 2014/12/01 12:27:16 kensington Exp $ |
52 |
|
53 |
EAPI=5 |
54 |
|
55 |
KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb |
56 |
hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru |
57 |
rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu" |
58 |
|
59 |
KDE_HANDBOOK="optional" |
60 |
CMAKE_MIN_VERSION="2.8" |
61 |
KDE_MINIMAL="4.10" |
62 |
|
63 |
KDE_DOC_DIRS="doc-digikam doc-showfoto" |
64 |
|
65 |
inherit kde4-base |
66 |
|
67 |
MY_PV=${PV/_/-} |
68 |
MY_P=${PN}-${MY_PV} |
69 |
|
70 |
DESCRIPTION="Digital photo management application for KDE" |
71 |
HOMEPAGE="http://www.digikam.org/" |
72 |
SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2" |
73 |
|
74 |
LICENSE="GPL-2 |
75 |
handbook? ( FDL-1.2 )" |
76 |
KEYWORDS="~amd64 ~x86" |
77 |
SLOT="4" |
78 |
IUSE="addressbook debug doc gphoto2 mysql nepomuk semantic-desktop themedesigner +thumbnails video" |
79 |
|
80 |
CDEPEND=" |
81 |
$(add_kdebase_dep kdebase-kioslaves) |
82 |
kde-base/libkdcraw:4= |
83 |
kde-base/libkexiv2:4= |
84 |
$(add_kdebase_dep libkipi) |
85 |
kde-base/marble:4=[plasma] |
86 |
media-libs/jasper |
87 |
media-libs/lcms:2 |
88 |
media-libs/lensfun |
89 |
>=media-libs/libkface-3.3.0 |
90 |
media-libs/libkgeomap |
91 |
media-libs/liblqr |
92 |
>=media-libs/libpgf-6.12.27 |
93 |
media-libs/libpng:0= |
94 |
>=media-libs/opencv-2.4.9 |
95 |
media-libs/tiff |
96 |
virtual/jpeg |
97 |
dev-qt/qtgui:4 |
98 |
|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] ) |
99 |
addressbook? ( $(add_kdebase_dep kdepimlibs) ) |
100 |
gphoto2? ( media-libs/libgphoto2:= ) |
101 |
mysql? ( virtual/mysql ) |
102 |
nepomuk? ( |
103 |
dev-libs/shared-desktop-ontologies |
104 |
dev-libs/soprano |
105 |
$(add_kdebase_dep kdelibs 'semantic-desktop(+)') |
106 |
$(add_kdebase_dep nepomuk-core) |
107 |
) |
108 |
semantic-desktop? ( |
109 |
$(add_kdebase_dep baloo) |
110 |
) |
111 |
" |
112 |
RDEPEND="${CDEPEND} |
113 |
$(add_kdebase_dep kreadconfig) |
114 |
media-plugins/kipi-plugins |
115 |
video? ( |
116 |
|| ( |
117 |
$(add_kdebase_dep mplayerthumbs) |
118 |
$(add_kdebase_dep ffmpegthumbs) |
119 |
) |
120 |
) |
121 |
" |
122 |
DEPEND="${CDEPEND} |
123 |
dev-cpp/eigen:3 |
124 |
dev-libs/boost |
125 |
sys-devel/gettext |
126 |
doc? ( app-doc/doxygen ) |
127 |
" |
128 |
|
129 |
S="${WORKDIR}/${MY_P}/core" |
130 |
|
131 |
RESTRICT=test |
132 |
# bug 366505 |
133 |
|
134 |
PATCHES=( |
135 |
"${FILESDIR}/${P}-libkexiv2.patch" |
136 |
"${FILESDIR}/${P}-hang.patch" |
137 |
) |
138 |
|
139 |
src_prepare() { |
140 |
# just to make absolutely sure |
141 |
rm -rf "${WORKDIR}/${MY_P}/extra" || die |
142 |
|
143 |
# prepare the handbook |
144 |
mkdir doc-digikam doc-showfoto || die |
145 |
echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die |
146 |
mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die |
147 |
echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die |
148 |
mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die |
149 |
sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die |
150 |
|
151 |
# prepare the translations |
152 |
mv "${WORKDIR}/${MY_P}/po" po || die |
153 |
find po -name "*.po" -and -not -name "digikam.po" -exec rm {} + |
154 |
|
155 |
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die |
156 |
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die |
157 |
echo "add_subdirectory( po )" >> CMakeLists.txt || die |
158 |
|
159 |
kde4-base_src_prepare |
160 |
|
161 |
if use handbook; then |
162 |
echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt |
163 |
echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt |
164 |
fi |
165 |
} |
166 |
|
167 |
src_configure() { |
168 |
# LQR = only allows to choose between bundled/external |
169 |
local mycmakeargs=( |
170 |
-DENABLE_LCMS2=ON |
171 |
-DFORCED_UNBUNDLE=ON |
172 |
-DWITH_LQR=ON |
173 |
-DWITH_LENSFUN=ON |
174 |
$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT) |
175 |
-DWITH_MarbleWidget=ON |
176 |
$(cmake-utils_use_enable gphoto2 GPHOTO2) |
177 |
$(cmake-utils_use_with gphoto2) |
178 |
$(cmake-utils_use_with nepomuk Soprano) |
179 |
$(cmake-utils_use_enable themedesigner) |
180 |
$(cmake-utils_use_enable thumbnails THUMBS_DB) |
181 |
$(cmake-utils_use_enable mysql INTERNALMYSQL) |
182 |
$(cmake-utils_use_enable debug DEBUG_MESSAGES) |
183 |
$(cmake-utils_use_enable nepomuk NEPOMUKSUPPORT) |
184 |
$(cmake-utils_use_enable semantic-desktop BALOOSUPPORT) |
185 |
) |
186 |
|
187 |
kde4-base_src_configure |
188 |
} |
189 |
|
190 |
src_compile() { |
191 |
local mytargets="all" |
192 |
use doc && mytargets+=" doc" |
193 |
|
194 |
kde4-base_src_compile ${mytargets} |
195 |
} |
196 |
|
197 |
src_install() { |
198 |
kde4-base_src_install |
199 |
|
200 |
if use doc; then |
201 |
# install the api documentation |
202 |
insinto /usr/share/doc/${PF}/ |
203 |
doins -r ${CMAKE_BUILD_DIR}/api/html |
204 |
fi |
205 |
} |
206 |
|
207 |
pkg_postinst() { |
208 |
kde4-base_pkg_postinst |
209 |
|
210 |
if use doc; then |
211 |
einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html" |
212 |
fi |
213 |
} |