File kdelibs-4.14.60-gcc6.patch of Package mingw32-kdelibs4

Overview Repositories Revisions Requests Users Attributes Meta

File kdelibs-4.14.60-gcc6.patch of Package mingw32-kdelibs4 (Revision ffb10040f80cc7d2b9ddaecbc45d970c)

Currently displaying revision ffb10040f80cc7d2b9ddaecbc45d970c , Show latest

--- kdelibs-4.14.60/ConfigureChecks.cmake	2015-07-19 20:07:40.000000000 +0200
+++ kdelibs-4.14.60/ConfigureChecks.cmake	2016-06-04 23:16:50.292042708 +0200
@@ -244,7 +244,7 @@
 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
 
--- kdelibs-4.14.60/khtml/dom/dom2_traversal.h	2015-07-19 20:07:41.000000000 +0200
+++ kdelibs-4.14.60/khtml/dom/dom2_traversal.h	2016-06-04 23:16:50.292042708 +0200
@@ -214,7 +214,7 @@
      *
      */
     enum ShowCode {
-        SHOW_ALL                       = 0xFFFFFFFF,
+        SHOW_ALL                       = (int)0xFFFFFFFF,
         SHOW_ELEMENT                   = 0x00000001,
         SHOW_ATTRIBUTE                 = 0x00000002,
         SHOW_TEXT                      = 0x00000004,
--- kdelibs-4.14.60/kioslave/file/file_win.cpp	2015-07-19 20:07:41.000000000 +0200
+++ kdelibs-4.14.60/kioslave/file/file_win.cpp	2016-06-04 23:16:50.288042613 +0200
@@ -110,6 +110,7 @@
     QFileInfo _src(src.toLocalFile());
     QFileInfo _dest(dest.toLocalFile());
     DWORD dwFlags = COPY_FILE_FAIL_IF_EXISTS;
+    BOOL tmpFalse = FALSE;
 
     if( _src == _dest ) {
 	    error( KIO::ERR_IDENTICAL_FILES, _dest.filePath() );
@@ -150,7 +151,7 @@
                       ( LPCWSTR ) _dest.filePath().utf16(),
                       CopyProgressRoutine,
                       ( LPVOID ) this,
-                      FALSE,
+                      &tmpFalse,
                       dwFlags) == 0 )
     {
         DWORD dwLastErr = GetLastError();
--- kdelibs-4.14.60/solid/solid/backends/shared/cpufeatures.cpp	2015-07-19 20:07:41.000000000 +0200
+++ kdelibs-4.14.60/solid/solid/backends/shared/cpufeatures.cpp	2016-06-04 23:16:50.292042708 +0200
@@ -51,23 +51,23 @@
 #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__

Places

File kdelibs-4.14.60-gcc6.patch of Package mingw32-kdelibs4 (Revision ffb10040f80cc7d2b9ddaecbc45d970c)

Places