diff options
Diffstat (limited to 'libre/kdelibs-libre')
| -rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/kdelibs-libre/fix-application-crashes.patch | 49 |
2 files changed, 8 insertions, 53 deletions
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 77097082a..2f20a872e 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -18,16 +18,17 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'media-player-info' 'libxtst') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') provides=("kdelibs=$pkgver") -replaces=('kdelibs-experimental' 'kdelibs') +replaces=('kdelibs') conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' - 'use-pythondontwritebytecode.patch') + 'use-pythondontwritebytecode.patch' + 'khtml-fsdg.diff') sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa') - + 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' + 'a1502a964081ad583a00cf90c56e74bf60121830') build() { cd "${srcdir}"/${_pkgname}-${pkgver} @@ -36,6 +37,9 @@ build() { # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151) patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch + + # Don't ask the user to download a plugin, it's probably nonfree. + patch -p1 -i "${srcdir}"/khtml-fsdg.diff cd "${srcdir}" mkdir build diff --git a/libre/kdelibs-libre/fix-application-crashes.patch b/libre/kdelibs-libre/fix-application-crashes.patch deleted file mode 100644 index 8ac385483..000000000 --- a/libre/kdelibs-libre/fix-application-crashes.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Vishesh Handa <me@vhanda.in> -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 <me@vhanda.in> -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 ) ) { - |