<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/3a40187569ba54089eecebf3c3f9dd52a344c273">https://github.com/macports/macports-ports/commit/3a40187569ba54089eecebf3c3f9dd52a344c273</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3a40187569ba54089eecebf3c3f9dd52a344c273
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Dec 18 18:31:16 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> qterminal: update to 1.4.0; provide version for old systems
</span>---
sysutils/qterminal/Portfile | 62 +++++++++++++++++-----
sysutils/qterminal/files/patch-0.6.0-config.h.diff | 12 +++++
.../qterminal/files/patch-0.6.0-fix-icns-path.diff | 16 ++++++
3 files changed, 77 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/qterminal/Portfile b/sysutils/qterminal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 420597dcaca..f7ace8ce683 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/qterminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/qterminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,16 +3,53 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt5 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup lxqt qterminal 0.15.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 522ae55364332c44217c4a4f1773a6e67da0bffb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b7a84965974c512fe2004a62fe25b0fafa175d05c8a2d00c9b362e215bc840c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 276841
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup lxqt qterminal 0.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1807982a9f1973c5e81c8bd591c6d1a422b87bea \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 db1f82b274798d2439cb87030aac5c47dda3323e8389d576f048a0cf3f05a9c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 116865
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-0.6.0-config.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-0.6.0-fix-icns-path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:desktop-file-utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAPPLEBUNDLE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_QT5=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SYSTEM_QXT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.min_version 5.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_build_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup lxqt qterminal 1.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0ab4a9e3d2a83fd0f1e5b6561d64e19a8d27c54d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8313326ac3ef728924271cd60a8f79e17e5e755a6bfa4e4419a4b7a53528659f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 219500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lxqt-build-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
license {GPL-2 GPL-3}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,13 +57,12 @@ description A lightweight Qt terminal emulator based on QTermWidget
</span>
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_build_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qttools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lxqt-build-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:qtermwidget
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qtermwidget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# openssl is linked by QtNetwork only, and qterminal does not use QtNetwork
license_noconflict openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/qterminal/files/patch-0.6.0-config.h.diff b/sysutils/qterminal/files/patch-0.6.0-config.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..357faea1285
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/qterminal/files/patch-0.6.0-config.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/lxqt/qterminal/pull/565/commits/1db9900038ff8a5d7c3852dd3e5e671a6b02aaff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/config.h 2014-10-22 16:13:14.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/config.h 2023-12-18 17:48:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,6 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // It's tricky - Ctrl is "command" key on mac's keyboards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define COPY_SELECTION_SHORTCUT "Ctrl+C"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PASTE_CLIPBOARD_SHORTCUT "Ctrl+V"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define PASTE_SELECTION_SHORTCUT "Shift+Ins"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FIND_SHORTCUT "Ctrl+F"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NEW_WINDOW_SHORTCUT "Ctrl+N"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ADD_TAB_SHORTCUT "Ctrl+T"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/qterminal/files/patch-0.6.0-fix-icns-path.diff b/sysutils/qterminal/files/patch-0.6.0-fix-icns-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e887986891d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/qterminal/files/patch-0.6.0-fix-icns-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2014-10-22 16:13:14.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-12-18 18:09:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,11 +150,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(MACOSX_BUNDLE_BUNDLE_VERSION "${STR_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(MACOSX_BUNDLE_COPYRIGHT "(c) Petr Vanek <petr@yarpen.cz>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/macosx/qterminal.icns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/macosx/qterminal.icns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROPERTIES MACOSX_PACKAGE_LOCATION Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use icon for app bundle to be visible in finder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(APPLE_BUNDLE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/macosx/qterminal.icns")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(APPLE_BUNDLE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/macosx/qterminal.icns")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(TRANSLATIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/qterminal/translations")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\")
</span></pre><pre style='margin:0'>
</pre>