1 |
jmbsvicetto 09/03/23 04:37:11 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: kdelibs-4.2.1-r3.ebuild |
5 |
Log: |
6 |
Added ${FILESDIR}/${P}-kdialog.patch and bumped to kdelibs-4.2.1-r3 which should hopefully fix for good upstream bug 186038 and Gentoo bug 261367. This last patch addresses the title issue in |
7 |
system settings. |
8 |
Added the >=xorg-server-1.5.3 dep on plasma use as a first step to remove the hard dep from the kde4-base.eclass to allow KDE-4.2.1 to run on arches that don't have xorg-1.5 yet. |
9 |
(Portage version: 2.2_rc26/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.5 kde-base/kdelibs/metadata.xml |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/metadata.xml?rev=1.5&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/metadata.xml?rev=1.5&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/metadata.xml?r1=1.4&r2=1.5 |
17 |
|
18 |
Index: metadata.xml |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/metadata.xml,v |
21 |
retrieving revision 1.4 |
22 |
retrieving revision 1.5 |
23 |
diff -u -r1.4 -r1.5 |
24 |
--- metadata.xml 28 Feb 2009 10:35:56 -0000 1.4 |
25 |
+++ metadata.xml 23 Mar 2009 04:37:11 -0000 1.5 |
26 |
@@ -5,5 +5,6 @@ |
27 |
<use> |
28 |
<flag name="legacyssl">Support for some deprecated ciphers. Don't use this flag unless you really need it</flag> |
29 |
<flag name="utempter">Records user logins. Useful on multi-user systems</flag> |
30 |
+ <flag name="webkit">Enable QT-WebKit rendering support</flag> |
31 |
</use> |
32 |
</pkgmetadata> |
33 |
|
34 |
|
35 |
|
36 |
1.575 kde-base/kdelibs/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.575&view=markup |
39 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.575&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.574&r2=1.575 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v |
45 |
retrieving revision 1.574 |
46 |
retrieving revision 1.575 |
47 |
diff -u -r1.574 -r1.575 |
48 |
--- ChangeLog 21 Mar 2009 17:28:45 -0000 1.574 |
49 |
+++ ChangeLog 23 Mar 2009 04:37:11 -0000 1.575 |
50 |
@@ -1,6 +1,17 @@ |
51 |
# ChangeLog for kde-base/kdelibs |
52 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.574 2009/03/21 17:28:45 jer Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.575 2009/03/23 04:37:11 jmbsvicetto Exp $ |
55 |
+ |
56 |
+*kdelibs-4.2.1-r3 (23 Mar 2009) |
57 |
+ |
58 |
+ 23 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
59 |
+ +files/kdelibs-4.2.1-kdialog.patch, +kdelibs-4.2.1-r3.ebuild: |
60 |
+ Added ${FILESDIR}/${P}-kdialog.patch and bumped to kdelibs-4.2.1-r3 which |
61 |
+ should hopefully fix for good upstream bug 186038 and Gentoo bug 261367. |
62 |
+ This last patch addresses the title issue in system settings. Added the |
63 |
+ >=xorg-server-1.5.3 dep on plasma use as a first step to remove the hard |
64 |
+ dep from the kde4-base.eclass to allow KDE-4.2.1 to run on arches that |
65 |
+ don't have xorg-1.5 yet. |
66 |
|
67 |
21 Mar 2009; Jeroen Roovers <jer@g.o> kdelibs-4.2.1-r2.ebuild: |
68 |
Marked ~hppa (bug #260777). |
69 |
|
70 |
|
71 |
|
72 |
1.1 kde-base/kdelibs/kdelibs-4.2.1-r3.ebuild |
73 |
|
74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.1-r3.ebuild?rev=1.1&view=markup |
75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.1-r3.ebuild?rev=1.1&content-type=text/plain |
76 |
|
77 |
Index: kdelibs-4.2.1-r3.ebuild |
78 |
=================================================================== |
79 |
# Copyright 1999-2009 Gentoo Foundation |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.1-r3.ebuild,v 1.1 2009/03/23 04:37:11 jmbsvicetto Exp $ |
82 |
|
83 |
EAPI="2" |
84 |
|
85 |
CPPUNIT_REQUIRED="optional" |
86 |
OPENGL_REQUIRED="optional" |
87 |
WEBKIT_REQUIRED="optional" |
88 |
inherit kde4-base fdo-mime |
89 |
|
90 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
91 |
HOMEPAGE="http://www.kde.org/" |
92 |
|
93 |
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" |
94 |
IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos |
95 |
mmx nls openexr plasma +semantic-desktop spell sse sse2 ssl zeroconf" |
96 |
LICENSE="LGPL-2.1" |
97 |
RESTRICT="test" |
98 |
|
99 |
COMMONDEPEND=" |
100 |
>=app-misc/strigi-0.6.3[qt4,dbus] |
101 |
dev-libs/libpcre |
102 |
dev-libs/libxml2 |
103 |
dev-libs/libxslt |
104 |
>=kde-base/automoc-0.9.87 |
105 |
media-fonts/dejavu |
106 |
media-libs/fontconfig |
107 |
media-libs/freetype:2 |
108 |
media-libs/giflib |
109 |
media-libs/jpeg |
110 |
media-libs/libpng |
111 |
>=media-sound/phonon-4.3.1[xcb] |
112 |
sys-apps/dbus[X] |
113 |
sys-libs/zlib |
114 |
x11-libs/libICE |
115 |
x11-libs/libSM |
116 |
x11-libs/libX11 |
117 |
x11-libs/libXau |
118 |
x11-libs/libXcursor |
119 |
x11-libs/libXdmcp |
120 |
x11-libs/libXext |
121 |
x11-libs/libXfixes |
122 |
x11-libs/libXft |
123 |
x11-libs/libXpm |
124 |
x11-libs/libXrender |
125 |
x11-libs/libXtst |
126 |
x11-misc/shared-mime-info |
127 |
acl? ( |
128 |
kernel_linux? ( sys-apps/acl ) |
129 |
) |
130 |
alsa? ( media-libs/alsa-lib[midi] ) |
131 |
bzip2? ( app-arch/bzip2 ) |
132 |
fam? ( virtual/fam ) |
133 |
jpeg2k? ( media-libs/jasper ) |
134 |
kerberos? ( virtual/krb5 ) |
135 |
openexr? ( |
136 |
media-libs/openexr |
137 |
media-libs/ilmbase |
138 |
) |
139 |
opengl? ( virtual/opengl ) |
140 |
plasma? ( >=x11-base/xorg-server-1.5.2 ) |
141 |
semantic-desktop? ( >=dev-libs/soprano-2.2.2[dbus] ) |
142 |
spell? ( |
143 |
app-dicts/aspell-en |
144 |
app-text/aspell |
145 |
app-text/enchant |
146 |
) |
147 |
ssl? ( dev-libs/openssl ) |
148 |
zeroconf? ( |
149 |
|| ( |
150 |
net-dns/avahi[mdnsresponder-compat] |
151 |
!bindist? ( net-misc/mDNSResponder ) |
152 |
) |
153 |
) |
154 |
" |
155 |
DEPEND="${COMMONDEPEND} |
156 |
doc? ( app-doc/doxygen ) |
157 |
nls? ( virtual/libintl ) |
158 |
" |
159 |
# Blockers added for !kdeprefix? due to packages from old versions, |
160 |
# removed in the meanwhile |
161 |
# kde-base/libplasma |
162 |
# kde-base/knewsticker |
163 |
# kde-base/kpercentage |
164 |
# kde-base/ktnef |
165 |
RDEPEND="${COMMONDEPEND} |
166 |
!<=kde-base/kdebase-3.5.9-r4 |
167 |
!<=kde-base/kdebase-startkde-3.5.10 |
168 |
!<kde-base/kdelibs-3.5.10 |
169 |
!x11-libs/qt-phonon |
170 |
!kdeprefix? ( |
171 |
!kde-base/kitchensync:4.1 |
172 |
!kde-base/knewsticker:4.1 |
173 |
!kde-base/kpercentage:4.1 |
174 |
!kde-base/ktnef:4.1 |
175 |
!<kde-base/libkworkspace-${PV}[-kdeprefix] |
176 |
!kde-base/libplasma |
177 |
!<=kde-misc/kdnssd-avahi-0.1.2:0 |
178 |
) |
179 |
kdeprefix? ( |
180 |
!<kde-base/libkworkspace-${PV}:${SLOT} |
181 |
!<=kde-misc/kdnssd-avahi-0.1.2:0 |
182 |
) |
183 |
x11-apps/iceauth |
184 |
x11-apps/rgb |
185 |
" |
186 |
|
187 |
# upstream patches / dist patches |
188 |
# {FILESDIR}/${P}-qt4.5.patch is upstream revision 934640 |
189 |
# and fixes upstream bug 186038 and Gentoo bug 261367 |
190 |
# ${FILESDIR}/${P}-kcatalog.patch fixes gwenview and other issues on both bugs |
191 |
# ${FILESDIR}/${P}-kdialog.patch is upstream revision 938657 and fixes the |
192 |
# systemsettings title issue |
193 |
PATCHES=( |
194 |
"${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch" |
195 |
"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch" |
196 |
"${FILESDIR}/dist/23_solid_no_double_build.patch" |
197 |
"${FILESDIR}/${P}-qt4.5.patch" |
198 |
"${FILESDIR}/${P}-kcatalog.patch" |
199 |
"${FILESDIR}/${P}-kdialog.patch" |
200 |
) |
201 |
|
202 |
src_prepare() { |
203 |
sed -i -e 's/find_package(ACL)/macro_optional_find_package(ACL)/' \ |
204 |
CMakeLists.txt \ |
205 |
|| die "Failed to make ACL disabled even when present in system." |
206 |
|
207 |
kde4-base_src_prepare |
208 |
} |
209 |
|
210 |
src_configure() { |
211 |
if use zeroconf; then |
212 |
if has_version net-dns/avahi; then |
213 |
mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" |
214 |
elif has_version net-misc/mDNSResponder; then |
215 |
mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" |
216 |
else |
217 |
die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." |
218 |
fi |
219 |
fi |
220 |
if use kdeprefix; then |
221 |
HME=".kde${SLOT}" |
222 |
else |
223 |
HME=".kde4" |
224 |
fi |
225 |
mycmakeargs="${mycmakeargs} |
226 |
-DWITH_HSPELL=OFF |
227 |
-DKDE_DEFAULT_HOME=${HME} |
228 |
$(cmake-utils_use_has 3dnow X86_3DNOW) |
229 |
$(cmake-utils_use_has altivec PPC_ALTIVEC) |
230 |
$(cmake-utils_use_has mmx X86_MMX) |
231 |
$(cmake-utils_use_has sse X86_SSE) |
232 |
$(cmake-utils_use_has sse2 X86_SSE2) |
233 |
$(cmake-utils_use_with acl ACL) |
234 |
$(cmake-utils_use_with alsa Alsa) |
235 |
$(cmake-utils_use_with bzip2 BZip2) |
236 |
$(cmake-utils_use_with fam FAM) |
237 |
$(cmake-utils_use_with jpeg2k Jasper) |
238 |
$(cmake-utils_use_with kerberos GSSAPI) |
239 |
$(cmake-utils_use_with nls Libintl) |
240 |
$(cmake-utils_use_with openexr OpenEXR) |
241 |
$(cmake-utils_use_with opengl OpenGL) |
242 |
$(cmake-utils_use_with semantic-desktop Soprano) |
243 |
$(cmake-utils_use_with spell ASPELL) |
244 |
$(cmake-utils_use_with spell ENCHANT) |
245 |
$(cmake-utils_use_with ssl OpenSSL) |
246 |
" |
247 |
kde4-base_src_configure |
248 |
} |
249 |
|
250 |
src_compile() { |
251 |
kde4-base_src_compile |
252 |
|
253 |
# The building of apidox is not managed anymore by the build system |
254 |
if use doc; then |
255 |
einfo "Building API documentation" |
256 |
cd "${S}"/doc/api/ |
257 |
./doxygen.sh "${S}" || die "APIDOX generation failed" |
258 |
fi |
259 |
} |
260 |
|
261 |
src_install() { |
262 |
kde4-base_src_install |
263 |
|
264 |
if use doc; then |
265 |
einfo "Installing API documentation. This could take a bit of time." |
266 |
cd "${S}"/doc/api/ |
267 |
docinto /HTML/en/kdelibs-apidox |
268 |
dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" |
269 |
fi |
270 |
|
271 |
dodir /etc/env.d |
272 |
dodir /etc/revdep-rebuild |
273 |
|
274 |
# List all the multilib libdirs |
275 |
local _libdir _libdirs |
276 |
for _libdir in $(get_all_libdirs); do |
277 |
_libdirs="${_libdirs}:${PREFIX}/${_libdir}" |
278 |
done |
279 |
_libdirs=${_libdirs#:} |
280 |
|
281 |
if use kdeprefix; then |
282 |
cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version |
283 |
PATH="${PREFIX}/bin" |
284 |
ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" |
285 |
LDPATH="${_libdirs}" |
286 |
MANPATH="${PREFIX}/share/man" |
287 |
CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" |
288 |
#KDE_IS_PRELINKED=1 |
289 |
XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" |
290 |
COLON_SEPARATED="XDG_DATA_DIRS" |
291 |
EOF |
292 |
doenvd "${T}"/43kdepaths-${SLOT} |
293 |
|
294 |
# make sure 'source /etc/profile' doesn't hose the PATH |
295 |
dodir /etc/profile.d |
296 |
cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh |
297 |
if [ -n "${KDEDIR}" ]; then |
298 |
export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") |
299 |
export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") |
300 |
fi |
301 |
EOF |
302 |
|
303 |
cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" |
304 |
SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" |
305 |
EOF |
306 |
else # Much simpler for the FHS compliant -kdeprefix install |
307 |
cat <<-EOF > "${T}"/43kdepaths # number goes down with version |
308 |
CONFIG_PROTECT="/usr/share/config" |
309 |
#KDE_IS_PRELINKED=1 |
310 |
XDG_DATA_DIRS="/usr/share:/usr/local/share" |
311 |
COLON_SEPARATED="XDG_DATA_DIRS" |
312 |
EOF |
313 |
doenvd "${T}"/43kdepaths |
314 |
fi |
315 |
# Ensure that the correct permissions are set on ${PREFIX}/share/config |
316 |
fperms 755 "${PREFIX}"/share/config |
317 |
} |
318 |
|
319 |
pkg_postinst() { |
320 |
fdo-mime_mime_database_update |
321 |
if use zeroconf; then |
322 |
echo |
323 |
elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" |
324 |
elog "is running. Make sure also that multicast dns lookups are enabled by editing" |
325 |
elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" |
326 |
elog " hosts: files mdns dns" |
327 |
echo |
328 |
fi |
329 |
elog "Your homedir is set to "'${HOME}'"/${HME}" |
330 |
elog |
331 |
elog "If you experience weird application behavior (missing texts, etc.) run as root:" |
332 |
elog "# chmod 755 -R /usr/share/config $PREFIX/share/config" |
333 |
|
334 |
kde4-base_pkg_postinst |
335 |
} |
336 |
|
337 |
pkg_postrm() { |
338 |
fdo-mime_mime_database_update |
339 |
|
340 |
kde4-base_pkg_postrm |
341 |
} |