diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/kdelibs/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/kdelibs/kdelibs-gcc6.patch | 42 |
2 files changed, 5 insertions, 47 deletions
diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD index 657d80c06..44f480455 100644 --- a/libre/kdelibs/PKGBUILD +++ b/libre/kdelibs/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 269484 2016-06-14 08:32:06Z arojas $ +# $Id: PKGBUILD 271532 2016-07-12 17:20:33Z 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.21 -_kdeappver=16.04.2 +pkgver=4.14.22 +_kdeappver=16.04.3 pkgrel=1.parabola1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'armv7h') @@ -21,11 +21,11 @@ depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4' 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=('a91683ded5887637cf12492c956b68359368a7c1' +sha1sums=('c60b3a996da53360892cf7f44cf432f783b73938' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - 'e9c02b761910c34d0f3470645ac4df102cfce5df') + '575e52f537e37eeaaaeb639268f9bfa394e7c58d') prepare() { mkdir -p build diff --git a/libre/kdelibs/kdelibs-gcc6.patch b/libre/kdelibs/kdelibs-gcc6.patch index 774548730..88bcb13eb 100644 --- a/libre/kdelibs/kdelibs-gcc6.patch +++ b/libre/kdelibs/kdelibs-gcc6.patch @@ -10,48 +10,6 @@ diff -up kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp.gcc6 kdelib 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 |