| 1 |
dilfridge 12/07/05 19:56:24 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: kdelibs-4.8.4-r1.ebuild |
| 5 |
Log: |
| 6 |
Fix crash bug 424355, backport of upstream patch. Thanks to Franz Fellner. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha115/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.852 kde-base/kdelibs/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.852&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.852&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.851&r2=1.852 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v |
| 20 |
retrieving revision 1.851 |
| 21 |
retrieving revision 1.852 |
| 22 |
diff -u -r1.851 -r1.852 |
| 23 |
--- ChangeLog 30 Jun 2012 12:16:48 -0000 1.851 |
| 24 |
+++ ChangeLog 5 Jul 2012 19:56:24 -0000 1.852 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for kde-base/kdelibs |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.851 2012/06/30 12:16:48 aballier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.852 2012/07/05 19:56:24 dilfridge Exp $ |
| 30 |
+ |
| 31 |
+*kdelibs-4.8.4-r1 (05 Jul 2012) |
| 32 |
+ |
| 33 |
+ 05 Jul 2012; Andreas K. Huettel <dilfridge@g.o> |
| 34 |
+ +kdelibs-4.8.4-r1.ebuild, +files/kdelibs-4.8.4-kiopointer.patch: |
| 35 |
+ Fix crash bug 424355, backport of upstream patch. Thanks to Franz Fellner. |
| 36 |
|
| 37 |
30 Jun 2012; Alexis Ballier <aballier@g.o> kdelibs-4.8.4.ebuild: |
| 38 |
fix, again, utempter deps on freebsd, even repoman complains. |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 kde-base/kdelibs/kdelibs-4.8.4-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.4-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: kdelibs-4.8.4-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2012 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.4-r1.ebuild,v 1.1 2012/07/05 19:56:24 dilfridge Exp $ |
| 52 |
|
| 53 |
EAPI=4 |
| 54 |
|
| 55 |
CPPUNIT_REQUIRED="optional" |
| 56 |
DECLARATIVE_REQUIRED="always" |
| 57 |
OPENGL_REQUIRED="optional" |
| 58 |
inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
| 59 |
|
| 60 |
# The "master" branch is out of date, so use KDE/4.8 per upstream's |
| 61 |
# recommendation. |
| 62 |
EGIT_BRANCH="KDE/4.8" |
| 63 |
|
| 64 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
| 65 |
HOMEPAGE="http://www.kde.org/" |
| 66 |
|
| 67 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
| 68 |
LICENSE="LGPL-2.1" |
| 69 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma |
| 70 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
| 71 |
+upower upnp zeroconf" |
| 72 |
|
| 73 |
REQUIRED_USE=" |
| 74 |
udisks? ( udev ) |
| 75 |
upower? ( udev ) |
| 76 |
" |
| 77 |
|
| 78 |
# needs the kate regression testsuite from svn |
| 79 |
RESTRICT="test" |
| 80 |
|
| 81 |
COMMONDEPEND=" |
| 82 |
app-crypt/qca:2 |
| 83 |
>=app-misc/strigi-0.7.7 |
| 84 |
app-text/docbook-xml-dtd:4.2 |
| 85 |
app-text/docbook-xsl-stylesheets |
| 86 |
>=dev-libs/libattica-0.1.90 |
| 87 |
>=dev-libs/libdbusmenu-qt-0.3.2 |
| 88 |
dev-libs/libpcre[unicode] |
| 89 |
dev-libs/libxml2 |
| 90 |
dev-libs/libxslt |
| 91 |
media-libs/fontconfig |
| 92 |
media-libs/freetype:2 |
| 93 |
media-libs/giflib |
| 94 |
>=media-libs/libpng-1.4 |
| 95 |
>=media-libs/phonon-4.4.3 |
| 96 |
sys-libs/zlib |
| 97 |
virtual/jpeg |
| 98 |
>=x11-misc/shared-mime-info-0.60 |
| 99 |
acl? ( virtual/acl ) |
| 100 |
alsa? ( media-libs/alsa-lib ) |
| 101 |
!aqua? ( |
| 102 |
x11-libs/libICE |
| 103 |
x11-libs/libSM |
| 104 |
x11-libs/libX11 |
| 105 |
x11-libs/libXau |
| 106 |
x11-libs/libXcursor |
| 107 |
x11-libs/libXdmcp |
| 108 |
x11-libs/libXext |
| 109 |
x11-libs/libXfixes |
| 110 |
x11-libs/libXft |
| 111 |
x11-libs/libXpm |
| 112 |
x11-libs/libXrender |
| 113 |
x11-libs/libXScrnSaver |
| 114 |
x11-libs/libXtst |
| 115 |
!kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) |
| 116 |
) |
| 117 |
bzip2? ( app-arch/bzip2 ) |
| 118 |
fam? ( virtual/fam ) |
| 119 |
jpeg2k? ( media-libs/jasper ) |
| 120 |
kerberos? ( virtual/krb5 ) |
| 121 |
openexr? ( |
| 122 |
media-libs/openexr |
| 123 |
media-libs/ilmbase |
| 124 |
) |
| 125 |
policykit? ( >=sys-auth/polkit-qt-0.103.0 ) |
| 126 |
semantic-desktop? ( |
| 127 |
>=dev-libs/shared-desktop-ontologies-0.8.1 |
| 128 |
>=dev-libs/soprano-2.7.6[dbus,raptor,redland] |
| 129 |
) |
| 130 |
spell? ( app-text/enchant ) |
| 131 |
ssl? ( dev-libs/openssl ) |
| 132 |
udev? ( sys-fs/udev ) |
| 133 |
upnp? ( media-libs/herqq ) |
| 134 |
zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
| 135 |
" |
| 136 |
DEPEND="${COMMONDEPEND} |
| 137 |
doc? ( app-doc/doxygen ) |
| 138 |
nls? ( virtual/libintl ) |
| 139 |
" |
| 140 |
RDEPEND="${COMMONDEPEND} |
| 141 |
!x11-libs/qt-phonon |
| 142 |
>=app-crypt/gnupg-2.0.11 |
| 143 |
app-misc/ca-certificates |
| 144 |
$(add_kdebase_dep kde-env) |
| 145 |
!aqua? ( |
| 146 |
x11-apps/iceauth |
| 147 |
x11-apps/rgb |
| 148 |
>=x11-misc/xdg-utils-1.0.2-r3 |
| 149 |
udisks? ( sys-fs/udisks:0 ) |
| 150 |
upower? ( sys-power/upower ) |
| 151 |
) |
| 152 |
" |
| 153 |
PDEPEND=" |
| 154 |
$(add_kdebase_dep katepart) |
| 155 |
|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) |
| 156 |
handbook? ( $(add_kdebase_dep khelpcenter) ) |
| 157 |
policykit? ( |
| 158 |
>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 |
| 159 |
>=sys-auth/polkit-kde-agent-0.99 |
| 160 |
) |
| 161 |
semantic-desktop? ( $(add_kdebase_dep nepomuk) ) |
| 162 |
" |
| 163 |
|
| 164 |
# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities |
| 165 |
add_blocker plasma-workspace 4.7.1 |
| 166 |
|
| 167 |
# file collision, bug 394991 |
| 168 |
add_blocker kcontrol 4.4.50 |
| 169 |
|
| 170 |
PATCHES=( |
| 171 |
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
| 172 |
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
| 173 |
"${FILESDIR}/${PN}-4.7.96-mimetypes.patch" |
| 174 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 175 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 176 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
| 177 |
"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" |
| 178 |
"${FILESDIR}/${PN}-4.8.4-bytecode.patch" |
| 179 |
"${FILESDIR}/${PN}-4.8.4-sopranorevert1.patch" |
| 180 |
"${FILESDIR}/${PN}-4.8.4-sopranorevert2.patch" |
| 181 |
"${FILESDIR}/${PN}-4.8.4-power.patch" |
| 182 |
"${FILESDIR}/${PN}-4.8.4-kiopointer.patch" |
| 183 |
) |
| 184 |
|
| 185 |
pkg_pretend() { |
| 186 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 187 |
[[ $(gcc-major-version) -lt 4 ]] || \ |
| 188 |
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
| 189 |
&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." |
| 190 |
fi |
| 191 |
} |
| 192 |
|
| 193 |
src_prepare() { |
| 194 |
kde4-base_src_prepare |
| 195 |
use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
| 196 |
|
| 197 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
| 198 |
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
| 199 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
| 200 |
|
| 201 |
if use aqua; then |
| 202 |
sed -i -e \ |
| 203 |
"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ |
| 204 |
cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" |
| 205 |
|
| 206 |
#if [[ ${CHOST} == *-darwin8 ]]; then |
| 207 |
sed -i -e \ |
| 208 |
"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ |
| 209 |
cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" |
| 210 |
#fi |
| 211 |
|
| 212 |
# solid/solid/backends/iokit doesn't properly link, so disable it. |
| 213 |
sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ |
| 214 |
|| die "disabling solid/solid/backends/iokit failed" |
| 215 |
sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ |
| 216 |
|| die "disabling solid/solid/backends/iokit failed" |
| 217 |
|
| 218 |
# There's no fdatasync on OSX and the check fails to detect that. |
| 219 |
sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ |
| 220 |
|| die "disabling fdatasync failed" |
| 221 |
|
| 222 |
# Fix nameser include to nameser8_compat |
| 223 |
sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ |
| 224 |
|| die "fixing nameser include failed" |
| 225 |
append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 |
| 226 |
|
| 227 |
# Try to fix kkeyserver_mac |
| 228 |
epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch |
| 229 |
fi |
| 230 |
|
| 231 |
if [[ ${CHOST} == *-solaris* ]] ; then |
| 232 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" |
| 233 |
# getgrouplist not in solaris libc |
| 234 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" |
| 235 |
# solaris has no d_type element in dir_ent |
| 236 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" |
| 237 |
fi |
| 238 |
} |
| 239 |
|
| 240 |
src_configure() { |
| 241 |
if use zeroconf; then |
| 242 |
if has_version net-dns/avahi; then |
| 243 |
mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) |
| 244 |
else |
| 245 |
die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found." |
| 246 |
fi |
| 247 |
else |
| 248 |
mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) |
| 249 |
fi |
| 250 |
mycmakeargs+=( |
| 251 |
-DWITH_HSPELL=OFF |
| 252 |
-DWITH_ASPELL=OFF |
| 253 |
-DKDE_DEFAULT_HOME=.kde4 |
| 254 |
-DKAUTH_BACKEND=POLKITQT-1 |
| 255 |
-DBUILD_libkactivities=OFF |
| 256 |
$(cmake-utils_use_build handbook doc) |
| 257 |
$(cmake-utils_use_has 3dnow X86_3DNOW) |
| 258 |
$(cmake-utils_use_has altivec PPC_ALTIVEC) |
| 259 |
$(cmake-utils_use_has mmx X86_MMX) |
| 260 |
$(cmake-utils_use_has sse X86_SSE) |
| 261 |
$(cmake-utils_use_has sse2 X86_SSE2) |
| 262 |
$(cmake-utils_use_with acl) |
| 263 |
$(cmake-utils_use_with alsa) |
| 264 |
$(cmake-utils_use_with bzip2 BZip2) |
| 265 |
$(cmake-utils_use_with fam) |
| 266 |
$(cmake-utils_use_with jpeg2k Jasper) |
| 267 |
$(cmake-utils_use_with kerberos GSSAPI) |
| 268 |
$(cmake-utils_use_with lzma LibLZMA) |
| 269 |
$(cmake-utils_use_with nls Libintl) |
| 270 |
$(cmake-utils_use_with openexr OpenEXR) |
| 271 |
$(cmake-utils_use_with opengl OpenGL) |
| 272 |
$(cmake-utils_use_with policykit PolkitQt-1) |
| 273 |
$(cmake-utils_use_with semantic-desktop Soprano) |
| 274 |
$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) |
| 275 |
$(cmake-utils_use_with spell ENCHANT) |
| 276 |
$(cmake-utils_use_with ssl OpenSSL) |
| 277 |
$(cmake-utils_use_with udev UDev) |
| 278 |
$(cmake-utils_use_with upnp HUpnp) |
| 279 |
) |
| 280 |
kde4-base_src_configure |
| 281 |
} |
| 282 |
|
| 283 |
src_compile() { |
| 284 |
kde4-base_src_compile |
| 285 |
|
| 286 |
# The building of apidox is not managed anymore by the build system |
| 287 |
if use doc; then |
| 288 |
einfo "Building API documentation" |
| 289 |
cd "${S}"/doc/api/ |
| 290 |
./doxygen.sh "${S}" || die "APIDOX generation failed" |
| 291 |
fi |
| 292 |
} |
| 293 |
|
| 294 |
src_install() { |
| 295 |
kde4-base_src_install |
| 296 |
|
| 297 |
# use system certificates |
| 298 |
rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
| 299 |
dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
| 300 |
|
| 301 |
if use doc; then |
| 302 |
einfo "Installing API documentation. This could take a bit of time." |
| 303 |
cd "${S}"/doc/api/ |
| 304 |
docinto /HTML/en/kdelibs-apidox |
| 305 |
dohtml -r ${P}-apidocs/* |
| 306 |
fi |
| 307 |
|
| 308 |
if use aqua; then |
| 309 |
einfo "fixing ${PN} plugins" |
| 310 |
|
| 311 |
local _PV=${PV:0:3}.0 |
| 312 |
local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script |
| 313 |
|
| 314 |
install_name_tool -id \ |
| 315 |
"${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
| 316 |
"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
| 317 |
|| die "failed fixing libkrossqtsplugin.${_PV}.dylib" |
| 318 |
|
| 319 |
einfo "fixing ${PN} cmake detection files" |
| 320 |
#sed -i -e \ |
| 321 |
# "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ |
| 322 |
echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ |
| 323 |
"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ |
| 324 |
|| die "failed fixing FindXKB.cmake" |
| 325 |
fi |
| 326 |
|
| 327 |
einfo Installing environment file. |
| 328 |
# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. |
| 329 |
echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
| 330 |
echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
| 331 |
doenvd "${T}/77kde" |
| 332 |
} |
| 333 |
|
| 334 |
pkg_postinst() { |
| 335 |
fdo-mime_mime_database_update |
| 336 |
|
| 337 |
if use zeroconf; then |
| 338 |
echo |
| 339 |
elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" |
| 340 |
elog "is running." |
| 341 |
echo |
| 342 |
einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
| 343 |
einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
| 344 |
einfo "to include 'mdns', e.g.:" |
| 345 |
einfo " hosts: files mdns dns" |
| 346 |
echo |
| 347 |
fi |
| 348 |
|
| 349 |
elog "Your homedir is set to \${HOME}/.kde4" |
| 350 |
echo |
| 351 |
|
| 352 |
kde4-base_pkg_postinst |
| 353 |
} |
| 354 |
|
| 355 |
pkg_prerm() { |
| 356 |
# Remove ksycoca4 global database |
| 357 |
rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 |
| 358 |
} |
| 359 |
|
| 360 |
pkg_postrm() { |
| 361 |
fdo-mime_mime_database_update |
| 362 |
|
| 363 |
kde4-base_pkg_postrm |
| 364 |
} |
Archives