public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/
Date: Tue, 21 Sep 2021 18:26:32 +0000 (UTC)	[thread overview]
Message-ID: <1632248754.3d2c9b890a5b03e535d6d0d8892519d6833b2e24.conikost@gentoo> (raw)

commit:     3d2c9b890a5b03e535d6d0d8892519d6833b2e24
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 21 17:03:05 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 18:25:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d2c9b89

sci-visualization/paraview: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22358
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/paraview-5.3.0-fix_buildsystem.patch     | 24 --------------
 .../files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch | 37 ---------------------
 .../files/paraview-5.8.1-find-xmlpatterns.patch    | 38 ----------------------
 3 files changed, 99 deletions(-)

diff --git a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch b/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch
deleted file mode 100644
index 600c7d43744..00000000000
--- a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dcc3d775bddc270aa1a4d06f85807979ab0c8358 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Thu, 1 Jun 2017 02:27:16 -0500
-Subject: [PATCH] fix buildsystem
-
----
- VTK/Utilities/Doxygen/CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/VTK/Utilities/Doxygen/CMakeLists.txt b/VTK/Utilities/Doxygen/CMakeLists.txt
-index 3f285f6..7ebf3ee 100644
---- a/VTK/Utilities/Doxygen/CMakeLists.txt
-+++ b/VTK/Utilities/Doxygen/CMakeLists.txt
-@@ -80,7 +80,4 @@ if(NOT VTK_INSTALL_NO_DOCUMENTATION)
-   install(FILES doc_readme.txt
-     DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
-     COMPONENT Development)
--  install(DIRECTORY ${VTK_BINARY_DIR}/Utilities/Doxygen/doc/html
--      DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
--      COMPONENT Development)
- endif()
--- 
-2.13.0
-

diff --git a/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch b/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch
deleted file mode 100644
index 1f76b84ac2d..00000000000
--- a/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
-From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
-Date: Wed, 27 May 2020 15:27:15 +1000
-Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
-
----
- Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
- Rendering/Qt/vtkQtStringToImage.cxx       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-index afda585cca..eca65c64cd 100644
---- a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-+++ b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-@@ -41,6 +41,7 @@
- #include <QImage>
- #include <QMap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPair>
- #include <QPixmap>
- #include <QTextDocument>
-diff --git a/VTK/Rendering/Qt/vtkQtStringToImage.cxx b/VTK/Rendering/Qt/vtkQtStringToImage.cxx
-index 659c71570e..fbb9b78f05 100644
---- a/VTK/Rendering/Qt/vtkQtStringToImage.cxx
-+++ b/VTK/Rendering/Qt/vtkQtStringToImage.cxx
-@@ -30,6 +30,7 @@
- #include <QFontMetrics>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QString>
- #include <QTextDocument>
--- 
-2.26.2
-

diff --git a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
deleted file mode 100644
index b02107bad7a..00000000000
--- a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7fe2ebc709ecb3e7f3b2aa6fc124dda0622541d4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 25 Nov 2020 16:32:56 +0100
-Subject: [PATCH] Make qt_xmlpatterns_executable overridable
-
-So far this relies on fragile guessing of path or binary being in PATH.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMake/ParaViewClient.cmake | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
-index b0dea2b328..13b59cd744 100644
---- a/CMake/ParaViewClient.cmake
-+++ b/CMake/ParaViewClient.cmake
-@@ -512,11 +512,13 @@ function (paraview_client_documentation)
-   endif ()
- 
-   include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
--  find_program(qt_xmlpatterns_executable
--    NAMES xmlpatterns-qt5 xmlpatterns
--    HINTS "${Qt5_DIR}/../../../bin"
--          "${Qt5_DIR}/../../../libexec/qt5/bin"
--    DOC   "Path to xmlpatterns")
-+  if (NOT qt_xmlpatterns_executable)
-+    find_program(qt_xmlpatterns_executable
-+      NAMES xmlpatterns-qt5 xmlpatterns
-+      HINTS "${Qt5_DIR}/../../../bin"
-+            "${Qt5_DIR}/../../../libexec/qt5/bin"
-+      DOC   "Path to xmlpatterns")
-+  endif ()
-   mark_as_advanced(qt_xmlpatterns_executable)
- 
-   if (NOT qt_xmlpatterns_executable)
--- 
-2.29.2
-


             reply	other threads:[~2021-09-21 18:26 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-21 18:26 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-06-13 17:58 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/ Sam James
2021-05-11 22:04 Sam James
2019-08-05  0:08 Matthias Maier
2017-04-23  0:06 Matthias Maier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1632248754.3d2c9b890a5b03e535d6d0d8892519d6833b2e24.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox