[arch-commits] Commit in paraview (2 files)

[Eli Schwartz]

    Date: Thursday, July 26, 2018 @ 08:52:10
  Author: eschwartz
Revision: 363490

Add accidentally forgotten patch

Added:
  paraview/repos/community-staging-x86_64/0001-fix-build-on-python-3.7.patch
  paraview/trunk/0001-fix-build-on-python-3.7.patch

-------------------------------------------------------------------+
 repos/community-staging-x86_64/0001-fix-build-on-python-3.7.patch |   25 ++++++++++
 trunk/0001-fix-build-on-python-3.7.patch                          |   25 ++++++++++
 2 files changed, 50 insertions(+)

Added: repos/community-staging-x86_64/0001-fix-build-on-python-3.7.patch
===================================================================
--- repos/community-staging-x86_64/0001-fix-build-on-python-3.7.patch	                        (rev 0)
+++ repos/community-staging-x86_64/0001-fix-build-on-python-3.7.patch	2018-07-26 08:52:10 UTC (rev 363490)
@@ -0,0 +1,25 @@
+From f10c60d254bce7b73738415b4f7a87f8c74d01a2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Thu, 26 Jul 2018 04:47:04 +0000
+Subject: [PATCH] fix build on python 3.7
+
+---
+ Qt/Python/pqPythonSyntaxHighlighter.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Qt/Python/pqPythonSyntaxHighlighter.cxx b/Qt/Python/pqPythonSyntaxHighlighter.cxx
+index 36e704e7d5..021be2d666 100644
+--- a/Qt/Python/pqPythonSyntaxHighlighter.cxx
++++ b/Qt/Python/pqPythonSyntaxHighlighter.cxx
+@@ -194,6 +194,8 @@ void pqPythonSyntaxHighlighter::rehighlightSyntax()
+ #if PY_MAJOR_VERSION == 2
+     vtkSmartPyObject resultingTextBytes(PyUnicode_AsUTF8String(resultingText));
+     char* resultingTextAsCString = PyString_AsString(resultingTextBytes);
++#elif PY_VERSION_HEX >= 0x03070000
++    char* resultingTextAsCString = const_cast<char *>(PyUnicode_AsUTF8(resultingText));
+ #else
+     char* resultingTextAsCString = PyUnicode_AsUTF8(resultingText);
+ #endif
+-- 
+2.18.0
+

Added: trunk/0001-fix-build-on-python-3.7.patch
===================================================================
--- trunk/0001-fix-build-on-python-3.7.patch	                        (rev 0)
+++ trunk/0001-fix-build-on-python-3.7.patch	2018-07-26 08:52:10 UTC (rev 363490)
@@ -0,0 +1,25 @@
+From f10c60d254bce7b73738415b4f7a87f8c74d01a2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Thu, 26 Jul 2018 04:47:04 +0000
+Subject: [PATCH] fix build on python 3.7
+
+---
+ Qt/Python/pqPythonSyntaxHighlighter.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Qt/Python/pqPythonSyntaxHighlighter.cxx b/Qt/Python/pqPythonSyntaxHighlighter.cxx
+index 36e704e7d5..021be2d666 100644
+--- a/Qt/Python/pqPythonSyntaxHighlighter.cxx
++++ b/Qt/Python/pqPythonSyntaxHighlighter.cxx
+@@ -194,6 +194,8 @@ void pqPythonSyntaxHighlighter::rehighlightSyntax()
+ #if PY_MAJOR_VERSION == 2
+     vtkSmartPyObject resultingTextBytes(PyUnicode_AsUTF8String(resultingText));
+     char* resultingTextAsCString = PyString_AsString(resultingTextBytes);
++#elif PY_VERSION_HEX >= 0x03070000
++    char* resultingTextAsCString = const_cast<char *>(PyUnicode_AsUTF8(resultingText));
+ #else
+     char* resultingTextAsCString = PyUnicode_AsUTF8(resultingText);
+ #endif
+-- 
+2.18.0
+