diff -Nru paraview-5.11.0+dfsg/debian/changelog paraview-5.11.0+dfsg/debian/changelog --- paraview-5.11.0+dfsg/debian/changelog 2023-06-27 17:53:56.000000000 +0000 +++ paraview-5.11.0+dfsg/debian/changelog 2023-08-02 15:11:56.000000000 +0000 @@ -1,21 +1,10 @@ -paraview (5.11.0+dfsg-1ubuntu4) mantic; urgency=medium +paraview (5.11.0+dfsg-2) unstable; urgency=medium - * Rebuild against latest gdal + * Drop build-dep on libnetcdf-cxx-legacy-dev: Closes: #1037814 + * g++-13.patch: FTBFS with g++ 13. Closes: # 1038602 + * Srandards-Version: 4.6.2 - -- Jeremy Bícha Tue, 27 Jun 2023 13:53:56 -0400 - -paraview (5.11.0+dfsg-1ubuntu3) lunar; urgency=medium - - * No-change rebuild against libtiff6 - - -- Steve Langasek Sun, 05 Feb 2023 04:32:33 +0000 - -paraview (5.11.0+dfsg-1ubuntu2) lunar; urgency=medium - - * Fix build on riscv64, by tweaking latomic Debian patch. - (Closes: #1030157) - - -- Gianfranco Costamagna Tue, 31 Jan 2023 18:06:11 +0100 + -- Alastair McKinstry Wed, 02 Aug 2023 16:11:56 +0100 paraview (5.11.0+dfsg-1) unstable; urgency=medium diff -Nru paraview-5.11.0+dfsg/debian/control paraview-5.11.0+dfsg/debian/control --- paraview-5.11.0+dfsg/debian/control 2023-02-05 04:32:33.000000000 +0000 +++ paraview-5.11.0+dfsg/debian/control 2023-08-02 15:11:47.000000000 +0000 @@ -1,6 +1,5 @@ Source: paraview -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Science Team +Maintainer: Debian Science Team Uploaders: Alastair McKinstry Section: science Priority: optional @@ -56,7 +55,6 @@ libgl2ps-dev, libeigen3-dev, libnetcdf-dev (>= 1:4.9.0), - libnetcdf-cxx-legacy-dev, libjsoncpp-dev, libglew-dev, libxdmf-dev, @@ -66,7 +64,7 @@ python3-mpi4py, python3-six, python3-twisted -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/science-team/paraview Vcs-Git: https://salsa.debian.org/science-team/paraview.git -b debian/latest Homepage: https://www.paraview.org/ diff -Nru paraview-5.11.0+dfsg/debian/patches/g++13.patch paraview-5.11.0+dfsg/debian/patches/g++13.patch --- paraview-5.11.0+dfsg/debian/patches/g++13.patch 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0+dfsg/debian/patches/g++13.patch 2023-08-02 15:11:56.000000000 +0000 @@ -0,0 +1,50 @@ +--- a/VTK/IO/Image/vtkSEPReader.cxx ++++ b/VTK/IO/Image/vtkSEPReader.cxx +@@ -35,6 +35,7 @@ + + #include + #include ++#include + + namespace details + { +--- a/VTK/IO/Image/vtkSEPReader.h ++++ b/VTK/IO/Image/vtkSEPReader.h +@@ -27,6 +27,7 @@ + + #include // for std::array + #include // for std::string ++#include + + namespace details + { +--- a/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ b/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -50,6 +50,7 @@ + #include "vtkRenderingMatplotlibModule.h" // For export macro + + #include // for std::vector ++#include + + struct _object; + typedef struct _object PyObject; +--- a/VTK/IO/PIO/PIOData.h ++++ b/VTK/IO/PIO/PIOData.h +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + VTK_ABI_NAMESPACE_BEGIN + struct Cstring_less +--- a/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp ++++ b/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +@@ -33,6 +33,7 @@ + + #include + #include ++#include + + #define CPL_DLL + diff -Nru paraview-5.11.0+dfsg/debian/patches/libatomic.patch paraview-5.11.0+dfsg/debian/patches/libatomic.patch --- paraview-5.11.0+dfsg/debian/patches/libatomic.patch 2023-01-31 17:06:11.000000000 +0000 +++ paraview-5.11.0+dfsg/debian/patches/libatomic.patch 2023-01-21 11:41:21.000000000 +0000 @@ -1,148 +1,20 @@ -Index: paraview-5.11.0+dfsg/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt -=================================================================== ---- paraview-5.11.0+dfsg.orig/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt -+++ paraview-5.11.0+dfsg/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt -@@ -318,5 +318,5 @@ +--- a/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt ++++ b/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt +@@ -313,10 +313,16 @@ + endif () + endif () + ++if ((DEB_HOST_MULTIARCH STREQUAL "arm-linux-gnueabi") OR (DEB_HOST_MULTIARCH STREQUAL "mipsel-linux-gnu")) ++ set(ATOMIC_LIB atomic) ++else () ++ set(ATOMIC_LIB "") ++endif () ++ + target_link_libraries(vtkprotoc + PRIVATE ${vtkprotoc_no_as_needed} vtklibprotoc ParaView::protobuf - Threads::Threads) + Threads::Threads ${ATOMIC_LIB}) add_executable(ParaView::protoc ALIAS vtkprotoc) -Index: paraview-5.11.0+dfsg/CMake/CheckAtomic.cmake -=================================================================== ---- /dev/null -+++ paraview-5.11.0+dfsg/CMake/CheckAtomic.cmake -@@ -0,0 +1,95 @@ -+# SPDX-FileCopyrightText: 2003-2018 University of Illinois at Urbana-Champaign. -+# -+# SPDX-License-Identifier: BSD-3-Clause -+ -+#[=======================================================================[.rst: -+CheckAtomic -+----------- -+ -+Check if the compiler supports std:atomic out of the box or if libatomic is -+needed for atomic support. If it is needed libatomicis added to -+``CMAKE_REQUIRED_LIBRARIES``. So after running CheckAtomic you can use -+std:atomic. -+ -+Since 5.75.0. -+#]=======================================================================] -+ -+include(CheckCXXSourceCompiles) -+include(CheckLibraryExists) -+ -+# Sometimes linking against libatomic is required for atomic ops, if -+# the platform doesn't support lock-free atomics. -+ -+function(check_working_cxx_atomics varname) -+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) -+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11") -+ check_cxx_source_compiles(" -+ #include -+ std::atomic x; -+ std::atomic y; -+ std::atomic z; -+ int main() { -+ ++z; -+ ++y; -+ return ++x; -+ } -+ " ${varname}) -+ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) -+endfunction() -+ -+function(check_working_cxx_atomics64 varname) -+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) -+ set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}") -+ check_cxx_source_compiles(" -+ #include -+ #include -+ std::atomic x (0); -+ int main() { -+ uint64_t i = x.load(std::memory_order_relaxed); -+ return 0; -+ } -+ " ${varname}) -+ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) -+endfunction() -+ -+# Check for (non-64-bit) atomic operations. -+if(MSVC) -+ set(HAVE_CXX_ATOMICS_WITHOUT_LIB True) -+elseif(LLVM_COMPILER_IS_GCC_COMPATIBLE) -+ # First check if atomics work without the library. -+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB) -+ # If not, check if the library exists, and atomics work with it. -+ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) -+ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) -+ if(HAVE_LIBATOMIC) -+ list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") -+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB) -+ if (NOT HAVE_CXX_ATOMICS_WITH_LIB) -+ message(FATAL_ERROR "Host compiler must support std::atomic!") -+ endif() -+ else() -+ message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.") -+ endif() -+ endif() -+endif() -+ -+# Check for 64 bit atomic operations. -+if(MSVC) -+ set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True) -+elseif(LLVM_COMPILER_IS_GCC_COMPATIBLE) -+ # First check if atomics work without the library. -+ check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB) -+ # If not, check if the library exists, and atomics work with it. -+ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) -+ check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64) -+ if(HAVE_CXX_LIBATOMICS64) -+ list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") -+ check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB) -+ if (NOT HAVE_CXX_ATOMICS64_WITH_LIB) -+ message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!") -+ endif() -+ else() -+ message(FATAL_ERROR "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.") -+ endif() -+ endif() -+endif() -Index: paraview-5.11.0+dfsg/CMakeLists.txt -=================================================================== ---- paraview-5.11.0+dfsg.orig/CMakeLists.txt -+++ paraview-5.11.0+dfsg/CMakeLists.txt -@@ -103,6 +103,11 @@ - include(ParaViewOptions) - include(ParaViewMigrations) - -+include(CheckAtomic) -+if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) -+ set(ATOMIC_LIB -latomic) -+endif() -+ - # Some flags are really bad for caching. Replace them with better variants. - if (paraview_replace_uncacheable_flags) - get_property(is_multiconfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) -Index: paraview-5.11.0+dfsg/VTK/Filters/Core/CMakeLists.txt -=================================================================== ---- paraview-5.11.0+dfsg.orig/VTK/Filters/Core/CMakeLists.txt -+++ paraview-5.11.0+dfsg/VTK/Filters/Core/CMakeLists.txt -@@ -129,3 +129,4 @@ - vtk_module_add_module(VTK::FiltersCore - CLASSES ${classes}) - vtk_add_test_mangling(VTK::FiltersCore) -+vtk_module_link(VTK::FiltersCore PRIVATE ${ATOMIC_LIB}) -Index: paraview-5.11.0+dfsg/VTK/Rendering/Core/CMakeLists.txt -=================================================================== ---- paraview-5.11.0+dfsg.orig/VTK/Rendering/Core/CMakeLists.txt -+++ paraview-5.11.0+dfsg/VTK/Rendering/Core/CMakeLists.txt -@@ -187,6 +187,7 @@ - HEADERS ${headers} - NOWRAP_HEADERS ${nowrap_headers} - ) -+vtk_module_link(VTK::RenderingCore PRIVATE ${ATOMIC_LIB}) - - if (VTK_DEFAULT_RENDER_WINDOW_OFFSCREEN) - vtk_module_definitions(VTK::RenderingCore diff -Nru paraview-5.11.0+dfsg/debian/patches/series paraview-5.11.0+dfsg/debian/patches/series --- paraview-5.11.0+dfsg/debian/patches/series 2023-01-31 17:06:11.000000000 +0000 +++ paraview-5.11.0+dfsg/debian/patches/series 2023-08-02 15:11:56.000000000 +0000 @@ -6,3 +6,4 @@ ffmpeg.patch vector-header.patch # reproducible.patch +g++13.patch