diff --git a/kdelibs-4.14.17-gcc6_literals.patch b/kdelibs-4.14.17-gcc6_literals.patch deleted file mode 100644 index 70c36c2..0000000 --- a/kdelibs-4.14.17-gcc6_literals.patch +++ /dev/null @@ -1,43 +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/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__ diff --git a/kdelibs.spec b/kdelibs.spec index 953fb3b..50c1045 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -193,9 +193,6 @@ Patch64: kdelibs-4.13.2-invokeTerminal.patch # newer glibc has 2 prototypes for trunc, check for ftrunc instead Patch65: kdelibs-4.14.17-glibc_trunc.patch -# gcc6 FTBFS: literals -Patch66: kdelibs-4.14.17-gcc6_literals.patch - # gcc6 FTBFS: maybe easier/cleaner to build with: -std=gnu++98 or -Wno-error-narrowing Patch67: kdelibs-4.14.17-gcc6_narrowing_hack.patch @@ -483,7 +480,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch62 -p1 -b .arm-plasma %patch64 -p1 -b .invokeTerminal %patch65 -p1 -b .glibc_trunc -%patch66 -p1 -b .gcc6_literals %patch67 -p1 -b .gcc6_narrowing_hack # upstream patches