From nobody Thu Nov 14 20:38:05 2024 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 4XqBms6vxfz5d7Nb; Thu, 14 Nov 2024 20:38:05 +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 4XqBms4lgNz46Rc; Thu, 14 Nov 2024 20:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731616685; 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=3pBIPT0qFTAjTdb/rIELJwkTomIH0D7XsiH7R7wpdlc=; b=qnZ7nEhbxdzUkof+QDxXWEir0jYYEyRb4CIFE3dgxkfPdhc33o7IaYagGpBejCNf9NUdGg x7G2YiRbRtkgoSA6NIB54BQ7oepy6sDdqzcr9OgXin29RtWUPbvAo3GYrXiRzNyOqWw8cL nW/ym5OxT4w59LnjS/+gYtpt2V9xN1y8FSg6pF5pQ0E5IPTY9z38QwhuPmyy3mKHb/PjVp h4KLU4kRkCCzw6Uidwa9SEODO2W40/YoYwzA5LucdgV1PcKCOYyvkBTzcERsFfjOc22YZZ NVrJ0egneLMBq+HANpo4SDtwWQ1zL1K/y7Y7SP6D2IYD4YAI+CENUoIJ339RSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731616685; 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=3pBIPT0qFTAjTdb/rIELJwkTomIH0D7XsiH7R7wpdlc=; b=bRprZMs9AoajXK2H51TKbaxBouv2WsSe3C60G+VBHkba5r5nvwaUz+pUMWvCjxCeeVqwPo Vqsg/R89p6KU8WPMxgRFy0LDAHXQxOsk00jxElTK0Y1fjVICPPSbxjCLl6GRC4r4+Vj4fg JtlfpbJQy7ZaOL4UU+mk0mUVLseY5kepRmO+x7CXOVRzDQKWHKJtCF/rhfjo/jPJXDJ4YO 6bt4ldot935SKYlUmSTNQgzcke//fU3WC/GKW25onEizmNZ0qVEhVrf0JoSzshWLUzCQR2 PqzjCBTw1p2SABeWU9dMDU723QTXGW5SLLsJ1SyHHwJVabOs3pb/M+oCYQjtGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731616685; a=rsa-sha256; cv=none; b=ILJ6QVomih1xNy9wT+FEErjN0k/CmIWnS27//BeWVWX3EeOaaOkcg/huAH53EMlN5KTmWo 6rBOLW1BFgioJxgbTJKSUL8G5dHYACBBpVZRRdAO1Wqv0AOTBTD5xWDsuPj3KHNUYQkmg3 OtW/YzmQUsybNh1YVl5obTbDDMuypCf8K7jlUXb/fImKfvcY+iog9p7orQm2SFAVkKqOOr POKdk6IMa6AhTaMAjesyNHIH27u3lO4ASeV7uKTXdPrn0e2aZMP1kqaxVcMr4JhJfiW8oM PuGIj+7KQuK8xvaSWtCGbZS8CEhZ3bxUF9BSGIJGi67yOeJcsUxiefpmxHrVqw== 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 4XqBms4K0sztgH; Thu, 14 Nov 2024 20:38:05 +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 4AEKc5sK037761; Thu, 14 Nov 2024 20:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AEKc511037758; Thu, 14 Nov 2024 20:38:05 GMT (envelope-from git) Date: Thu, 14 Nov 2024 20:38:05 GMT Message-Id: <202411142038.4AEKc511037758@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 116eb4a7d098 - main - textproc/kreport: make Marble integration optional 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 116eb4a7d09860493ef9dad0ac6e7aae39a12f2b Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=116eb4a7d09860493ef9dad0ac6e7aae39a12f2b commit 116eb4a7d09860493ef9dad0ac6e7aae39a12f2b Author: Dima Panov AuthorDate: 2024-11-14 20:37:15 +0000 Commit: Dima Panov CommitDate: 2024-11-14 20:37:49 +0000 textproc/kreport: make Marble integration optional Sponsored by: Future Crew, LLC --- textproc/kreport/Makefile | 10 +++++++++- textproc/kreport/pkg-plist | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/textproc/kreport/Makefile b/textproc/kreport/Makefile index 9073e8ff3756..50931847b605 100644 --- a/textproc/kreport/Makefile +++ b/textproc/kreport/Makefile @@ -12,12 +12,20 @@ WWW= https://www.kexi-project.org/ LIB_DEPENDS= libKPropertyCore3.so:x11-toolkits/kproperty USES= cmake compiler:c++11-lang gettext kde:5 python qt:5 tar:xz -USE_KDE= config coreaddons marble widgetsaddons \ +USE_KDE= config coreaddons widgetsaddons \ ecm:build USE_QT= core declarative gui location network printsupport webchannel \ webengine widgets xml \ buildtools:build qmake:build +OPTIONS_DEFINE= MARBLE +OPTIONS_DEFAULT=MARBLE +OPTIONS_SUB= yes + +MARBLE_DESC= Virtual globe and world atlas +MARBLE_USE= kde=marble +MARBLE_CMAKE_OFF= -DMarble_FOUND:BOOL=OFF + CONFLICTS_INSTALL= calligra-2* post-extract: diff --git a/textproc/kreport/pkg-plist b/textproc/kreport/pkg-plist index 92267e73e2aa..ee2ef769ddbc 100644 --- a/textproc/kreport/pkg-plist +++ b/textproc/kreport/pkg-plist @@ -77,11 +77,11 @@ lib/libKReport3.so.4 lib/libKReport3.so.4.2.0 %%QT_MKSPECDIR%%/modules/qt_KReport3.pri %%QT_PLUGINDIR%%/kreport3/org.kde.kreport.barcode.so -%%QT_PLUGINDIR%%/kreport3/org.kde.kreport.maps.so +%%MARBLE%%%%QT_PLUGINDIR%%/kreport3/org.kde.kreport.maps.so libdata/pkgconfig/KReport3.pc %%DATADIR%%3/icons/kreport_breeze.rcc %%DATADIR%%3/icons/org.kde.kreport.barcode_breeze.rcc -%%DATADIR%%3/icons/org.kde.kreport.maps_breeze.rcc +%%MARBLE%%%%DATADIR%%3/icons/org.kde.kreport.maps_breeze.rcc share/kservicetypes5/kreport_elementplugin.desktop share/locale/af/LC_MESSAGES/kreport_qt.qm share/locale/ar/LC_MESSAGES/kreport_qt.qm