kdelibs-4.14.20-1.parabola1: updating version

2 files changed, 83 insertions, 15 deletions

diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD
index b12a3ba23..9239f43d9 100644
--- a/libre/kdelibs/PKGBUILD
+++ b/libre/kdelibs/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 266408 2016-04-28 07:24:06Z fyan $
+# $Id: PKGBUILD 267355 2016-05-10 16:07:44Z 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.19
-_kdeappver=16.04.0
-pkgrel=2.parabola1
+pkgver=4.14.20
+_kdeappver=16.04.1
+pkgrel=1.parabola1
 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
 arch=('i686' 'x86_64' 'armv7h')
 url='https://www.kde.org/'
@@ -20,21 +20,24 @@ 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')
-sha1sums=('82a3db2c013d269ba850c06c9d1ac53ef6c44623'
+        'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch' 'kdelibs-gcc6.patch')
+sha1sums=('be5cf39d68ff43d01123e4926caf075ae7dc7a7b'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'a1502a964081ad583a00cf90c56e74bf60121830'
-          'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+          'e9c02b761910c34d0f3470645ac4df102cfce5df')
 
 prepare() {
-       mkdir -p build
-       cd ${pkgname}-${pkgver}
-       # avoid file conflict with gnome-menus
-       patch -p1 -i ../kde-applications-menu.patch
-       # don't ask the user to download a plugin, it's probably nonfree
-       patch -p1 -i ../khtml-fsdg.diff
-       # qmake refers to Qt5
-       patch -p1 -i ../qt4.patch
+  mkdir -p build
+  cd ${pkgname}-${pkgver}
+  # avoid file conflict with gnome-menus
+  patch -p1 -i ../kde-applications-menu.patch
+  # don't ask the user to download a plugin, it's probably nonfree
+  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
new file mode 100644
index 000000000..774548730
--- /dev/null
+++ b/libre/kdelibs/kdelibs-gcc6.patch
@@ -0,0 +1,65 @@
+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/solid/solid/backends/shared/cpufeatures.cpp.gcc6	2016-02-11 23:06:08.000000000 -0600
++++ kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp	2016-02-12 19:14:07.708788182 -0600
+@@ -51,23 +51,23 @@ static void sighandler( int )
+ #endif
+ 
+ #ifdef __i386__
+-  #define ASM_REG(reg)              "%e"reg
+-  #define ASM_POP(reg)              "popl   %%e"reg"             \n\t"
+-  #define ASM_PUSH(reg)             "pushl  %%e"reg"             \n\t"
+-  #define ASM_XOR_REG(reg1, reg2)   "xorl   %%e"reg1", %%e"reg2" \n\t"
+-  #define ASM_XOR_VAR(var, reg)     "xorl   "var",     %%e"reg"  \n\t"
+-  #define ASM_CMP_REG(reg1, reg2)   "cmpl   %%e"reg1", %%e"reg2" \n\t"
+-  #define ASM_MOV_REG(reg1, reg2)   "movl   %%e"reg1", %%e"reg2" \n\t"
+-  #define ASM_MOV_VAR(var, reg)     "movl   "var",     %%e"reg"  \n\t"
++  #define ASM_REG(reg)              "%e" reg
++  #define ASM_POP(reg)              "popl   %%e" reg "             \n\t"
++  #define ASM_PUSH(reg)             "pushl  %%e" reg "             \n\t"
++  #define ASM_XOR_REG(reg1, reg2)   "xorl   %%e" reg1 ", %%e" reg2 " \n\t"
++  #define ASM_XOR_VAR(var, reg)     "xorl   " var ",     %%e" reg "  \n\t"
++  #define ASM_CMP_REG(reg1, reg2)   "cmpl   %%e" reg1 ", %%e" reg2 " \n\t"
++  #define ASM_MOV_REG(reg1, reg2)   "movl   %%e" reg1 ", %%e" reg2 " \n\t"
++  #define ASM_MOV_VAR(var, reg)     "movl   " var ",     %%e" reg "  \n\t"
+ #elif defined(__x86_64__)
+-  #define ASM_REG(reg)              "%r"reg
+-  #define ASM_POP(reg)              "popq   %%r"reg"             \n\t"
+-  #define ASM_PUSH(reg)             "pushq  %%r"reg"             \n\t"
+-  #define ASM_XOR_REG(reg1, reg2)   "xorq   %%r"reg1", %%r"reg2" \n\t"
+-  #define ASM_XOR_VAR(var, reg)     "xorq   "var",     %%r"reg"  \n\t"
+-  #define ASM_CMP_REG(reg1, reg2)   "cmpq   %%r"reg1", %%r"reg2" \n\t"
+-  #define ASM_MOV_REG(reg1, reg2)   "movq   %%r"reg1", %%r"reg2" \n\t"
+-  #define ASM_MOV_VAR(var, reg)     "movq   "var",     %%r"reg"  \n\t"
++  #define ASM_REG(reg)              "%r" reg
++  #define ASM_POP(reg)              "popq   %%r" reg "             \n\t"
++  #define ASM_PUSH(reg)             "pushq  %%r" reg "             \n\t"
++  #define ASM_XOR_REG(reg1, reg2)   "xorq   %%r" reg1 ", %%r" reg2 " \n\t"
++  #define ASM_XOR_VAR(var, reg)     "xorq   " var ",     %%r" reg "  \n\t"
++  #define ASM_CMP_REG(reg1, reg2)   "cmpq   %%r" reg1 ", %%r" reg2 " \n\t"
++  #define ASM_MOV_REG(reg1, reg2)   "movq   %%r" reg1 ", %%r" reg2 " \n\t"
++  #define ASM_MOV_VAR(var, reg)     "movq   " var ",     %%r" reg "  \n\t"
+ #endif
+ 
+ #ifdef __PPC__
+--- 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
+