diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/kdelibs/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/kdelibs/kdelibs-gcc6.patch | 23 |
2 files changed, 6 insertions, 32 deletions
diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD index 7194835af..d39cc0262 100644 --- a/libre/kdelibs/PKGBUILD +++ b/libre/kdelibs/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 278584 2016-10-13 15:30:27Z arojas $ +# $Id: PKGBUILD 280504 2016-11-10 18:59:38Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdelibs -pkgver=4.14.25 -_kdeappver=16.08.2 +pkgver=4.14.26 +_kdeappver=16.08.3 pkgrel=1.parabola1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'armv7h') @@ -20,12 +20,11 @@ depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4' 'media-player-info' 'libutempter' 'qtwebkit' 'icu') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa') source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz" - 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch' 'kdelibs-gcc6.patch') -sha1sums=('70758ee9bc864e3eabe9cb3a26be815d3504a784' + 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') +sha1sums=('78428269657bc080f8dbcd7fefb11970d7ed870a' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' - 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - '575e52f537e37eeaaaeb639268f9bfa394e7c58d') + 'ed1f57ee661e5c7440efcaba7e51d2554709701c') prepare() { mkdir -p build @@ -36,8 +35,6 @@ prepare() { patch -p1 -i ../khtml-fsdg.diff # qmake refers to Qt5 patch -p1 -i ../qt4.patch - # fix build with GCC 6 (Fedora) - patch -p1 -i ../kdelibs-gcc6.patch } build() { diff --git a/libre/kdelibs/kdelibs-gcc6.patch b/libre/kdelibs/kdelibs-gcc6.patch deleted file mode 100644 index 88bcb13eb..000000000 --- a/libre/kdelibs/kdelibs-gcc6.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp.gcc6 kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp ---- kdelibs-4.14.17/khtml/dom/dom2_traversal.h.gcc6 2016-02-12 19:27:45.874888043 -0600 -+++ kdelibs-4.14.17/khtml/dom/dom2_traversal.h 2016-02-12 19:26:11.777418711 -0600 -@@ -214,7 +214,7 @@ public: - * - */ - enum ShowCode { -- SHOW_ALL = 0xFFFFFFFF, -+ SHOW_ALL = (int)0xFFFFFFFF, - SHOW_ELEMENT = 0x00000001, - SHOW_ATTRIBUTE = 0x00000002, - SHOW_TEXT = 0x00000004, ---- kdelibs-4.14.17/ConfigureChecks.cmake.gcc6 2016-02-11 23:06:08.000000000 -0600 -+++ kdelibs-4.14.17/ConfigureChecks.cmake 2016-02-12 19:14:07.707788177 -0600 -@@ -244,7 +244,7 @@ check_prototype_exists(unsetenv stdlib.h - check_prototype_exists(usleep unistd.h HAVE_USLEEP_PROTO) - check_prototype_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" HAVE_INITGROUPS_PROTO) - check_prototype_exists(setreuid unistd.h HAVE_SETREUID_PROTO) --check_prototype_exists(trunc math.h HAVE_TRUNC) -+check_prototype_exists(truncf math.h HAVE_TRUNC) - - # check for existing datatypes - |