Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=e3a8461bab6f5347bf7456d8f3f5c8ea3187ccb4
commit e3a8461bab6f5347bf7456d8f3f5c8ea3187ccb4 Author: Melko <[email protected]> Date: Wed Aug 1 20:03:36 2012 +0200 kdelibs-4.9.0-1-x86_64 * version bump * drop patch diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild index b588a7f..827f6b6 100644 --- a/source/kde/kdelibs/FrugalBuild +++ b/source/kde/kdelibs/FrugalBuild @@ -4,7 +4,7 @@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"} pkgname=kdelibs -pkgrel=2 +pkgrel=1 pkgdesc="KDE4 Core Libraries." groups=('kde') archs=('i686' 'x86_64') @@ -15,12 +15,10 @@ makedepends=("${makedepends[@]}" "krb5" "libqttest>=$_F_kde_qtver" \ "shared-desktop-ontologies>=0.5" "soprano-backend-redland>=2.7.0") source=("${source[@]}" \ frugalware-menu.patch \ - kde-applications-menu.patch \ - fix-application-crashes.patch) + kde-applications-menu.patch) sha1sums=("${sha1sums[@]}" \ 'c657c474875c155197dde1c846f1791e744febc2' \ - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' \ - '2735449f8ef450577ad0e9bd99c98bcc11717478') + '86ee8c8660f19de8141ac99cd6943964d97a1ed7') provides=('kat' 'libkdecore-data') conflicts=("${provides[@]}") diff --git a/source/kde/kdelibs/fix-application-crashes.patch b/source/kde/kdelibs/fix-application-crashes.patch deleted file mode 100644 index 064be66..0000000 --- a/source/kde/kdelibs/fix-application-crashes.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Vishesh Handa <[email protected]> -Date: Wed, 13 Jun 2012 21:26:31 +0000 -Subject: Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d ---- -Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" - -This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91. - -This is done so that 4.8.x works with Soprano 2.7.6 ---- - - ---- a/nepomuk/core/nepomukmainmodel.cpp -+++ b/nepomuk/core/nepomukmainmodel.cpp -@@ -94,7 +94,7 @@ public: - - // we may get disconnected from the server but we don't want to try - // to connect every time the model is requested -- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { -+ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) { - delete localSocketModel; - localSocketModel = 0; - QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); - -From: Vishesh Handa <[email protected]> -Date: Wed, 13 Jun 2012 21:25:32 +0000 -Subject: Revert "Disconnect before re-connecting. Soprano does not do that for us." -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=76e0376d7582cfe5b898c56bf3779ca2279dace8 ---- -Revert "Disconnect before re-connecting. Soprano does not do that for us." - -This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf. - -This is being done so that KDE 4.8.x works with Soprano 2.7.6 ---- - - ---- a/nepomuk/core/nepomukmainmodel.cpp -+++ b/nepomuk/core/nepomukmainmodel.cpp -@@ -97,7 +97,6 @@ public: - if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { - delete localSocketModel; - localSocketModel = 0; -- localSocketClient.disconnect(); - QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); - kDebug() << "Connecting to local socket" << socketName; - if ( localSocketClient.connect( socketName ) ) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
