[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     7928de25d218d2639d107cf75e47ec7c08e4ab11
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 16:25:33 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 16:25:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7928de25

[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 => 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/kde-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.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-norpath.patch b/kde-base/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 kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake	2012-02-29 22:55:52.000000000 +0100
++++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake	2012-03-24 17:18:59.452942648 +0100
+@@ -1045,7 +1045,13 @@
+ 
+       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 install RPATH
++      SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+    endif (APPLE)
+ endif (UNIX)
+ 

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
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 <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.49.9999.ebuild b/kde-base/kdelibs/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.ebuild,v 1.2 2012/03/23 21:41:16 johu Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ EGIT_BRANCH="KDE/4.8"
 DESCRIPTION="KDE libraries needed by all KDE programs."
 HOMEPAGE="http://www.kde.org/"
 
-KEYWORDS=""
+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
@@ -127,6 +127,9 @@ PATCHES=(
 	"${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() {

diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdelibs/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=(
 	"${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"
 )
 
 pkg_pretend() {

diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-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=(
 	"${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"
 )
 
 pkg_pretend() {