From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SBU8G-0006vh-KR for garchives@archives.gentoo.org; Sat, 24 Mar 2012 16:48:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 857F3E0511; Sat, 24 Mar 2012 16:47:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 475BCE0511 for ; Sat, 24 Mar 2012 16:47:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8567B1B402A for ; Sat, 24 Mar 2012 16:47:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 48CE2E5403 for ; Sat, 24 Mar 2012 16:47:51 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1332606333.7928de25d218d2639d107cf75e47ec7c08e4ab11.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch kde-base/kdelibs/kdelibs-4.8.1-r3.ebuild kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ kde-base/kdelibs/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 7928de25d218d2639d107cf75e47ec7c08e4ab11 X-VCS-Branch: master Date: Sat, 24 Mar 2012 16:47:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0d8ef846-55c1-4f0e-a84b-5acb535abea7 X-Archives-Hash: 550e40875ecc3a996ad38287a0a57bb5 commit: 7928de25d218d2639d107cf75e47ec7c08e4ab11 Author: Andreas K. Huettel (dilfridge) gentoo o= rg> AuthorDate: Sat Mar 24 16:25:33 2012 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sat Mar 24 16:25:33 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D7928de25 [kde-base/kdelibs] Add patch to drop rpath from kde executables (Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit) --- .../files/kdelibs-4.8.1-nepomuk-kmail.patch | 52 ++++++++++++++= ++++++ kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch | 18 +++++++ .../files/kdelibs-4.8.1-sonnet-highlighter.patch | 40 ++++++++++++++= + ...-4.8.49.9999.ebuild =3D> kdelibs-4.8.1-r3.ebuild} | 7 ++- kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild | 1 + kde-base/kdelibs/kdelibs-9999.ebuild | 1 + 6 files changed, 117 insertions(+), 2 deletions(-) diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch b/k= de-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch new file mode 100644 index 0000000..145472d --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.8.1-nepomuk-kmail.patch @@ -0,0 +1,52 @@ +diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.c= pp +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 =3D false; + } + } +@@ -394,15 +394,16 @@ bool Nepomuk::ResourceData::load() +=20 + if(!m_rm->m_watcher) { + m_rm->m_watcher =3D new ResourceWatcher(m_rm->m_manager); ++ m_rm->m_watcher->moveToThread(m_rm->m_manager->thread()); + QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nep= omuk::Resource, Nepomuk::Types::Property, QVariant)), + m_rm->m_manager, SLOT(slotPropertyAdded(N= epomuk::Resource, Nepomuk::Types::Property, QVariant)) ); + QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(N= epomuk::Resource, Nepomuk::Types::Property, QVariant)), + m_rm->m_manager, SLOT(slotPropertyRemoved= (Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) ); + m_rm->m_watcher->addResource( Nepomuk::Resource::fromResour= ceUri(m_uri) ); +- m_rm->m_watcher->start(); ++ QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::Aut= oConnection); + } + else { +- m_rm->m_watcher->addResource( Nepomuk::Resource::fromResour= ceUri(m_uri) ); ++ QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Q= t::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResour= ceUri(m_uri)) ); + } + m_addedToWatcher =3D true; +=20 +diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatch= er.h +index 06b9622..92b12f5 100644 +--- a/nepomuk/core/resourcewatcher.h ++++ b/nepomuk/core/resourcewatcher.h +@@ -93,6 +93,7 @@ namespace Nepomuk { + */ + virtual ~ResourceWatcher(); +=20 ++ public Q_SLOTS: + /** + * \brief Add a type to be watched. + * +@@ -204,7 +205,6 @@ namespace Nepomuk { + */ + QList properties() const; +=20 +- public Q_SLOTS: + /** + * \brief Start the signalling of changes. + * diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-bas= e/kdelibs/files/kdelibs-4.8.1-norpath.patch new file mode 100644 index 0000000..83d5576 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch @@ -0,0 +1,18 @@ +diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelib= s-4.8.1/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake 2012-02-29 2= 2:55:52.000000000 +0100 ++++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake 2012-03-24 17:18:= 59.452942648 +0100 +@@ -1045,7 +1045,13 @@ +=20 + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++ ++ # the RPATH to be used when installing ++ SET(CMAKE_INSTALL_RPATH "") ++ ++ # don't add the automatically determined parts of the RPATH ++ # which point to directories outside the build tree to the instal= l RPATH ++ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) + endif (APPLE) + endif (UNIX) +=20 diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patc= h b/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch new file mode 100644 index 0000000..92a1f45 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.8.1-sonnet-highlighter.patch @@ -0,0 +1,40 @@ +commit 20f73c2150bcd2220fe3604c2ec251b4026a3891 +Author: Montel Laurent +Date: Mon Mar 19 12:30:49 2012 +0100 + + Fix Bug 295615 - kmail crashes trying to edit subject/message body w= ith + =20 + some dictionary languages set in identity properties + =20 + Patch from Matt Whitlock from https://bugs.gentoo.org/show_bug.cgi?i= d=3D407709 + it's right timer can be uninitialize when we change language =3D> it= will + crash + =20 + 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, +=20 + d->dict =3D new Sonnet::Speller(); + d->spellCheckerFound =3D d->dict->isValid(); ++ d->rehighlightRequest =3D new QTimer(this); ++ connect( d->rehighlightRequest, SIGNAL(timeout()), ++ this, SLOT(slotRehighlight())); ++ + if(!d->spellCheckerFound) + return; +=20 +@@ -121,9 +125,6 @@ Highlighter::Highlighter(QTextEdit *textEdit, + for ( QStringList::ConstIterator it =3D l.begin(); it !=3D l.end();= ++it ) { + d->dict->addToSession( *it ); + } +- d->rehighlightRequest =3D new QTimer(this); +- connect( d->rehighlightRequest, SIGNAL(timeout()), +- this, SLOT(slotRehighlight())); + d->completeRehighlightRequired =3D true; + d->rehighlightRequest->setInterval(0); + d->rehighlightRequest->setSingleShot(true); diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdeli= bs/kdelibs-4.8.1-r3.ebuild similarity index 96% copy from kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild copy to kde-base/kdelibs/kdelibs-4.8.1-r3.ebuild index 56163b0..e8d2e62 100644 --- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.8.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.1-r2.ebu= ild,v 1.2 2012/03/23 21:41:16 johu Exp $ =20 EAPI=3D4 =20 @@ -17,7 +17,7 @@ EGIT_BRANCH=3D"KDE/4.8" DESCRIPTION=3D"KDE libraries needed by all KDE programs." HOMEPAGE=3D"http://www.kde.org/" =20 -KEYWORDS=3D"" +KEYWORDS=3D"~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" LICENSE=3D"LGPL-2.1" IUSE=3D"3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k ker= beros lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +ud= isks @@ -127,6 +127,9 @@ PATCHES=3D( "${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" ) =20 pkg_pretend() { diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdeli= bs/kdelibs-4.8.49.9999.ebuild index 56163b0..01a327e 100644 --- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild @@ -127,6 +127,7 @@ PATCHES=3D( "${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-norpath.patch" ) =20 pkg_pretend() { diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdel= ibs-9999.ebuild index cb3f98e..41de55e 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -127,6 +127,7 @@ PATCHES=3D( "${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-norpath.patch" ) =20 pkg_pretend() {