summaryrefslogtreecommitdiff
path: root/kde-base
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/Manifest1
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch52
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch40
-rw-r--r--kde-base/kdelibs/kdelibs-4.8.1-r3.ebuild314
4 files changed, 0 insertions, 407 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
deleted file mode 100644
index 4e58a4bc0a2..00000000000
--- a/kde-base/kdelibs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdelibs-4.8.1.tar.xz 11664084 SHA256 4a2bebec7907af2822dc19878d9470559dc188c8a6ffe90775c2b8658e9c5fec SHA512 5baada4d865d1bd93251d953f4febae7a84d8fbe279dabcadbfa97b11e630564c7fbaa289e808b34b6c2f4de51af7a65a32e320031daa360edf9f984648f9d61 WHIRLPOOL 7e391dadf719f08aa97ab391270347e3d175bc2b441bb7fc9f0dfc0ec788b59bd05a64b4ca9d6b46ebf2c938a440b6a7a27bcb26c88bfe57bc5e3e5679e0c4e8
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch
deleted file mode 100644
index 145472d17d7..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
-index abe55ea..e65e66e 100644
---- a/nepomuk/core/resourcedata.cpp
-+++ b/nepomuk/core/resourcedata.cpp
-@@ -175,7 +175,7 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
- if( !m_uri.isEmpty() ) {
- m_rm->m_initializedData.remove( m_uri );
- if( m_rm->m_watcher && m_addedToWatcher ) {
-- m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
-+ QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
- m_addedToWatcher = false;
- }
- }
-@@ -394,15 +394,16 @@ bool Nepomuk::ResourceData::load()
-
- if(!m_rm->m_watcher) {
- m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
-+ m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
- QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
- m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
- QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
- m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
- m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
-- m_rm->m_watcher->start();
-+ QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
- }
- else {
-- m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
-+ QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
- }
- m_addedToWatcher = true;
-
-diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
-index 06b9622..92b12f5 100644
---- a/nepomuk/core/resourcewatcher.h
-+++ b/nepomuk/core/resourcewatcher.h
-@@ -93,6 +93,7 @@ namespace Nepomuk {
- */
- virtual ~ResourceWatcher();
-
-+ public Q_SLOTS:
- /**
- * \brief Add a type to be watched.
- *
-@@ -204,7 +205,6 @@ namespace Nepomuk {
- */
- QList<Types::Property> properties() const;
-
-- public Q_SLOTS:
- /**
- * \brief Start the signalling of changes.
- *
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch
deleted file mode 100644
index 92a1f45c61c..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 20f73c2150bcd2220fe3604c2ec251b4026a3891
-Author: Montel Laurent <montel@kde.org>
-Date: Mon Mar 19 12:30:49 2012 +0100
-
- Fix Bug 295615 - kmail crashes trying to edit subject/message body with
-
- some dictionary languages set in identity properties
-
- Patch from Matt Whitlock from https://bugs.gentoo.org/show_bug.cgi?id=407709
- it's right timer can be uninitialize when we change language => it will
- crash
-
- FIXED-IN: 4.8.2
- BUG: 295615
-
-diff --git a/kdeui/sonnet/highlighter.cpp b/kdeui/sonnet/highlighter.cpp
-index 05f7ed1..b10310a 100644
---- a/kdeui/sonnet/highlighter.cpp
-+++ b/kdeui/sonnet/highlighter.cpp
-@@ -108,6 +108,10 @@ Highlighter::Highlighter(QTextEdit *textEdit,
-
- d->dict = new Sonnet::Speller();
- d->spellCheckerFound = d->dict->isValid();
-+ d->rehighlightRequest = new QTimer(this);
-+ connect( d->rehighlightRequest, SIGNAL(timeout()),
-+ this, SLOT(slotRehighlight()));
-+
- if(!d->spellCheckerFound)
- return;
-
-@@ -121,9 +125,6 @@ Highlighter::Highlighter(QTextEdit *textEdit,
- for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) {
- d->dict->addToSession( *it );
- }
-- d->rehighlightRequest = new QTimer(this);
-- connect( d->rehighlightRequest, SIGNAL(timeout()),
-- this, SLOT(slotRehighlight()));
- d->completeRehighlightRequired = true;
- d->rehighlightRequest->setInterval(0);
- d->rehighlightRequest->setSingleShot(true);
diff --git a/kde-base/kdelibs/kdelibs-4.8.1-r3.ebuild b/kde-base/kdelibs/kdelibs-4.8.1-r3.ebuild
deleted file mode 100644
index c54d8c0a63c..00000000000
--- a/kde-base/kdelibs/kdelibs-4.8.1-r3.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.1-r2.ebuild,v 1.2 2012/03/23 21:41:16 johu Exp $
-
-EAPI=4
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base fdo-mime toolchain-funcs
-
-# The "master" branch is out of date, so use KDE/4.8 per upstream's
-# recommendation.
-EGIT_BRANCH="KDE/4.8"
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma
-mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
-+upower upnp zeroconf"
-
-REQUIRED_USE="
- udisks? ( udev )
- upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
- app-crypt/qca:2
- >=app-misc/strigi-0.7.7
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- >=dev-libs/libattica-0.1.90
- >=dev-libs/libdbusmenu-qt-0.3.2
- dev-libs/libpcre[unicode]
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/giflib
- >=media-libs/libpng-1.4
- >=media-libs/phonon-4.4.3
- sys-libs/zlib
- virtual/jpeg
- >=x11-misc/shared-mime-info-0.60
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- !aqua? (
- 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/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? ( sys-libs/libutempter )
- )
- bzip2? ( app-arch/bzip2 )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- kerberos? ( virtual/krb5 )
- openexr? (
- media-libs/openexr
- media-libs/ilmbase
- )
- policykit? ( >=sys-auth/polkit-qt-0.103.0 )
- semantic-desktop? (
- >=dev-libs/shared-desktop-ontologies-0.8.1
- >=dev-libs/soprano-2.7.3[dbus,raptor,redland]
- )
- spell? ( app-text/enchant )
- ssl? ( dev-libs/openssl )
- udev? ( sys-fs/udev )
- upnp? ( media-libs/herqq )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
- !x11-libs/qt-phonon
- >=app-crypt/gnupg-2.0.11
- app-misc/ca-certificates
- $(add_kdebase_dep kde-env)
- !aqua? (
- x11-apps/iceauth
- x11-apps/rgb
- >=x11-misc/xdg-utils-1.0.2-r3
- udisks? ( sys-fs/udisks:0 )
- upower? ( sys-power/upower )
- )
-"
-PDEPEND="
- $(add_kdebase_dep katepart)
- || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
- handbook? ( $(add_kdebase_dep khelpcenter) )
- policykit? (
- >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
- >=sys-auth/polkit-kde-agent-0.99
- )
- semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-"
-
-# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
-add_blocker plasma-workspace 4.7.1
-
-# file collision, bug 394991
-add_blocker kcontrol 4.4.50
-
-PATCHES=(
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
- "${FILESDIR}/${PN}-4.7.96-mimetypes.patch"
- "${FILESDIR}/${PN}-4.4.90-xslt.patch"
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
- "${FILESDIR}/${PN}-4.6.3-bytecode.patch"
- "${FILESDIR}/${PN}-4.8.1-nepomuk-kmail.patch"
- "${FILESDIR}/${PN}-4.8.1-sonnet-highlighter.patch"
- "${FILESDIR}/${PN}-4.8.1-norpath.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
- fi
-}
-
-src_prepare() {
- kde4-base_src_prepare
- use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
-
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
- # getgrouplist not in solaris libc
- epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
- # solaris has no d_type element in dir_ent
- epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
- fi
-}
-
-src_configure() {
- if use zeroconf; then
- if has_version net-dns/avahi; then
- mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
- else
- die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found."
- fi
- else
- mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
- fi
- mycmakeargs+=(
- -DWITH_HSPELL=OFF
- -DWITH_ASPELL=OFF
- -DKDE_DEFAULT_HOME=.kde4
- -DKAUTH_BACKEND=POLKITQT-1
- -DBUILD_libkactivities=OFF
- $(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 policykit PolkitQt-1)
- $(cmake-utils_use_with semantic-desktop Soprano)
- $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
- $(cmake-utils_use_with spell ENCHANT)
- $(cmake-utils_use_with ssl OpenSSL)
- $(cmake-utils_use_with udev UDev)
- $(cmake-utils_use_with upnp HUpnp)
- )
- 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
-
- # use system certificates
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
- 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/*
- fi
-
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
- einfo Installing environment file.
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
- doenvd "${T}/77kde"
-}
-
-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."
- echo
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
- einfo "to include 'mdns', e.g.:"
- einfo " hosts: files mdns dns"
- echo
- fi
-
- elog "Your homedir is set to \${HOME}/.kde4"
- echo
-
- kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
- # Remove ksycoca4 global database
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-
- kde4-base_pkg_postrm
-}