<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4d721f2f60a3bd863e22e9587bc13cd1329b2dca">https://github.com/macports/macports-ports/commit/4d721f2f60a3bd863e22e9587bc13cd1329b2dca</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4d721f2f60a LyX: update to 2.4.2 for Qt5; pin Qt4 at 2.3.8 (#26120)
</span>4d721f2f60a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4d721f2f60a3bd863e22e9587bc13cd1329b2dca
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Thu Oct 10 14:41:51 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> LyX: update to 2.4.2 for Qt5; pin Qt4 at 2.3.8 (#26120)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> We are ignoring experimental Qt6 ATM. Add other python versions.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70162
</span>---
aqua/LyX/Portfile | 37 ++++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/LyX/Portfile b/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1ef1bf6b2a..5d45fe0c357 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup boost 1.0
</span>
name LyX
conflicts LyX1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.4.2
</span> revision 0
set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,9 @@ master_sites http://lyx.cybermirror.org/stable/${branch}.x/ \
</span> ftp://ftp.ntua.gr/pub/X11/LyX/stable/${branch}.x/ \
ftp://ftp.lyx.org/pub/lyx/stable/${branch}.x/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 80b2c53d12b04dd64a6326b4b1ea505dcb352120 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7e8f56d148cb459eb00abbe9c6371744e4ff077b842c0024153a3f094b10d4ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16412700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 686630c5fe6d98bb29625e0818d9ad027bdb3814 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0d5a75dec9a169ab23bfa47da53ec65c62432de57014de315023d620ebccfe68 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17871168
</span>
configure.args --disable-silent-rules
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,7 @@ post-configure {
</span> ${worksrcpath}/development/MacOSX/Makefile
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 2.4.x has expermintal support for Qt6 - we are ignoring ATM
</span> if {${os.platform} eq "darwin" && ${os.major} < 11} {
default_variants +qt4
} elseif {![variant_isset qt4]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,28 +63,46 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> }
# Make the default match boost's default.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python38] && ![variant_isset python39]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python38] && ![variant_isset python39] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python310] && ![variant_isset python311]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +python312
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python39 python310 description {Use python38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: use loops like other ports do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python39 python310 python311 python312 description {Use python38} {
</span> depends_build-append port:python38
configure.python ${prefix}/bin/python3.8
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python38 python310 description {Use python39} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python38 python310 python311 python312 description {Use python39} {
</span> depends_build-append port:python39
configure.python ${prefix}/bin/python3.9
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python38 python39 description {Use python310} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python38 python39 python311 python312 description {Use python310} {
</span> depends_build-append port:python310
configure.python ${prefix}/bin/python3.10
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python38 python39 python310 python312 description {Use python311} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:python311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.11
</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;'>+variant python312 conflicts python38 python39 python310 python311 description {Use python312} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:python312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant qt4 conflicts qt5 description {Use Qt4} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 80b2c53d12b04dd64a6326b4b1ea505dcb352120 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7e8f56d148cb459eb00abbe9c6371744e4ff077b842c0024153a3f094b10d4ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 16412700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args --prefix=${applications_dir}/LyX.app
configure.args-append \
--without-x \
</pre><pre style='margin:0'>
</pre>