<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/24f1c31a083ef7aaf3b562cb1eca9d13ff6b9d96">https://github.com/macports/macports-ports/commit/24f1c31a083ef7aaf3b562cb1eca9d13ff6b9d96</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 24f1c31a083 goldendict: update to 1.5.0
</span>24f1c31a083 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 24f1c31a083ef7aaf3b562cb1eca9d13ff6b9d96
</span>Author: Nikolay Korotkiy <sikmir@disroot.org>
AuthorDate: Sat Jul 22 16:09:52 2023 +0400
<span style='display:block; white-space:pre;color:#404040;'> goldendict: update to 1.5.0
</span>---
office/goldendict/Portfile | 33 +++++++++++------------
office/goldendict/files/patch-goldendict.pro.diff | 31 ++++++++++++++-------
2 files changed, 37 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/goldendict/Portfile b/office/goldendict/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 584c41197fa..d3d7588e8b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/goldendict/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/goldendict/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,17 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup goldendict goldendict 1.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 be6a97dfe705a637f0e7bb86514ce5faf4fe960d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d9ddaca3abc6fced591ecd6060066891a70e672fd687a7c676135b273bf90a67 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20371056
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup goldendict goldendict 1.5.0-RC2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> # FIXME: add proper categories
categories office
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers ryandesign openmaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +29,6 @@ long_description A feature-rich dictionary lookup program, \
</span>
homepage http://goldendict.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ae6b9d180492bb5beca70ae5dc23ea0a407fcb1f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e735cd74030b34accf20cece78dd2363222067cd5d8e593f70117751199fd36d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:bzip2 \
port:eb \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +39,8 @@ depends_lib-append port:bzip2 \
</span> port:libiconv \
port:lzo2 \
port:opencc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:phonon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zstd
</span>
post-extract {
delete ${worksrcpath}/maclibs ${worksrcpath}/winlibs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,19 +51,15 @@ patchfiles patch-goldendict.pro.diff \
</span> patch-epwing_book.hh.diff \
patch-tiff.cc.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_build_component qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append goldendict.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/goldendict.pro
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For some reason the Makefile qmake generates hardcodes the C++ compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # that qt4-mac was made with as the one used to build any source files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # specified as OBJECTIVE_SOURCES. Replace it with $(CXX) which is set by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the qmake portgroup.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/Makefile ${worksrcpath}/Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {/\$\(QMAKE_COMP_QMAKE_OBJECTIVE_CXXFLAGS\)/s/^([[:space:]]+)[^[:space:]]+/\1\$\(CXX\)/} ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot {
copy ${worksrcpath}/GoldenDict.app ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/goldendict/files/patch-goldendict.pro.diff b/office/goldendict/files/patch-goldendict.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a3f74b10127..bff9291cc7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/goldendict/files/patch-goldendict.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/goldendict/files/patch-goldendict.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- goldendict.pro.orig 2016-04-26 11:32:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ goldendict.pro 2016-05-16 00:37:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git i/goldendict.pro w/goldendict.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fe2e4b4f..1c5f0c17 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- goldendict.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ goldendict.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@ VERSION = 1.5.0+git
</span> # rebuilt; and doing it here is required too since any other way the RCC
# compiler would complain if version.txt wouldn't exist (fresh checkouts).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,18 +11,20 @@
</span>
isEmpty( hasGit ) {
message(Failed to precisely describe the version via Git -- using the default version string)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,25 +203,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,26 +220,23 @@ mac {
</span> -lvorbisfile \
-lvorbis \
-logg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- -lhunspell-1.2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -lhunspell-1.3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -lhunspell-1.6.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -lhunspell-1.7 \
</span> -llzo2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- isEmpty(DISABLE_INTERNAL_PLAYER) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !CONFIG( no_ffmpeg_player ) {
</span> LIBS += -lao \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- -lswresample-gd \
</span> - -lavutil-gd \
- -lavformat-gd \
- -lavcodec-gd
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ -lswresample \
</span> + -lavutil \
+ -lavformat \
+ -lavcodec
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +45,7 @@
</span> cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
mkdir -p GoldenDict.app/Contents/MacOS/help & \
cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -529,7 +526,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -576,7 +573,7 @@ CONFIG( no_epwing_support ) {
</span> SOURCES += epwing.cc \
epwing_book.cc \
epwing_charmap.cc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +54,16 @@
</span> }
CONFIG( chinese_conversion_support ) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -595,7 +592,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -591,7 +588,7 @@ CONFIG( chinese_conversion_support ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Release: LIBS += -lopencc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS += -lopencc.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += -lopencc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -lopencc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -651,7 +648,7 @@ TRANSLATIONS += locale/ru_RU.ts \
</span> revtarget.target = $$PWD/version.txt
!win32 {
</pre><pre style='margin:0'>
</pre>