From nobody Thu Nov 02 07:44:12 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SLbVP664Mz50JCQ; Thu, 2 Nov 2023 07:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SLbVP57yGz4WbX; Thu, 2 Nov 2023 07:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698911053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iLRS/l7n8+Mo5DMRxO+1f4QQqk3+yKkoeMcbevDM9jk=; b=G2LWeeh1gTriFwf2g4qcHlkCAwXK8XAgp12gQ2AMIXhpM365LUYRticLblKmjsGeKAXDgf Ta0MlVtcG1fRY9hX18bbIBbAsgx4Rw8axA5wcOQlhrYzM+uAM2AVJz3+fQXwEmgh5Bbwdf 21EOz2TWXHybL0Z+4APqcKEZctSi4d4qndC6XzWfNteVNSYXVWrffEv48+XbrehN2q3unR dvlkLaaVIpvqxQto23q6pJJhBH/gKESgYCtLU9uXwe6RrVAzdIDPtLp5gYka+OpWpTFeHQ p5VVz2E32JSXaCiKda8I8TK4g5coiClV6Y8HECuqOs6ZKrNsWG4VHdSsRnvqBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698911053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iLRS/l7n8+Mo5DMRxO+1f4QQqk3+yKkoeMcbevDM9jk=; b=Wm3GRpwbSgoHDilFPtth9ipDywG7B1PTV7l0IlIa6/Tm3PMM+ZZ3buwxmS/4EJmWYq3+MU Nfg5wmkN1bNdLjeD7mBevx7pNoTle2V0dFPTEG2uY9Wyjqh3kX0NLWV8aqWrWxCqKzmMNZ T/ZVERVt9hw1MhTOwktKJ33Too62AhbeYa8C8XKBxlQdiHKGqnXHO+KOZr2JJjYaflvHi5 9X1ettaAIm+DBgVC0vAlIfrHxe9b5Iq3xNPZCbfuVuwzv3yJoxtJ3Q0YdxhdvJTCDcFhJj hohOtlFR5mT4zcIqx4ukY+cFAv4G8Sk4fZP+aKtmtd6tbo08tPnU2nIivn2TEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698911053; a=rsa-sha256; cv=none; b=hoE61i+NiqwKf6RncDr+VoSAYZGpJBELC3sNm0jSEcImU7bccSubyl4yH6b06Sb8P8lSMk 2ymfg2ic608DHhHI9FuCbCDKPu1QcOOZaeTOciGBI0X8Ttj/O49vWo/ZhYoDhUmPt7E6TR EBC3dCV37DwX6tOlHg8m+ZxfNjnEfF8bs2G7+WK0Em9YHOFlUzYqaWl6mFPVptumtC3V6b 4PO+/rt1KQay9n39EiEcmzCeFqJHoEtcvplHIKH1x6t3z9b1DkjiQqnQNEju5+qk4eatMH JKg+WThzzk7TgCu587Siw3a3GPHFI5s1SC0kDq/uVB3GKLl0vkJ2JXdpAbQ6+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLbVN2lSJz5vL; Thu, 2 Nov 2023 07:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A27iCJp040990; Thu, 2 Nov 2023 07:44:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A27iCok040987; Thu, 2 Nov 2023 07:44:12 GMT (envelope-from git) Date: Thu, 2 Nov 2023 07:44:12 GMT Message-Id: <202311020744.3A27iCok040987@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: c0f53df45877 - main - textproc/goldendict: undeprecate the port (divorce from WebKit) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0f53df45877917e0795064376309779bfbb0280 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0f53df45877917e0795064376309779bfbb0280 commit c0f53df45877917e0795064376309779bfbb0280 Author: Alexey Dokuchaev AuthorDate: 2023-11-02 07:43:42 +0000 Commit: Alexey Dokuchaev 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 / { x; \ s/^/#include /; 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