From 01b902af3d5922ba1a822b76651300b20cf48b3162d4cca33b5edf8bca66cfed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 11 Sep 2014 08:57:03 +0000 Subject: [PATCH] Accepting request 248433 from home:badshah400:branches:science Update to 4.2.0-RC1 (needed for 13.2) OBS-URL: https://build.opensuse.org/request/show/248433 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=25 --- ParaView-v4.1.0-source.tar.gz | 3 -- ParaView-v4.2.0-RC1-source.tar.gz | 3 ++ paraview-Mesa10.3-build-failures.patch | 13 +++++ ...view-SciberQuestToolKit-install-path.patch | 26 ---------- paraview-default-qtstyle.patch | 12 ++--- paraview-desktop-entry-fix.patch | 15 ++++++ paraview-fix-file-contains-date-time.patch | 12 ++--- paraview.changes | 27 ++++++++++ paraview.spec | 52 +++++++++++++++---- 9 files changed, 112 insertions(+), 51 deletions(-) delete mode 100644 ParaView-v4.1.0-source.tar.gz create mode 100644 ParaView-v4.2.0-RC1-source.tar.gz create mode 100644 paraview-Mesa10.3-build-failures.patch delete mode 100644 paraview-SciberQuestToolKit-install-path.patch create mode 100644 paraview-desktop-entry-fix.patch diff --git a/ParaView-v4.1.0-source.tar.gz b/ParaView-v4.1.0-source.tar.gz deleted file mode 100644 index 3b8b743..0000000 --- a/ParaView-v4.1.0-source.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 -size 50460304 diff --git a/ParaView-v4.2.0-RC1-source.tar.gz b/ParaView-v4.2.0-RC1-source.tar.gz new file mode 100644 index 0000000..6396856 --- /dev/null +++ b/ParaView-v4.2.0-RC1-source.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e36a242f158e70cd22f0ccf72ef65104b2fa6eb051c389b05b507be292c1914 +size 49909412 diff --git a/paraview-Mesa10.3-build-failures.patch b/paraview-Mesa10.3-build-failures.patch new file mode 100644 index 0000000..6dbf347 --- /dev/null +++ b/paraview-Mesa10.3-build-failures.patch @@ -0,0 +1,13 @@ +Index: ParaView-v4.2.0-RC1-source/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx +=================================================================== +--- ParaView-v4.2.0-RC1-source.orig/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx ++++ ParaView-v4.2.0-RC1-source/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx +@@ -26,7 +26,7 @@ + + // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by + // the system +-//#define GLX_GLXEXT_LEGACY ++#define GLX_GLXEXT_LEGACY + #include "GL/glx.h" + + #include "vtkgl.h" diff --git a/paraview-SciberQuestToolKit-install-path.patch b/paraview-SciberQuestToolKit-install-path.patch deleted file mode 100644 index 4be7302..0000000 --- a/paraview-SciberQuestToolKit-install-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: ParaView-v4.1.0/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt -=================================================================== ---- ParaView-v4.1.0.orig/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt -+++ ParaView-v4.1.0/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt -@@ -102,7 +102,7 @@ if(PARAVIEW_BUILD_QT_GUI) - LINK_PRIVATE pqComponents) - endif() - --install(TARGETS SciberQuestToolKit DESTINATION lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}) -+install(TARGETS SciberQuestToolKit DESTINATION ${PV_INSTALL_LIB_DIR}) - - if(PARAVIEW_USE_MPI) - include(vtkMPI) -Index: ParaView-v4.1.0/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt -=================================================================== ---- ParaView-v4.1.0.orig/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt -+++ ParaView-v4.1.0/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt -@@ -162,7 +162,7 @@ if (SQTK_CUDA AND CUDA_FOUND) - LINK_PRIVATE ${CUDA_LIBRARIES}) - endif() - --install(TARGETS vtkSciberQuest DESTINATION lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}) -+install(TARGETS vtkSciberQuest DESTINATION ${PV_INSTALL_LIB_DIR}) - - if (BUILD_TESTING) - add_subdirectory(Testing) diff --git a/paraview-default-qtstyle.patch b/paraview-default-qtstyle.patch index 9981f3b..e56caee 100644 --- a/paraview-default-qtstyle.patch +++ b/paraview-default-qtstyle.patch @@ -1,9 +1,9 @@ -Index: ParaView-v4.1.0/CMake/branded_paraview_main.cxx.in +Index: ParaView-v4.2.0-RC1-source/CMake/branded_paraview_main.cxx.in =================================================================== ---- ParaView-v4.1.0.orig/CMake/branded_paraview_main.cxx.in -+++ ParaView-v4.1.0/CMake/branded_paraview_main.cxx.in -@@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - #include "pq@BPC_NAME@Initializer.h" +--- ParaView-v4.2.0-RC1-source.orig/CMake/branded_paraview_main.cxx.in ++++ ParaView-v4.2.0-RC1-source/CMake/branded_paraview_main.cxx.in +@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #endif #ifdef Q_WS_X11 -#include @@ -11,7 +11,7 @@ Index: ParaView-v4.1.0/CMake/branded_paraview_main.cxx.in #endif #include -@@ -64,12 +64,12 @@ static bool checkenv(const char* vname) +@@ -72,12 +72,12 @@ static bool checkenv(const char* vname) int main(int argc, char* argv[]) { diff --git a/paraview-desktop-entry-fix.patch b/paraview-desktop-entry-fix.patch new file mode 100644 index 0000000..9805899 --- /dev/null +++ b/paraview-desktop-entry-fix.patch @@ -0,0 +1,15 @@ +Index: ParaView-v4.2.0-RC1-source/Applications/ParaView/paraview.desktop.in +=================================================================== +--- ParaView-v4.2.0-RC1-source.orig/Applications/ParaView/paraview.desktop.in ++++ ParaView-v4.2.0-RC1-source/Applications/ParaView/paraview.desktop.in +@@ -1,7 +1,9 @@ + [Desktop Entry] +-Version=@PARAVIEW_VERSION_FULL@ + Type=Application + Name=ParaView + Comment=Parallel visualization application + TryExec=paraview ++Exec=paraview + Icon=paraview ++Categories=Graphics;2DGraphics;3DGraphics; ++StartupNotify=true diff --git a/paraview-fix-file-contains-date-time.patch b/paraview-fix-file-contains-date-time.patch index 9ad7e21..77e0fcf 100644 --- a/paraview-fix-file-contains-date-time.patch +++ b/paraview-fix-file-contains-date-time.patch @@ -1,7 +1,7 @@ -Index: ParaView-v4.1.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c +Index: ParaView-v4.2.0-RC1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c =================================================================== ---- ParaView-v4.1.0.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c -+++ ParaView-v4.1.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c +--- ParaView-v4.2.0-RC1-source.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c ++++ ParaView-v4.2.0-RC1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c @@ -9,7 +9,7 @@ #include "ncdispatch.h" @@ -11,10 +11,10 @@ Index: ParaView-v4.1.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c const char * nc_inq_libvers(void) -Index: ParaView-v4.1.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx +Index: ParaView-v4.2.0-RC1-source/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx =================================================================== ---- ParaView-v4.1.0.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx -+++ ParaView-v4.1.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx +--- ParaView-v4.2.0-RC1-source.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx ++++ ParaView-v4.2.0-RC1-source/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx @@ -438,7 +438,7 @@ void vtknifti1_io::nifti_disp_lib_hist( *//*--------------------------------------------------------------------*/ void vtknifti1_io::nifti_disp_lib_version( void ) diff --git a/paraview.changes b/paraview.changes index daf768b..d9ed659 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon Sep 8 01:57:35 UTC 2014 - badshah400@gmail.com + +- Update to version 4.2.0-RC1: + + See list of changes at + http://vtk.org/Bug/changelog_page.php?version_id=108 +- Packaging changes: + + Add paraview-desktop-entry-fix.patch to fix paraview's desktop + menu entry by properly inserting required key-value pairs + + Drop paraview-SciberQuestToolKit-install-path.patch; no longer + needed as properly implemented upstream + + Rebase carried-over patches to apply cleanly against present + version + + Add paraview-Mesa10.3-build-failures.patch to workaround + build failures when compiling against Mesa >= 10.3; patch + taken from upstream git and rebased; applied only for + openSUSE >= 13.2 + + Specfile changes: + - Prepare for gcc 4.9.0 by working around a compiler + issue + - Package .desktop entry and icon files; post(un) scriptlets + for updating hicolor icon theme and updating desktop menu + are used + - Package appdata file + - Fix python-bytecode-inconsistent-mtime rpmlint warnings by + recompiling all relevant .py files. + ------------------------------------------------------------------- Tue Feb 4 10:59:39 UTC 2014 - badshah400@gmail.com diff --git a/paraview.spec b/paraview.spec index f6ce0ac..5a7fba6 100644 --- a/paraview.spec +++ b/paraview.spec @@ -16,22 +16,25 @@ # -%define major_ver 4.1 - +%define major_ver 4.2 +%define rc_ver 4.2.0-RC1 Name: paraview -Version: 4.1.0 +# This is the (only) RC release before version 4.2 is released +Version: 4.1.990 Release: 0 Summary: Data analysis and visualization application License: BSD-3-Clause Group: Productivity/Scientific/Physics Url: http://www.paraview.org -Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}-source.tar.gz -# PATCH-FIX-UPSTREAM paraview-default-qtstyle.patch badshah400@gmail.com -- Make paraview inherit default qt gui look and feel, instead of using the Plastique theme +Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{rc_ver}-source.tar.gz +# PATCH-FIX-OPENSUSE paraview-default-qtstyle.patch badshah400@gmail.com -- Make paraview inherit default qt gui look and feel, instead of using the Plastique theme Patch0: paraview-default-qtstyle.patch -# PATCH-FIX-UPSTREAM paraview-SciberQuestToolKit-install-path.patch badshah400@gmail.com -- Fix install path of SciberQuestToolkit plugin -Patch1: paraview-SciberQuestToolKit-install-path.patch +# PATCH-FIX-UPSTREAM paraview-desktop-entry-fix.patch badshah400@gmail.com -- Fix desktop menu entry by inserting proper required categories +Patch1: paraview-desktop-entry-fix.patch # PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch badshah400@gmail.com -- Remove reference to __DATE__ and __TIME__ from source Patch2: paraview-fix-file-contains-date-time.patch +# PATCH-FIX-UPSTREAM paraview-Mesa10.3-build-failures.patch badshah400@gmail.com -- Actually define GLX_GLXEXT_LEGACY to prevent the system glext.h include; fixes buld failures with Mesa >= 10.3; fix taken from upstream git and rebased +Patch3: paraview-Mesa10.3-build-failures.patch BuildRequires: Mesa-devel BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 @@ -110,12 +113,19 @@ This package provides the SciberQuestToolKit plugin for paraview. %prep -%setup -q -n ParaView-v%{version} +%setup -q -n ParaView-v%{rc_ver}-source %patch0 -p1 %patch1 -p1 %patch2 -p1 +%if 0%{?suse_version} > 1310 +%patch3 -p1 +%endif %build +# Prepare for gcc 4.9.0: work around gcc 4.9.0 regression +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61294 +sed -i -e 's/-Wl,--fatal-warnings//' VTK/CMake/vtkCompilerExtras.cmake + export CC='gcc' export CXX='g++' export MAKE='make' @@ -167,12 +177,29 @@ pushd temp_dir popd rm -rf temp_dir/ +# FIX A BUNCH OF RPMLINT WARNINGS REGARDING python-bytecode-inconsistent-mtime +%py_compile %{buildroot}%{_libdir}/%{name}/site-packages/vtk/ +for i in `ls -d %{buildroot}%{_libdir}/%{name}/site-packages/vtk/*/`; +do + %py_compile $i/ +done + +%py_compile %{buildroot}%{_libdir}/%{name}/site-packages/paraview/vtk/util + %fdupes %{buildroot}/ -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +%icon_theme_cache_post +%desktop_database_post + %post -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +%icon_theme_cache_postun +%desktop_database_postun + %postun -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig %files @@ -182,6 +209,11 @@ rm -rf temp_dir/ %{_bindir}/* %{_datadir}/doc/%{name}-%{major_ver}/ %{_datadir}/%{name}/ +%dir %{_datadir}/appdata +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png + %exclude %{_libdir}/%{name}/libSciberQuestToolKit.so %files -n %{name}-plugin-SciberQuestToolKit