diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-08-22 01:37:45 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-08-22 01:37:45 -0400 |
commit | 50c3a5ea8e1dd04641da3a27f98170157621f74e (patch) | |
tree | 013d885cd1ef17432517fe85743f0b5aa385df14 /libre/kdelibs-libre/PKGBUILD | |
parent | 156c9dd23d8ce1cf4aeaec2040b1cf3c47309094 (diff) | |
parent | dd992ab45849fcef37f98d28fbd87c899262e4f5 (diff) | |
download | abslibre-50c3a5ea8e1dd04641da3a27f98170157621f74e.tar.gz abslibre-50c3a5ea8e1dd04641da3a27f98170157621f74e.tar.bz2 abslibre-50c3a5ea8e1dd04641da3a27f98170157621f74e.zip |
Merge branch 'master' into lukeshu/kernels
Also update linux-libre-grsec because I couldn't verify the checksum of the
now 6-hour obsolete patch.
Conflicts:
libre/linux-libre-grsec/PKGBUILD
libre/lirc-parabola/PKGBUILD
Diffstat (limited to 'libre/kdelibs-libre/PKGBUILD')
-rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 23d59a907..963749145 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.13.3 -pkgrel=3 +pkgver=4.14.0 +pkgrel=1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -21,14 +21,11 @@ depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt' makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch' - 'pyqt.patch' 'kdelibs-cve-2014-5033.patch') -sha1sums=('9c0e963fa2db119ac37e15f31c05d18d3043a58e' + 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') +sha1sums=('d8c56abfa101b0bd39e05ae36b7f6063d8fe360c' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' - 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - 'c7c4cb4e557c4ab07b29ea757b773497cf8b9dbe' - '9c808a7e382f59d730a4ced06ef88165f3d87eec') + 'ed1f57ee661e5c7440efcaba7e51d2554709701c') prepare() { mkdir build @@ -39,11 +36,6 @@ prepare() { patch -p1 -i "${srcdir}"/khtml-fsdg.diff # qmake refers to Qt5 patch -p1 -i "${srcdir}"/qt4.patch - - # support newer PyQt build system - patch -p1 -i "${srcdir}"/pyqt.patch - - patch -p1 -i "${srcdir}/kdelibs-cve-2014-5033.patch" } build() { |