<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f0285ea071777fb4d07b1ee74c2ccd3ecda43dfa">https://github.com/macports/macports-ports/commit/f0285ea071777fb4d07b1ee74c2ccd3ecda43dfa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f0285ea071777fb4d07b1ee74c2ccd3ecda43dfa
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Sep 20 11:08:01 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> qscintilla*: update to 2.13.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - restrict to version 2.11.6 for Qt4 and Qt5 version for Python 2.7 and 3.5
</span>---
devel/qscintilla/Portfile | 76 +++++++++++++++++-----
.../qscintilla/files/patch-src-qscintilla.pro.diff | 13 ++++
python/py-pyqt5/Portfile | 5 ++
3 files changed, 77 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/Portfile b/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a4309d0a85..30acf9ba8db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,29 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
name qscintilla
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.11.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bc00b95128956424a2f3466d25c4dd9f03169c0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# restrict to latest supported version for Qt4 and Python 2.7 and 3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string first "qt4" ${subport}] != -1 || [string first "py" ${subport}] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup deprecated 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deprecated.upstream_support no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.11.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 bc00b95128956424a2f3466d25c4dd9f03169c0b \
</span> sha256 e7346057db47d2fb384467fafccfcb13aa0741373c5d593bc72b55b2f0dd20a7 \
size 3027764
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname QScintilla-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.13.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 755f8388b226f4f11315cce1956a81bce88e3cb0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05116938bedfceb2953d3c24f862e1ab4d68ba7845f135d1d7aa1086595449b2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3059601
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname QScintilla_src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
categories devel
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +43,6 @@ long_description QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ e
</span> bold and italics, multiple foreground and background colours and \
multiple fonts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#distname QScintilla_gpl-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname QScintilla-${version}
</span> master_sites https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}
compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,17 +52,22 @@ foreach qt_major {4 5} {
</span> subport ${name}-qt${qt_major} {
if {${qt_major} eq 4} {
PortGroup qmake 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/Qt4Qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary path to fix necessary inclusion of QUrl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-Qt4Qt5_qsciscintillabase.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fixup @rpath in the library's install_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-Qt4Qt5-qscintilla.pro.diff
</span> } else {
PortGroup qmake${qt_major} 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${worksrcdir}/Qt4Qt5
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary path to fix necessary inclusion of QUrl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Qt4Qt5_qsciscintillabase.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/src
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fixup @rpath in the library's install_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Qt4Qt5-qscintilla.pro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fixup @rpath in the library's install_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-src-qscintilla.pro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if {${qt_major} eq 4} {
# enable C++11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,15 +91,17 @@ foreach qt_major {4 5} {
</span> subport ${name}-designer-qt${qt_major} {
if {${qt_major} eq 4} {
PortGroup qmake 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/designer-Qt4Qt5
</span> } else {
PortGroup qmake${qt_major} 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/designer
</span> }
description Qt Designer plugin for Qt${qt_major} QScintilla
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${worksrcdir}/designer-Qt4Qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append patch-add_debug.diff
if {${qt_major} eq 4} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,19 +130,28 @@ foreach qt_major {4 5} {
</span> depends_lib port:py27-qscintilla-qt${qt_major}
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}
</span> system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${subport}/README"
}
}
set python_versions {27 35 36 37 38 39}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python bindings for the latest upstream Qt5 version are in py-pyqt5-scintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions {27 35}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach pver ${python_versions} {
subport py${pver}-${name}-qt${qt_major} {
if {${qt_major} eq 4} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
PortGroup qmake${qt_major} 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the Python bindings below require the latest qscintilla-qt5 version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py36-pyqt5-scintilla py37-pyqt5-scintilla py38-pyqt5-scintilla py39-pyqt5-scintilla
</span> }
categories-append python
description Python bindings for Qt${qt_major} QScintilla
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,6 +210,19 @@ foreach qt_major {4 5} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# set pyXY-qscintilla-qt5 (where XY is => 36) to be replaced_by pyXY-pyqt5-scintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this section can be removed after September 2022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_versions {36 37 38 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py${pver}-${name}-qt5 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by py${pver}-pyqt5-scintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr revision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq ${name}} {
revision 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +232,7 @@ if {${subport} eq ${name}} {
</span> supported_archs noarch
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}
</span> system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${subport}/README"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/files/patch-src-qscintilla.pro.diff b/devel/qscintilla/files/patch-src-qscintilla.pro.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..25a45ddd575
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla/files/patch-src-qscintilla.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qscintilla.pro.orig 2021-09-20 17:44:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qscintilla.pro 2021-09-20 17:44:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,10 +37,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-macx:!CONFIG(staticlib) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += . ../scintilla/include ../scintilla/lexlib ../scintilla/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !CONFIG(staticlib) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/Portfile b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c35022616a9..d7e8af10a4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,11 @@ if {${name} ne ${subport}} {
</span> reinplace "s|@PYVER@|${python.version}|g" ${worksrcpath}/project.py
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-project.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PYVER@|${python.version}|g" ${worksrcpath}/project.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
qt5.depends_component \
</pre><pre style='margin:0'>
</pre>