kdelibs-4.14.17 FTBFS
This commit is contained in:
parent
51cf3d9621
commit
5de20fd850
|
@ -0,0 +1,43 @@
|
||||||
|
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 10:50:24.432992612 -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__
|
|
@ -51,7 +51,7 @@ Summary: KDE Libraries
|
||||||
# shipped with kde applications, version...
|
# shipped with kde applications, version...
|
||||||
%global apps_version 15.12.2
|
%global apps_version 15.12.2
|
||||||
Version: 4.14.17
|
Version: 4.14.17
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
|
@ -182,6 +182,9 @@ Patch62: kdelibs-4.11.3-arm.patch
|
||||||
# opening a terminal in Konqueror / Dolphin does not inherit environment variables
|
# opening a terminal in Konqueror / Dolphin does not inherit environment variables
|
||||||
Patch64: kdelibs-4.13.2-invokeTerminal.patch
|
Patch64: kdelibs-4.13.2-invokeTerminal.patch
|
||||||
|
|
||||||
|
# gcc6 FTBFS
|
||||||
|
Patch65: kdelibs-4.14.17-gcc6.patch
|
||||||
|
|
||||||
## upstream
|
## upstream
|
||||||
# 4.14 branch
|
# 4.14 branch
|
||||||
|
|
||||||
|
@ -439,6 +442,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||||
%patch61 -p1 -b .dot
|
%patch61 -p1 -b .dot
|
||||||
%patch62 -p1 -b .arm-plasma
|
%patch62 -p1 -b .arm-plasma
|
||||||
%patch64 -p1 -b .invokeTerminal
|
%patch64 -p1 -b .invokeTerminal
|
||||||
|
%patch65 -p1 -b .gcc6
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
|
||||||
|
@ -795,6 +799,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 12 2016 Rex Dieter <rdieter@fedoraproject.org> 4.14.17-2
|
||||||
|
- kdelibs-4.14.17 FTBFS
|
||||||
|
|
||||||
* Fri Feb 12 2016 Rex Dieter <rdieter@fedoraproject.org> 6:4.14.17-1
|
* Fri Feb 12 2016 Rex Dieter <rdieter@fedoraproject.org> 6:4.14.17-1
|
||||||
- 4.14.17 (kde-apps-15.12.2)
|
- 4.14.17 (kde-apps-15.12.2)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue