diff options
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.3.1-dom-docimpl-crash.patch | 39 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.3.1-r2.ebuild | 230 |
2 files changed, 269 insertions, 0 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-dom-docimpl-crash.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-dom-docimpl-crash.patch new file mode 100644 index 00000000000..f508440759f --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.3.1-dom-docimpl-crash.patch @@ -0,0 +1,39 @@ +--- khtml/xml/dom_docimpl.cpp 2009/06/24 10:17:04 986143 ++++ khtml/xml/dom_docimpl.cpp 2009/09/27 00:13:24 1028402 +@@ -2451,8 +2451,11 @@ + + if (m_focusNode != newFocusNode) { + NodeImpl *oldFocusNode = m_focusNode; +- // Set focus on the new node +- m_focusNode = newFocusNode; ++ ++ // We are blurring, so m_focusNode ATM is 0; this is observable to the ++ // event handlers. ++ m_focusNode = 0; ++ + // Remove focus from the existing focus node (if any) + if (oldFocusNode) { + if (oldFocusNode->active()) +@@ -2470,7 +2473,8 @@ + oldFocusNode->dispatchUIEvent(EventImpl::DOMFOCUSOUT_EVENT); + + if ((oldFocusNode == this) && oldFocusNode->hasOneRef()) { +- oldFocusNode->deref(); // deletes this ++ oldFocusNode->deref(); // may delete this, if there are not kids keeping it alive... ++ // so we better not add any. + return; + } + else { +@@ -2478,7 +2482,11 @@ + } + } + +- if (m_focusNode) { ++ // It's possible that one of the blur, etc. handlers has already set focus. ++ // in that case, we don't want to override it. ++ if (!m_focusNode && newFocusNode) { ++ // Set focus on the new node ++ m_focusNode = newFocusNode; + m_focusNode->ref(); + m_focusNode->dispatchHTMLEvent(EventImpl::FOCUS_EVENT,false,false); + if (m_focusNode != newFocusNode) return; diff --git a/kde-base/kdelibs/kdelibs-4.3.1-r2.ebuild b/kde-base/kdelibs/kdelibs-4.3.1-r2.ebuild new file mode 100644 index 00000000000..c8bba63ec44 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-4.3.1-r2.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.1.ebuild,v 1.2 2009/09/07 02:34:08 jmbsvicetto Exp $ + +EAPI="2" + +CPPUNIT_REQUIRED="optional" +OPENGL_REQUIRED="optional" +WEBKIT_REQUIRED="always" +inherit kde4-base fdo-mime + +DESCRIPTION="KDE libraries needed by all KDE programs." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +LICENSE="LGPL-2.1" +IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos +lzma mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" + +# needs the kate regression testsuite from svn +RESTRICT="test" + +COMMONDEPEND=" + >=app-misc/strigi-0.6.3[dbus,qt4] + dev-libs/libpcre + dev-libs/libxml2 + dev-libs/libxslt + >=kde-base/automoc-0.9.87 + media-libs/fontconfig + media-libs/freetype:2 + media-libs/giflib + media-libs/jpeg + media-libs/libpng + >=media-sound/phonon-4.4_pre[xcb] + sys-apps/dbus[X] + sys-libs/libutempter + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXcursor + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXrender + x11-libs/libXtst + >=x11-misc/shared-mime-info-0.60 + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + bzip2? ( app-arch/bzip2 ) + fam? ( virtual/fam ) + jpeg2k? ( media-libs/jasper ) + kerberos? ( virtual/krb5 ) + lzma? ( app-arch/xz-utils ) + openexr? ( + media-libs/openexr + media-libs/ilmbase + ) + semantic-desktop? ( >=dev-libs/soprano-2.3.0[dbus] ) + spell? ( + app-dicts/aspell-en + app-text/aspell + app-text/enchant + ) + ssl? ( dev-libs/openssl ) + zeroconf? ( + || ( + net-dns/avahi[mdnsresponder-compat] + !bindist? ( net-misc/mDNSResponder ) + ) + ) +" +DEPEND="${COMMONDEPEND} + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +# Blockers added for !kdeprefix? due to packages from old versions, +# removed in the meanwhile +# kde-base/libplasma +# kde-base/knewsticker +# kde-base/kpercentage +# kde-base/ktnef +RDEPEND="${COMMONDEPEND} + !<=kde-base/kdebase-3.5.9-r4 + !<=kde-base/kdebase-startkde-3.5.10 + !<kde-base/kdelibs-3.5.10 + !<=kde-misc/kdnssd-avahi-0.1.2:0 + !x11-libs/qt-phonon + !kdeprefix? ( + !kde-base/kitchensync:4.1[-kdeprefix] + !kde-base/knewsticker:4.1[-kdeprefix] + !kde-base/kpercentage:4.1[-kdeprefix] + !kde-base/ktnef:4.1[-kdeprefix] + !kde-base/libplasma[-kdeprefix] + !kde-base/libkworkspace:4.2[-kdeprefix] + ) + >=app-crypt/gnupg-2.0.11 + x11-apps/iceauth + x11-apps/rgb + >=x11-misc/xdg-utils-1.0.2-r3 +" +PDEPEND=" + >=kde-base/kde-env-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdebase-data-${PV}:${SLOT}[kdeprefix=] + >=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=] +" + +PATCHES=( + "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch" + "${FILESDIR}/dist/23_solid_no_double_build.patch" + "${FILESDIR}/${P}-dom-docimpl-crash.patch" + +) + +src_prepare() { + kde4-base_src_prepare + + # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work) + local menu_prefix="kde-${SLOT}-" + sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \ + -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." + sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|" \ + -i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed." + + # FIXME Remove experimental folder from CMakeLists - we have + # kde-base/libknotificationitem for now + sed -e "/macro_optional_add_subdirectory( experimental )/ s:^:#:" \ + -i CMakeLists.txt || die "Failed to sed-out experimental." +} + +src_configure() { + if use zeroconf; then + if has_version net-dns/avahi; then + mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" + elif has_version net-misc/mDNSResponder; then + mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" + else + die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + fi + else + mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=OFF" + fi + if use kdeprefix; then + HME=".kde${SLOT}" + else + HME=".kde4" + fi + mycmakeargs="${mycmakeargs} + -DWITH_HSPELL=OFF + -DKDE_DEFAULT_HOME=${HME} + $(cmake-utils_use_build handbook doc) + $(cmake-utils_use_has 3dnow X86_3DNOW) + $(cmake-utils_use_has altivec PPC_ALTIVEC) + $(cmake-utils_use_has mmx X86_MMX) + $(cmake-utils_use_has sse X86_SSE) + $(cmake-utils_use_has sse2 X86_SSE2) + $(cmake-utils_use_with acl) + $(cmake-utils_use_with alsa) + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with fam) + $(cmake-utils_use_with jpeg2k Jasper) + $(cmake-utils_use_with kerberos GSSAPI) + $(cmake-utils_use_with lzma LibLZMA) + $(cmake-utils_use_with nls Libintl) + $(cmake-utils_use_with openexr OpenEXR) + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with spell ASPELL) + $(cmake-utils_use_with spell ENCHANT) + $(cmake-utils_use_with ssl OpenSSL) + " + kde4-base_src_configure +} + +src_compile() { + kde4-base_src_compile + + # The building of apidox is not managed anymore by the build system + if use doc; then + einfo "Building API documentation" + cd "${S}"/doc/api/ + ./doxygen.sh "${S}" || die "APIDOX generation failed" + fi +} + +src_install() { + kde4-base_src_install + + if use doc; then + einfo "Installing API documentation. This could take a bit of time." + cd "${S}"/doc/api/ + docinto /HTML/en/kdelibs-apidox + dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" + fi +} + +pkg_postinst() { + fdo-mime_mime_database_update + if use zeroconf; then + echo + elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" + elog "is running. Make sure also that multicast dns lookups are enabled by editing" + elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" + elog " hosts: files mdns dns" + echo + fi + elog "Your homedir is set to "'${HOME}'"/${HME}" + elog + local config_path="${ROOT}usr/share/config" + [[ ${PREFIX} != "${ROOT}usr" ]] && config_path+=" ${PREFIX}/share/config" + elog "If you experience weird application behavior (missing texts, etc.) run as root:" + elog "# chmod 755 -R ${config_path}" + + kde4-base_pkg_postinst +} + +pkg_prerm() { + # Remove ksycoca4 global database + rm -f "${PREFIX}"/share/kde4/services/ksycoca4 +} + +pkg_postrm() { + fdo-mime_mime_database_update + + kde4-base_pkg_postrm +} |