<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0a3a7b0dc89911ae0c93eaef068d5705322cd2f9">https://github.com/macports/macports-ports/commit/0a3a7b0dc89911ae0c93eaef068d5705322cd2f9</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 0a3a7b0 texstudio: Major update and cleanup
</span>0a3a7b0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0a3a7b0dc89911ae0c93eaef068d5705322cd2f9
</span>Author: Yen Chi Hsuan <yan12125@gmail.com>
AuthorDate: Sat Aug 5 18:12:34 2017 +0800
<span style='display:block; white-space:pre;color:#404040;'> texstudio: Major update and cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 1. Switch to qt5
</span><span style='display:block; white-space:pre;color:#404040;'> 2. texstudio no longer uses precompile_header, so blacklisting clang is
</span><span style='display:block; white-space:pre;color:#404040;'> not necessary
</span>---
editors/texstudio/Portfile | 19 +++++-----
editors/texstudio/files/patch-texstudio.pro.diff | 44 +++++++++++-------------
2 files changed, 29 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/texstudio/Portfile b/editors/texstudio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 286154c..1b40480 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/texstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/texstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span>
name texstudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.12.6
</span> categories editors
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,12 +17,14 @@ long_description texstudio is a TeX editor forked off texmarker.
</span>
homepage http://texstudio.sourceforge.net/
master_sites sourceforge:project/texstudio/texstudio/TeXstudio%20${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .orig.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .tar.gz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e2b90518a60b4c70771a4885e920a324d68ceb60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7f7ae53818d74a06fffef81e1aa9552badd85045a9953b13f28d15b393962015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:poppler-qt4-mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d184a71590c87610b4a8fb5540dd05f4d47b7df7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cdae8c9f3fa84af2424cfef6d4a3abb2437cc71ecb24c1883e4ecca2f2693da3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:poppler-qt5 port:qt5-qtbase port:qt5-qtsvg port:qt5-qtscript
</span>
pre-patch {
# DOS to UNIX line endings so we can patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,15 +37,10 @@ post-patch {
</span> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/texstudio.pro
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# error: unable to read PCH file: 'Is a directory'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugreports.qt-project.org/browse/QTBUG-27018
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *clang*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> universal_variant no
configure.cmd ${qt_qmake_cmd}
configure.pre_args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append CONFIG+="${qt_arch_types}"
</span>
build.args CC="${configure.cc} [get_canonical_archflags cc]" \
CXX="${configure.cxx} [get_canonical_archflags cxx]" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/texstudio/files/patch-texstudio.pro.diff b/editors/texstudio/files/patch-texstudio.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 42107fd..283e9cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/texstudio/files/patch-texstudio.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/texstudio/files/patch-texstudio.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- texstudio.pro.orig 2012-11-30 15:18:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ texstudio.pro 2012-11-30 15:18:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,6 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LANGUAGE = C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTDIR = ./
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG += qt precompile_header uitools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- texstudio.pro.orig 2017-08-05 17:42:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ texstudio.pro 2017-08-05 17:42:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +13,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= precompile_header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +CONFIG -= debug
<span style='display:block; white-space:pre;background:#ffe0e0;'>- exists(texmakerx_my.pri):include(texmakerx_my.pri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow loading extra config by file for automatic compilations (OBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exists(texstudio.pri):include(texstudio.pri)
</span> QT += network \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,8 +263,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,8 +297,7 @@
</span> config += unix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # #universal tiger
- CONFIG += link_prl \
- x86_64
+ CONFIG += link_prl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
# QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -532,9 +532,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INCLUDEPATH += /usr/local/include/poppler/qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS += -L/usr/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -L/usr/local/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INCLUDEPATH += @PREFIX@/include/poppler/qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS += -L@PREFIX@/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lpoppler-qt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -572,7 +573,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macx:LIBS += -framework CoreFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS += -L/usr/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += -L@PREFIX@/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>