<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1b2857708f3010022236316efac1fea1ba4957dc">https://github.com/macports/macports-ports/commit/1b2857708f3010022236316efac1fea1ba4957dc</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 1b28577 LyX: Update to 2.3.1
</span>1b28577 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1b2857708f3010022236316efac1fea1ba4957dc
</span>Author: Michael Lass <michael.lass@uni-paderborn.de>
AuthorDate: Thu Oct 4 18:17:27 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> LyX: Update to 2.3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes build with qt 5.11
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes build of lyxconvert with qt 4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Further changes:
</span><span style='display:block; white-space:pre;color:#404040;'> * We need to workaround a -2 suffix in the distribution filename. This
</span><span style='display:block; white-space:pre;color:#404040;'> suffix seems not to be part of the actual version of LyX.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove unresolvable mirror gd.tuwien.ac.at
</span>---
aqua/LyX/Portfile | 20 ++++-----
aqua/LyX/files/patch-qt4_remove_convert.diff | 65 ----------------------------
2 files changed, 8 insertions(+), 77 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 f6b92de..b4a416d 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;'>@@ -5,7 +5,7 @@ PortGroup cxx11 1.1
</span>
name LyX
conflicts LyX1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,17 +30,17 @@ depends_lib-append port:enchant \
</span> port:libmagic
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname lyx-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname lyx-${version}-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir lyx-${version}
</span>
master_sites http://lyx.cybermirror.org/stable/${branch}.x/ \
http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/${branch}.x/ \
ftp://ftp.ntua.gr/pub/X11/LyX/stable/${branch}.x/ \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.lyx.org/pub/lyx/stable/${branch}.x/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://gd.tuwien.ac.at/publishing/tex/lyx/stable/${branch}.x/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftp://ftp.lyx.org/pub/lyx/stable/${branch}.x/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 374b428cdfc9cedfb597b5be0ee03b2ef7e139ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 310f556adbfafd243f2c17a0be0d22fa50b9b4f7de41e66625cace8ea088b92b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 15676680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0841f86219fe6921b501212b75524e814279b262 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f5c9450ba196ed9d49fbc573f65b10d1726d16a62453466957aba2a9f6d66f84 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15800168
</span>
configure.args --disable-silent-rules
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,11 +51,7 @@ post-configure {
</span> ${worksrcpath}/development/MacOSX/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 2.3.0 introduced lyxconvert which requires Qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://www.lyx.org/trac/ticket/11094
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt4_remove_convert.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt4]} {
</span> default_variants +qt5
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/LyX/files/patch-qt4_remove_convert.diff b/aqua/LyX/files/patch-qt4_remove_convert.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2a2c124..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/LyX/files/patch-qt4_remove_convert.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt 2018-02-24 19:11:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt 2018-03-29 10:04:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,9 +17,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(mathed)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(support)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(tex2lyx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_subdirectory(convert)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(client)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am 2018-02-24 19:11:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am 2018-03-29 10:21:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLIENT = client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS = support frontends . $(CLIENT) tex2lyx convert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUBDIRS = support frontends . $(CLIENT) tex2lyx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_DIST = lyx_commit_hash.h.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in 2018-02-24 19:15:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2018-03-29 10:28:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -820,7 +820,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TEST_LOG_FLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DIST_SUBDIRS = support frontends . client tex2lyx convert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DIST_SUBDIRS = support frontends . client tex2lyx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/common.am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1064,7 +1064,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_ETAGSFLAGS = --lang=c++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @BUILD_CLIENT_SUBDIR_TRUE@CLIENT = client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS = support frontends . $(CLIENT) tex2lyx convert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUBDIRS = support frontends . $(CLIENT) tex2lyx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ############################## Tests ##################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_DIST = lyx_commit_hash.h.in CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in 2018-02-24 19:15:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2018-03-29 10:39:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -458,7 +458,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIST_SUBDIRS = 3rdparty autotests m4 config development po src sourcedoc lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @BUILD_CLIENT_SUBDIR_TRUE@CLIENT = src/client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CLIENT) src/tex2lyx src/convert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CLIENT) src/tex2lyx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/scripts/convertDefault.py 2018-02-24 19:11:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/scripts/convertDefault.py 2018-03-29 11:11:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,8 +52,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if im or gm:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opts = "-depth 8"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elif sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command = 'lyxconvert'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If supported, add the -define option for pdf source formats
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.argv[1] == 'pdf' and (version >= 0x060206 or gm):
</span></pre><pre style='margin:0'>
</pre>