diff --git a/srcpkgs/kdelibs/patches/fix-gcc6-string_literal.patch b/srcpkgs/kdelibs/patches/fix-gcc6-string_literal.patch new file mode 100644 index 00000000000..b612b6a6476 --- /dev/null +++ b/srcpkgs/kdelibs/patches/fix-gcc6-string_literal.patch @@ -0,0 +1,39 @@ +--- solid/solid/backends/shared/cpufeatures.cpp 2014-11-06 23:33:50.000000000 +0100 ++++ solid/solid/backends/shared/cpufeatures.cpp 2016-09-19 06:28:35.687133990 +0200 +@@ -52,22 +52,22 @@ + + #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_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_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__ diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template index c7daf92cca0..8b96341b1af 100644 --- a/srcpkgs/kdelibs/template +++ b/srcpkgs/kdelibs/template @@ -1,7 +1,7 @@ # Template file for 'kdelibs' pkgname=kdelibs version=4.14.3 -revision=4 +revision=5 short_desc="KDE core libraries" maintainer="Juan RP " license="GPL-2.0, LGPL-2.1, FDL" @@ -26,6 +26,8 @@ makedepends="libressl-devel libSM-devel libXext-devel libXScrnSaver-devel depends="docbook-xsl media-player-info shared-mime-info shared-desktop-ontologies hicolor-icon-theme ca-certificates" +CXXFLAGS="-std=gnu++98" + post_install() { rm -f ${DESTDIR}/usr/share/apps/kssl/ca-bundle.crt ln -sf /etc/ssl/certs/ca-certificates.crt \