Date: Thu, 2 Nov 2023 07:44:12 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c0f53df45877 - main - textproc/goldendict: undeprecate the port (divorce from WebKit) Message-ID: <202311020744.3A27iCok040987@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0f53df45877917e0795064376309779bfbb0280 commit c0f53df45877917e0795064376309779bfbb0280 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-11-02 07:43:42 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-11-02 07:43:42 +0000 textproc/goldendict: undeprecate the port (divorce from WebKit) Follow AUR package and switch to Igor's QtWebEngine fork while we are waiting for upstream to merge his pull request #1542; adjust the version tag accordingly. While here, do not pollute compiler options with `-rdynamic' which is intended for linker. Discussed with: Igor Kushnir --- textproc/goldendict/Makefile | 18 ++++++++++-------- textproc/goldendict/distinfo | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile index 1916eb406443..2df9c531cf23 100644 --- a/textproc/goldendict/Makefile +++ b/textproc/goldendict/Makefile @@ -1,5 +1,6 @@ PORTNAME= goldendict PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= danfe@FreeBSD.org @@ -9,9 +10,6 @@ WWW= http://goldendict.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -DEPRECATED= Depends on deprecated www/qt5-webkit -EXPIRATION_DATE= 2023-11-26 - LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \ liblzo2.so:archivers/lzo2 \ libogg.so:audio/libogg \ @@ -22,11 +20,14 @@ LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \ USES= compiler:c++11-lang gnome iconv:wchar_t pkgconfig \ qmake qt:5 xorg USE_GITHUB= yes +GH_ACCOUNT= vedgy +GH_TAGNAME= 5a87a71 USE_XORG= x11 xtst -USE_QT= buildtools:build linguisttools:build core gui help \ - network printsupport sql svg webkit widgets \ - x11extras xml -QMAKE_ARGS= ${PORTNAME}.pro CONFIG+="zim_support" +USE_QT= buildtools:build linguisttools:build \ + core declarative gui help network printsupport \ + sql svg webchannel webengine widgets x11extras xml + +QMAKE_ARGS= ${PORTNAME}.pro CONFIG+="use_qtwebengine zim_support" OPTIONS_DEFINE= EPWING FFMPEG MULTIMEDIA OPENCC OPTIONS_DEFAULT= EPWING FFMPEG MULTIMEDIA OPENCC @@ -48,7 +49,8 @@ OPENCC_LIB_DEPENDS= libopencc.so:chinese/opencc OPENCC_QMAKE_ON= CONFIG+="chinese_conversion_support" post-patch: - @${REINPLACE_CMD} -e '/^VERSION = /s,git,&-8c5b26a,' \ + @${REINPLACE_CMD} -e '/QMAKE_CXXFLAGS += -rdynamic/d ; \ + /^VERSION = /s,git,&-${GH_ACCOUNT}-${GH_TAGNAME},' \ ${WRKSRC}/goldendict.pro @${REINPLACE_CMD} -e '/^#include <stdio\.h>/ { x; \ s/^/#include <locale.h>/; G; }' ${WRKSRC}/main.cc diff --git a/textproc/goldendict/distinfo b/textproc/goldendict/distinfo index 0da8605bc2e9..133e0c81bb10 100644 --- a/textproc/goldendict/distinfo +++ b/textproc/goldendict/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685371891 -SHA256 (goldendict-goldendict-1.5.0_GH0.tar.gz) = f9f8e068ece74cc026fdc5f56615246228b4e70c97c7197ccd4c14ceae412c7c -SIZE (goldendict-goldendict-1.5.0_GH0.tar.gz) = 20371681 +TIMESTAMP = 1695552365 +SHA256 (vedgy-goldendict-1.5.0-5a87a71_GH0.tar.gz) = 27097ae4122f2184a7638c6e6ae7bf10623eb2510660db1d8db19054e92131d7 +SIZE (vedgy-goldendict-1.5.0-5a87a71_GH0.tar.gz) = 20400277
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311020744.3A27iCok040987>