From nobody Sat Nov 16 08:40:37 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 4Xr6m53Nsqz5d2ww; Sat, 16 Nov 2024 08:40:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xr6m52rwlz4nw0; Sat, 16 Nov 2024 08:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731746437; 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=5i7nJ0vjkmdTM41vJ7sm45md0yYdQd922KFYr4PdipQ=; b=vuzIsSm8lQz0Vbr18FBgmx/3KZSWDqBhvW/NPlUqN0S3gNeXdvi3N0z8IuszpN4JC5RlVF lGNlNtfd5RqyeUuY1nq100Ro7mIxyhlDIGrSXyo5dg0B/OW7K3/0IrkI3ghXMboQBbsWHa vl6857wEPWbRYfSqQGKl3B7Li022cbLpS9CYmCmnic82PgRQD/GOHq9Dtb379IpXFGGGT/ rjb4DSy+X1I4vbHDY+ZxwU/1YMW26LMKetxsxFI5EUTMzWfKV4jVV4+ygNshyo8FDO2qqU dzsSR+t/jCJYMvumzquwbWKDyCzdIEItA+zKuFn3IZ+dkQaOwawGsJVRAgZBJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731746437; 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=5i7nJ0vjkmdTM41vJ7sm45md0yYdQd922KFYr4PdipQ=; b=XqzW670rwfydcyHqCoo+gfYfqNBJYq4+IG8OYYfZIeVFnuKhnk7mZwHNKca/Km05LG1oDL Am3HbOl5lH8oi+fLtw70uyW/5Q9dhhbY97zpBtM80ypjG9NVjjHBGJSv8WcTWSWAcNg4KF Yzs4wojKAbOYoUdsZ6Q2DczZ4RlTnRKOsJjtUmygS8HEMPZz23yQ7oUBBgQf/7v6ghmZBn XBIcK3AH656kNYllFEcRVknpCtm/JhH9j2EH3PDsVcW3hSQPd5Fm2BvuqN38yXY8GKizAC CQhq4Pow3RCPv0+oDV5p9GMcQPJbaZTDiNO6QnkPDoCH0PrNqfc5/SSOUQUNcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731746437; a=rsa-sha256; cv=none; b=gnoDjolR96okPX5W3QH14etYlTX6jLJI/niHONtU6hP12isM2uTNJZWa/8SGAcJ6agDzVN 1Tr5OHLtFQdxhvzixpDbfF3S4HRGs55zp237vBkMzZc8qrUA7/y4xZUe/2XkUz7H/TOuQX wkHKddSIO09DwLrDFaGw4aF5oMmlFVfqvOzTr+snvK1LHS1MWmoJ6ULY0rFmAcGpwptD8w xuxEDrvl4VPx43kDME44F7f9Ung+lGR0KkC9SahbYhSDoEQCwR5wEzlLXv6lNd/AKESXRG eFz+cI6Ypi7qeZkc9sWIKEBvOdHKnVXF/nIN9wtalTWva1wnpk9ONY4UNbf2Lg== 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 4Xr6m528HKz10xQ; Sat, 16 Nov 2024 08:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AG8ebZu062745; Sat, 16 Nov 2024 08:40:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AG8eb8U062742; Sat, 16 Nov 2024 08:40:37 GMT (envelope-from git) Date: Sat, 16 Nov 2024 08:40:37 GMT Message-Id: <202411160840.4AG8eb8U062742@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: f551531a5740 - main - astro/marble: Decruft 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: f551531a5740944419ac3668a3675003ee2bdc21 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=f551531a5740944419ac3668a3675003ee2bdc21 commit f551531a5740944419ac3668a3675003ee2bdc21 Author: Jason E. Hale AuthorDate: 2024-11-16 05:33:13 +0000 Commit: Jason E. Hale CommitDate: 2024-11-16 08:40:30 +0000 astro/marble: Decruft Remove long unused dependencies. Move optional Qt components to the options that require them. Remove a few unneed declarations that I think tagged along from KDE4. --- astro/marble/Makefile | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/astro/marble/Makefile b/astro/marble/Makefile index 68487f3c6f8a..a0541daf16c8 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -1,6 +1,6 @@ PORTNAME= marble DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= astro education kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -10,42 +10,39 @@ WWW= https://marble.kde.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip@qt5 \ - libprotobuf.so:devel/protobuf +LIB_DEPENDS= libprotobuf.so:devel/protobuf USES= cmake compiler:c++11-lang desktop-file-utils gettext \ kde:5 qt:5 shared-mime-info tar:xz xorg -USE_KDE= attica auth codecs completion config configwidgets coreaddons \ - crash doctools i18n jobwidgets kio newstuff package parts phonon \ +USE_KDE= auth codecs completion config configwidgets coreaddons \ + crash doctools i18n jobwidgets kio package parts phonon \ plasma-framework plasma-workspace-wallpapers runner service solid \ - sonnet textwidgets wallet widgetsaddons windowsystem xmlgui \ + sonnet textwidgets widgetsaddons windowsystem xmlgui \ ecm:build -USE_QT= concurrent core dbus declarative designer gui location network opengl \ - printsupport script serialport sql svg webchannel widgets xml \ +USE_LDCONFIG= yes +USE_QT= concurrent core dbus declarative designer gui network \ + printsupport serialport sql svg widgets xml \ buildtools:build qmake:build testlib:build USE_XORG= x11 -USE_LDCONFIG= yes -MAKE_ENV= XDG_CONFIG_HOME=/dev/null -# We have to set QT_IMPORTS_PATH, as it does not get picked up -CMAKE_ARGS= -DMOBILE:BOOL=FALSE \ - -DQT_IMPORTS_DIR:PATH=${QT_IMPORTDIR} +CMAKE_OFF= MOBILE # Override shared library version KDE_APPLICATIONS_SHLIB_VER= ${KDE_APPLICATIONS_SHLIB_G_VER} -OPTIONS_DEFINE= GPS DOCS WEBENGINE -OPTIONS_DEFAULT=GPS +OPTIONS_DEFINE= DOCS GPS WEBENGINE +OPTIONS_DEFAULT= GPS OPTIONS_DEFAULT_amd64= WEBENGINE OPTIONS_DEFAULT_i386= WEBENGINE -OPTIONS_SUB= yes +OPTIONS_SUB= yes GPS_DESC= Support for GPS position provider +GPS_USE= QT=location GPS_LIB_DEPENDS= libgps.so:astro/gpsd GPS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_libgps -WEBENGINE_DESC= Add dependency on qt5-webengine -WEBENGINE_USE= QT=webengine +WEBENGINE_DESC= Build various plugins that require qt5-webengine +WEBENGINE_USE= QT=webchannel,webengine WEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets .include