diff options
| author | Matthias Maier <tamiko@gentoo.org> | 2015-09-19 21:53:17 -0500 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2015-09-19 22:04:08 -0500 |
| commit | 1b6729b01b86fe46347b9547efd931fe1e999192 (patch) | |
| tree | 0f5c247f8e82a67616ec561ba3f128ff225b893a /sci-visualization/paraview | |
| parent | c0d97a27e1a8ab3e695624d222c46bc80a6de618 (diff) | |
| download | gentoo-1b6729b01b86fe46347b9547efd931fe1e999192.tar.gz gentoo-1b6729b01b86fe46347b9547efd931fe1e999192.tar.xz | |
sci-visualization/paraview: Fix compilation with protobuf-2.6 (bug #537988)
Gentoo-Bug: 537988
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'sci-visualization/paraview')
| -rw-r--r-- | sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch (renamed from sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch) | 20 | ||||
| -rw-r--r-- | sci-visualization/paraview/paraview-4.2.0-r1.ebuild | 1 | ||||
| -rw-r--r-- | sci-visualization/paraview/paraview-4.3.1.ebuild | 4 |
3 files changed, 20 insertions, 5 deletions
diff --git a/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch b/sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch index f1ea7b5b01b..5a7871f0790 100644 --- a/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch +++ b/sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch @@ -1,5 +1,11 @@ -diff --git a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto -index 60e084c..aed5832 100644 +https://gitlab.kitware.com/ben.boeckel/paraview/commit/40a62e0bd20ceb73d7a545dab73e975fa07cddbb +http://www.vtk.org/Bug/view.php?id=15442#c34997 + +https://bugs.gentoo.org/show_bug.cgi?id=537988 + +This updates the *.proto files to be compatible with version 2.6 and fixes +a bug that prevented successful compilation with protobuf 2.6. + --- a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto +++ b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto @@ -21,7 +21,7 @@ message Variant { @@ -159,3 +165,13 @@ index 60e084c..aed5832 100644 } } +--- a/ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.cxx ++++ b/ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.cxx +@@ -363,6 +363,6 @@ void vtkSMCameraLink::LoadState(const vtkSMMessage *msg, vtkSMProxyLocator *loca + void vtkSMCameraLink::UpdateState() + { + this->Superclass::UpdateState(); +- this->State->GetExtension(LinkState::sync_interactive_renders, ++ this->State->SetExtension(LinkState::sync_interactive_renders, + this->GetSynchronizeInteractiveRenders()); + } diff --git a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild index 62bbc1f8814..7777925a4ac 100644 --- a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild +++ b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild @@ -92,7 +92,6 @@ src_prepare() { "${FILESDIR}"/${P}-removesqlite.patch \ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ "${FILESDIR}"/${P}-protobuf.patch \ - "${FILESDIR}"/${P}-protobuf-2.patch \ "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \ "${FILESDIR}"/${P}-vtk-freetype.patch diff --git a/sci-visualization/paraview/paraview-4.3.1.ebuild b/sci-visualization/paraview/paraview-4.3.1.ebuild index bba20916be9..7d7b44fc04e 100644 --- a/sci-visualization/paraview/paraview-4.3.1.ebuild +++ b/sci-visualization/paraview/paraview-4.3.1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-libs/expat >=dev-libs/jsoncpp-0.10.1 dev-libs/libxml2:2 - <dev-libs/protobuf-2.6 + dev-libs/protobuf media-libs/freetype media-libs/libpng:0 media-libs/libtheora @@ -93,7 +93,7 @@ src_prepare() { "${FILESDIR}"/${PN}-4.2.0-removesqlite.patch \ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ "${FILESDIR}"/${PN}-4.2.0-protobuf.patch \ - "${FILESDIR}"/${PN}-4.2.0-protobuf-2.patch \ + "${FILESDIR}"/${P}-protobuf-2.6.patch \ "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \ "${FILESDIR}"/${PN}-4.2.0-vtk-freetype.patch |