Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2016-04-28 16:56:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-26 00:47:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vtk.new/vtk.changes 2016-04-28 17:00:34.000000000 +0200 @@ -1,0 +2,33 @@ +Wed Apr 13 11:32:12 UTC 2016 - [email protected] + +- Add freetype2-devel as a Requires for vtk-devel. + +------------------------------------------------------------------- +Wed Mar 30 14:31:03 UTC 2016 - [email protected] + +- Apply vtk-gcc6.patch also to python-vtk. + +------------------------------------------------------------------- +Wed Mar 30 13:08:09 UTC 2016 - [email protected] + +- Fixed RPATH error for Factory by passing the option + CMAKE_NO_BUILTIN_CHRPATH:BOOL=ON to cmake. + +------------------------------------------------------------------- +Tue Mar 29 20:27:32 UTC 2016 - [email protected] + +- add vtk-gcc6.patch: Fix build with gcc 6 +- skip RPATH setting + +------------------------------------------------------------------- +Fri Mar 18 19:27:34 UTC 2016 - [email protected] + +- openmpi-libs will be installed with openmpi-devel if necessary. + No such package on openSUSE 13.1. + +------------------------------------------------------------------- +Tue Mar 15 13:33:58 UTC 2016 - [email protected] + +- Add disk constraints + +------------------------------------------------------------------- New: ---- _constraints vtk-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.vTIK3f/_old 2016-04-28 17:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.vTIK3f/_new 2016-04-28 17:00:39.000000000 +0200 @@ -34,6 +34,8 @@ 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 Patch2: vtk-Rinterface-uintptr_t.patch +# PATCH-FIX-UPSTREAM vtk-gcc6.patch [email protected] -- Fix compilation with GCC >= 6.0 +Patch3: vtk-gcc6.patch BuildRequires: Mesa-libGL-devel BuildRequires: R-base-devel BuildRequires: boost-devel @@ -115,6 +117,7 @@ %if 0%{?suse_version} > 1320 Requires: jsoncpp-devel %endif +Requires: freetype2-devel Requires: libexpat-devel Requires: libjpeg-devel Requires: libmysqlclient-devel @@ -159,7 +162,6 @@ Requires: %{name} = %{version} # DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN Requires: openmpi-devel -Requires: openmpi-libs %description -n python3-%{name} VTK is an open-source software system for image processing, 3D @@ -187,6 +189,8 @@ Requires: libqt4-devel Requires: python3-qt4 %endif +# CONFLICTS IS FOR A PKG (python-vtk) IN SCIENCE THAT IS NOT INTENDED TO BE INCLUDED IN openSUSE:FACTORY +Conflicts: python-vtk %description -n python3-%{name}-qt VTK is an open-source software system for image processing, 3D @@ -261,6 +265,7 @@ %setup -q -n VTK-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Replace relative path ../../../VTKData with %%{_datadir}/%%{name}data-%%{version} # otherwise it will break on symlinks. @@ -279,6 +284,7 @@ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DSIP_INCLUDE_DIR:Path=%{py3_incdir} \ @@ -316,7 +322,8 @@ -DVTK_WRAP_TCL:BOOL=ON \ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \ - -DVTK_PYTHON_VERSION=3 + -DVTK_PYTHON_VERSION=3 \ + -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON make %{?_smp_mflags} VERBOSE=1 ++++++ _constraints ++++++ <constraints> <hardware> <disk> <size unit="G">8</size> </disk> </hardware> </constraints> ++++++ vtk-gcc6.patch ++++++ diff --git a/CMake/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake index ecfae31..80244df 100644 --- a/CMake/GenerateExportHeader.cmake +++ b/CMake/GenerateExportHeader.cmake @@ -163,10 +163,10 @@ endmacro() macro(_test_compiler_hidden_visibility) if(CMAKE_COMPILER_IS_GNUCXX) - execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version + execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE _gcc_version_info ERROR_VARIABLE _gcc_version_info) - string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*" + string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" _gcc_version "${_gcc_version_info}") # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the # patch level, handle this here: @@ -181,7 +181,7 @@ macro(_test_compiler_hidden_visibility) endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Intel") - execute_process(COMMAND ${CMAKE_CXX_COMPILER} ARGS -V + execute_process(COMMAND ${CMAKE_CXX_COMPILER} -V OUTPUT_VARIABLE _intel_version_info ERROR_VARIABLE _intel_version_info) string(REGEX REPLACE ".*Version ([0-9]+(\\.[0-9]+)+).*" "\\1" diff --git a/CMake/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake index e39bd30..4dc928a 100644 --- a/CMake/vtkCompilerExtras.cmake +++ b/CMake/vtkCompilerExtras.cmake @@ -28,11 +28,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) endif() # Now check if we can use visibility to selectively export symbols - execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version + execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE _gcc_version_info ERROR_VARIABLE _gcc_version_info) - string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*" + string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" _gcc_version "${_gcc_version_info}") if(NOT _gcc_version) string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
