From nobody Sun Jan 7 01:14:41 2024 X-Original-To: dev-commits-ports-all@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 4T6zkT674zz562by; Sun, 7 Jan 2024 01:14:41 +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 4T6zkT3r65z4f06; Sun, 7 Jan 2024 01:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704590081; 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=TCG5Dh+t4glzyOKsfPyA0fnGyDOs4ra9Ux89Ja5OluA=; b=D5HV8SfiO4bE5BNgjB8CXgGM6Q0tYB8vorenOjIS417b+TT0p+D8FEt4ICmWMLW96qiIL1 r4+7bmkOQTCtsVzoYIvz/t24y2vb5BkniJC64bu3CPfKYrerPEOE7/ZCkLgKMGtVJpUKyE X5AtYtzaoGmu35JYqpc+Xln3XLWsIqF7yCg/KuVtRlBXBhX1LsjV5CeMlTr47Mgks1q+Mg kPFV1dxOVQ6pT6LLGSswvooi3oa81So5IThJ4iQRC2ogKYORXiKn6PCK8q9WaTO6uPfW/M nsVwTST0x8Ahb55rEXP6+/HvWbFuDkV4+0c1C5WZ4ob+pKDAgi7soXbrtQ6Eqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704590081; 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=TCG5Dh+t4glzyOKsfPyA0fnGyDOs4ra9Ux89Ja5OluA=; b=qNBMdToklg9l679Z15O5h68w1HdU7oEo5y9b3gpFFWqe2RWHtp4FzIdiZsVeLK1JFEiXJu QOxiAVG0WIww/2L5Ks38zfXicJWxxxBaW9cDscolvpd89qCXYJZE4wXUeFR+u4VmFgLXH7 cdC3CNykAUBZMk7rkD8pA1eYibyZwBf+68GoIHB5RTdLvfvNmtnrXbBb/33Wkh6knSuIm2 tTJMlohhVNIU9g3TMDZfmtJeBO1uLPGQEqd0pkqs8U0xewX807s32Eju2RMWscJ8YcOUxx KZVxWy+5dCbEnjAEgk8Dj4B1pdTtMFZXKroDWO4RfQ9hQpxaHpLSwNKdRPLZRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704590081; a=rsa-sha256; cv=none; b=CkHnW2gTcHDBAIbaJ3H0pXSYikqu2EKYsTxla/t49wcdsxRcg8sc1F4YY+gT8qnF0042sx aW2EpHVOdLr1YW95un+8eui6b1j2dDJaPAw3sgVhV5AdPKpFkpNfoIN9+lpzPjAekNRqxS LBhdPgdxoPrp/85WKUDmg3+MeuSyPse4CIDfz2ckdie50WV7gvrARSP7O1m7xgjbSXwFZd i1s/EgHi4RJ+OWpno8KpqO7e/c28S7b+6ByMjhwuVa4HPr0b7tOVHz0/p7SeEUSJHw6qsr BmFw1P2Rtc2CM9P1ts1NYcrLdOXx/pZD6IT10H/nau8xBX7P8k+j+d+71y5Ujg== 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 4T6zkT2rD7z148P; Sun, 7 Jan 2024 01:14:41 +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 4071Ef3f052155; Sun, 7 Jan 2024 01:14:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4071EffR052152; Sun, 7 Jan 2024 01:14:41 GMT (envelope-from git) Date: Sun, 7 Jan 2024 01:14:41 GMT Message-Id: <202401070114.4071EffR052152@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: 1ad517b452e1 - 2024Q1 - graphics/digikam: Remove WEBENGINE option. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 1ad517b452e1b3b5711baa309c7f06fe0a27ce80 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ad517b452e1b3b5711baa309c7f06fe0a27ce80 commit 1ad517b452e1b3b5711baa309c7f06fe0a27ce80 Author: Jason E. Hale AuthorDate: 2024-01-07 00:23:55 +0000 Commit: Jason E. Hale CommitDate: 2024-01-07 01:12:50 +0000 graphics/digikam: Remove WEBENGINE option. After removal of www/qt5-webkit, www/qt5-webengine is the only alternative. While here, remove the dependency on graphics/liblqr-1 which has been non-optionally bundled starting with 8.2.0 release. The Akonadi patches need some work, but it builds, so I'll save that for the next release along with a few other cleanups. Not depending on a non-existent port is more pressing at this time. MFH: 2024Q1 (cherry picked from commit ac885a609f8a65ecb25eb39f354712b8ed787a97) --- graphics/digikam/Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index ff5a27605b51..0b0ec695e479 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,6 +1,6 @@ PORTNAME= digikam DISTVERSION= 8.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} \ https://files.kde.org/digikam/%SUBDIR%/:aesthetic,face,shape \ @@ -30,7 +30,6 @@ LIB_DEPENDS= libKF5Sane.so:graphics/libksane \ libjasper.so:graphics/jasper \ liblcms2.so:graphics/lcms2 \ liblensfun.so:graphics/lensfun \ - liblqr-1.so:graphics/liblqr-1 \ libopencv_core.so:graphics/opencv \ libheif.so:graphics/libheif \ libpgf.so:graphics/libpgf \ @@ -39,7 +38,7 @@ LIB_DEPENDS= libKF5Sane.so:graphics/libksane \ libx265.so:multimedia/x265 USES= bison cmake compiler:c++17-lang desktop-file-utils eigen:3 gl \ - gnome jpeg kde:5 localbase:ldflags magick pkgconfig qt:5 \ + gnome jpeg kde:5 magick pkgconfig qt:5 \ shebangfix tar:xz xorg USE_GL= gl glu USE_GNOME= glib20 libxml2 libxslt @@ -51,8 +50,8 @@ USE_KDE= archive auth bookmarks calendarcore codecs completion config \ unitconversion widgetsaddons windowsystem xmlgui \ ecm:build USE_QT= concurrent core dbus declarative gui location network \ - networkauth opengl printsupport sql webchannel widgets \ - x11extras xml xmlpatterns \ + networkauth opengl printsupport sql webchannel webengine \ + widgets x11extras xml xmlpatterns \ buildtools:build qmake:build USE_XORG= ice sm x11 xext @@ -64,7 +63,7 @@ WITH_CCACHE_BUILD= yes CMAKE_ON= BUILD_WITH_CCACHE DIGIKAMSC_COMPILE_DIGIKAM ENABLE_KFILEMETADATASUPPORT \ CMAKE_DISABLE_FIND_PACKAGE_VAAPI -OPTIONS_DEFINE= FACEDETECT KDEPIM MEDIAPLAYER NLS WEBENGINE +OPTIONS_DEFINE= FACEDETECT KDEPIM MEDIAPLAYER NLS OPTIONS_GROUP= MP MP_DESC= Media player options OPTIONS_GROUP_MP= OPENAL PORTAUDIO PULSEAUDIO @@ -127,11 +126,6 @@ PULSEAUDIO_IMPLIES= MEDIAPLAYER SQLITE3_USE= QT=sql-sqlite3:run -WEBENGINE_DESC= Use Qt WebEngine instead of WebKit -WEBENGINE_USE= QT=webengine -WEBENGINE_USE_OFF= QT=webkit -WEBENGINE_CMAKE_BOOL= ENABLE_QWEBENGINE - PLIST_SUB= SHLIB_VER=${DISTVERSION} post-install-FACEDETECT-on: