diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-08 09:16:29 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-08 09:16:29 -0300 |
| commit | 91b1c319d6364307eb3bfcb0768e3eaa09df7c17 (patch) | |
| tree | 91a5fcd8f433130db7dfc8060b66f98103949797 /libre/kdelibs-libre/PKGBUILD | |
| parent | 0c2419984cf5501fc1ba410e09f61fa4112c7d2a (diff) | |
| parent | 9bb78d53ceba7b16ef8374b20c4ed662e34b789c (diff) | |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Conflicts:
libre/kdelibs-libre/PKGBUILD
Diffstat (limited to 'libre/kdelibs-libre/PKGBUILD')
| -rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 12 |
1 files changed, 8 insertions, 4 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 |