diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-03 13:40:53 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-03 13:40:53 +0200 |
| commit | cac6c854c6777f9c69230e8cf4a08c25f6b981cf (patch) | |
| tree | 5f6d013bde41fb361e5d6f736b6531e5bb47cd34 /libre/kdelibs-libre/PKGBUILD | |
| parent | 5fcf983414b164c522a9ba73df27b13d28cde35b (diff) | |
| parent | 60f7eab28ba0dd57c8ce519609f393dd3931b621 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
multilib/lib32-libcups/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine_gecko/PKGBUILD
staging/kdebase-runtime/PKGBUILD
staging/kdegraphics-gwenview/PKGBUILD
staging/libkexiv2/PKGBUILD
testing/akonadi/PKGBUILD
testing/k3b/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebindings-python/PKGBUILD
testing/kdeedu-kig/PKGBUILD
testing/kdeedu-rocs/PKGBUILD
testing/openldap/PKGBUILD
testing/openldap/slapd
Diffstat (limited to 'libre/kdelibs-libre/PKGBUILD')
| -rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 25084c92c..0d3517f1c 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 162798 2012-06-30 15:30:51Z andrea $ +# $Id: PKGBUILD 164627 2012-08-01 15:06:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.8.4 -pkgrel=4 +pkgver=4.9.0 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org' +url='https://projects.kde.org/projects/kde/kdelibs' license=('GPL' 'LGPL' 'FDL') depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' @@ -18,18 +18,16 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'media-player-info') 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' - 'fix-application-crashes.patch' 'khtml-fsdg.diff') -sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49' +sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' - 'c271c712bf202f517015b597d61cfe1aed0db82b' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -40,9 +38,7 @@ build() { # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151) patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch - - # KDEBUG 301453 - patch -p1 -i "${srcdir}"/fix-application-crashes.patch + # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff |