diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-10 13:49:32 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-10 13:49:32 +0200 |
commit | 09dea20d0ca4b034a72f66c2bb22caa976ce1f85 (patch) | |
tree | 936d721a591ceb57c16d769ab0f755514879ed9b /libre/kdelibs-libre/PKGBUILD | |
parent | cdbd7308d16cb249715cce9bedf8b809f2576804 (diff) | |
parent | fc7ee6f5a358c428577ae4e6217ff594a3e45ad3 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gliv/PKGBUILD
community/yaml-cpp0.3/PKGBUILD
extra/ecore/PKGBUILD
extra/edje/PKGBUILD
extra/elementary/PKGBUILD
extra/embryo/PKGBUILD
extra/emotion/PKGBUILD
extra/ethumb/PKGBUILD
extra/kdepim/PKGBUILD
extra/php/PKGBUILD
extra/qtiplot/PKGBUILD
extra/xfce4-mixer/PKGBUILD
Diffstat (limited to 'libre/kdelibs-libre/PKGBUILD')
-rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 5f91616a0..0ebbd68c2 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 183303 2013-04-21 09:43:18Z andrea $ +# $Id: PKGBUILD 184821 2013-05-09 08:05:42Z 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.10.2 -pkgrel=4 +pkgver=4.10.3 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -22,10 +22,12 @@ replaces=('kdelibs') conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') -sha1sums=('2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85' + 'kde-applications-menu.patch' 'qt4.patch' + 'security-fix.patch' 'khtml-fsdg.diff') +sha1sums=('aa154998e227121be82f5b04442e908e7dece01b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' + '506562009a667f18481be0d2c5035b181fce38bb' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -37,6 +39,9 @@ build() { # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff + # KDEBUG#319428 + patch -p1 -i "${srcdir}"/security-fix.patch + cd ../ mkdir build |