Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2016-08-13 18:30:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtk (Old) and /work/SRC/openSUSE:Factory/.vtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk" Changes: -------- --- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2016-04-28 17:00:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new/vtk.changes 2016-08-13 18:31:00.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Aug 10 00:56:56 UTC 2016 - [email protected] + +- Refresh vtk-Rinterface-uintptr_t.patch to fix further issues + with uintptr_t redefinition by defining the HAVE_UINTPTR_T + macro using cmake functions; removing the #include of stdint.h + is not needed any more since we will not be using the defs from + Rinterface.h anyway (boo#985386). Although this really causes a + build failure for the i586 arch, where the redefinition of + unitptr_t in Rinterface.h conflicts with the stdint.h defintion, + the patch is applied generally because the redefinition is not + needed in any case. Patch sent upstream. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.kyGLor/_old 2016-08-13 18:31:02.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGLor/_new 2016-08-13 18:31:02.000000000 +0200 @@ -32,7 +32,7 @@ Source1: vtk-rpmlintrc # PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch [email protected] -- Fix file containing DATE and TIME Patch1: vtk-fix-file-contains-date-time.patch -# PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch [email protected] -- Only use uintptr_t definition from R headers; no longer include stdint.h +# PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch boo#985386 [email protected] -- Fix issues with uintptr_t redefinition by defining the HAVE_UINTPTR_T macro using cmake functions to avoid redefinition of uintptr_t, which is already defined in stdint.h called earlier; patch sent upstream Patch2: vtk-Rinterface-uintptr_t.patch # PATCH-FIX-UPSTREAM vtk-gcc6.patch [email protected] -- Fix compilation with GCC >= 6.0 Patch3: vtk-gcc6.patch ++++++ vtk-Rinterface-uintptr_t.patch ++++++ --- /var/tmp/diff_new_pack.kyGLor/_old 2016-08-13 18:31:02.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGLor/_new 2016-08-13 18:31:02.000000000 +0200 @@ -1,25 +1,26 @@ -Index: VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx +Index: VTK-7.0.0/Filters/StatisticsGnuR/CMakeLists.txt =================================================================== ---- VTK-7.0.0.orig/Filters/StatisticsGnuR/vtkRInterface.cxx -+++ VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx -@@ -20,12 +20,15 @@ +--- VTK-7.0.0.orig/Filters/StatisticsGnuR/CMakeLists.txt ++++ VTK-7.0.0/Filters/StatisticsGnuR/CMakeLists.txt +@@ -16,6 +16,10 @@ include_directories(${R_INCLUDE_DIR}) - #include "vtkRInterface.h" + add_definitions(-DVTK_BUILDING_FILTERS_STATISTICSGNUR) -+// uintptr_t is already defined in recent versions of R which therefore causes a -+// clash when the same symbol is redefined in stddef.h ++# Check for the existance of uintptr_t type and set the HAVE_UINTPTR_T macro ++include(CheckTypeSize) ++CHECK_TYPE_SIZE(uintptr_t UINTPTR_T) + - // for uintptr_t --#ifdef _MSC_VER --#include <stddef.h> --#else --#include <stdint.h> --#endif -+// #ifdef _MSC_VER -+// #include <stddef.h> -+// #else -+// #include <stdint.h> -+// #endif + # Configure the module specific settings into a module configured header. + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkFiltersStatisticsGnuRConfigure.h.in + ${CMAKE_CURRENT_BINARY_DIR}/vtkFiltersStatisticsGnuRConfigure.h) +Index: VTK-7.0.0/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in +=================================================================== +--- VTK-7.0.0.orig/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in ++++ VTK-7.0.0/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in +@@ -17,5 +17,6 @@ + #define vtkFiltersStatisticsGnuRConfigure_h + + #define VTK_R_HOME "@R_HOME@" ++#cmakedefine HAVE_UINTPTR_T - #include "vtkInformation.h" - #include "vtkInformationVector.h" + #endif
