update to 4.14.21 [release 4.14.21-1mamba;Sat Jun 25 2016]
This commit is contained in:
parent
d57a60e2c1
commit
98904dd805
12
kdelibs-4.14.21-gcc-6.1.0-1.patch
Normal file
12
kdelibs-4.14.21-gcc-6.1.0-1.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up kdelibs-4.14.17/khtml/dom/dom2_traversal.h.gcc6 kdelibs-4.14.17/khtml/dom/dom2_traversal.h
|
||||
--- 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,
|
||||
12
kdelibs-4.14.21-gcc-6.1.0-2.patch
Normal file
12
kdelibs-4.14.21-gcc-6.1.0-2.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up kdelibs-4.14.17/ConfigureChecks.cmake.gcc6 kdelibs-4.14.17/ConfigureChecks.cmake
|
||||
--- 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
|
||||
|
||||
43
kdelibs-4.14.21-gcc-6.1.0-solid.patch
Normal file
43
kdelibs-4.14.21-gcc-6.1.0-solid.patch
Normal file
@ -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 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__
|
||||
17
kdelibs.spec
17
kdelibs.spec
@ -33,15 +33,15 @@
|
||||
%define _kde4_wallpaperdir %_kde4_prefix/share/wallpapers
|
||||
%endif
|
||||
Name: kdelibs
|
||||
Version: 4.14.15
|
||||
Release: 2mamba
|
||||
Version: 4.14.21
|
||||
Release: 1mamba
|
||||
Summary: KDE Software Compilation - Core Libraries
|
||||
Group: Graphical Desktop/Libraries/KDE
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Davide Madrisan <davide.madrisan@gmail.com>
|
||||
URL: http://www.kde.org/
|
||||
Source0: http://download.kde.org/stable/applications/15.12.0/src/kdelibs-%{version}.tar.xz
|
||||
Source0: http://download.kde.org/stable/applications/16.04.2/src/kdelibs-%{version}.tar.xz
|
||||
Source1: kdelibs4-rpmmacros_kde4.in
|
||||
Patch0: %{name}4-4.1.2-fix_fixx11.patch
|
||||
Patch1: %{name}-4.7.0-openmamba_wallpaper.patch
|
||||
@ -49,6 +49,9 @@ Patch2: %{name}-4.6.1-no_kbookmark_write_error.patch
|
||||
Patch3: %{name}-4.6.2-fix_kded_high_cpu_load.patch
|
||||
Patch4: kdelibs-4.14.0-arm-offscreen-fix.patch
|
||||
Patch5: kdelibs-4.14.15-upstream-backport-to-fix-kopete-crash.patch
|
||||
Patch6: kdelibs-4.14.21-gcc-6.1.0-solid.patch
|
||||
Patch7: kdelibs-4.14.21-gcc-6.1.0-1.patch
|
||||
Patch8: kdelibs-4.14.21-gcc-6.1.0-2.patch
|
||||
License: LGPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -173,7 +176,10 @@ This package includes the KDE API documentation needed by the developers of KDE
|
||||
%ifarch arm
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%patch5 -p1
|
||||
#%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
@ -429,6 +435,9 @@ exit 0
|
||||
%{_kde4_htmldir}/en/kioslave/
|
||||
|
||||
%changelog
|
||||
* Sat Jun 25 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 4.14.21-1mamba
|
||||
- update to 4.14.21
|
||||
|
||||
* Tue Dec 29 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 4.14.15-2mamba
|
||||
- add backported patch to fix crash when closing window in kopete
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
%_kde4_xdgappsdir %_prefix/share/applications
|
||||
%_kde4_xdgdirectorydir %_kde4_prefix/share/desktop-directories
|
||||
%_kde4_xdgmimedir %_prefix/share/mime/packages
|
||||
%_kde4_wallpaperdir %_prefix/share/wallpapers
|
||||
%_kde4_wallpaperdir %_kde4_prefix/share/wallpapers
|
||||
|
||||
%_kde4_debug RelWithDebInfo
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user