<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6a90c724ed911745ef5fc58ee8a8964061214863">https://github.com/macports/macports-ports/commit/6a90c724ed911745ef5fc58ee8a8964061214863</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 6a90c724ed9 gmic 3.1.3: stealth update to fix translations for gmic-(gimp|qt)
</span>6a90c724ed9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6a90c724ed911745ef5fc58ee8a8964061214863
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Jun 17 07:59:50 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> gmic 3.1.3: stealth update to fix translations for gmic-(gimp|qt)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/dtschump/gmic/issues/390
</span>---
science/gmic/Portfile | 15 ++++++-----
.../gmic/files/patch-gmic-qt-CMakeLists.txt.diff | 29 ----------------------
2 files changed, 7 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/Portfile b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e13d590885f..f59cc9ed17f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ if {${subport} eq "gmic-gimp" || ${subport} eq "gmic-qt"} {
</span>
name gmic
version 3.1.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license CeCILL
categories science graphics
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +39,14 @@ master_sites https://gmic.eu/files/source/
</span> # gmic will pick up include files from opencv, opencv3 dods not conflict
conflicts_build opencv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/dtschump/gmic/issues/390
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir TeXShop/${version}_${revision}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> distfiles ${name}_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 24bdbddbe0c7ded8cf2923e337f78e52942aca1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 02bbce405ddc8531cdee45a7256812d3adda8aa0d5952bcff168e221795ff65a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10715908
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a6b528b1b77d52455d633c6d1f757cda1fdeb958 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 25d1583932801321fe559ee87c3c19c60d45f9119447d86049f073ad295b3da3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10770532
</span>
depends_lib port:curl \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,9 +256,5 @@ if {${subport} eq ${name}} {
</span>
require_active_variants ${name} x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # gmic 3.1.3 broke translations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/dtschump/gmic/issues/390
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gmic-qt-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-gmic-qt-CMakeLists.txt.diff b/science/gmic/files/patch-gmic-qt-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e180c36682b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/patch-gmic-qt-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmic-qt/CMakeLists.txt.orig 2022-06-16 10:26:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmic-qt/CMakeLists.txt 2022-06-17 05:45:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -545,16 +545,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(ENABLE_DYNAMIC_LINKING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--message("Producing translation .qm files")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations OUTPUT_QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--message("Producing filter translation .qm files")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations/filters OUTPUT_QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(gmic_qt_QRC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gmic_qt.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- translations.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wip_translations.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# message("Producing translation .qm files")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations OUTPUT_QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# message("Producing filter translation .qm files")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations/filters OUTPUT_QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set(gmic_qt_QRC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# gmic_qt.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# translations.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# wip_translations.qrc
</span><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;'>- if (${GMIC_QT_HOST} STREQUAL "gimp" OR ${GMIC_QT_HOST} STREQUAL "gimp3")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (${GMIC_QT_HOST} STREQUAL "gimp3")
</span></pre><pre style='margin:0'>
</pre>