On Sun Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote:
> - databases/kexi: On my list, remove the dependency
> - devel/kreport: On my list, remove the dependency
Please find below a simple patch to disable WebKit in kreport and kexi.
OK?
diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile
index 35c9d8d2fcb..b774e7b79fc 100644
--- a/databases/kexi/Makefile
+++ b/databases/kexi/Makefile
@@ -5,7 +5,7 @@ COMMENT = visual database applications creator
VERSION = 3.2.0
DISTNAME = kexi-${VERSION}
-REVISION = 4
+REVISION = 5
SHARED_LIBS += kexicore3.2 0.0 # 3.2
SHARED_LIBS += kexidatatable3.2 0.0 # 3.2
@@ -38,8 +38,7 @@ WANTLIB += KF5Service KF5Solid KF5SonnetUi
KF5SyntaxHighlighting
WANTLIB += KF5TextEditor KF5TextWidgets KF5WidgetsAddons KF5WindowSystem
WANTLIB += KF5XmlGui KPropertyCore3 KPropertyWidgets3 KReport3
WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml
-WANTLIB += c glib-2.0 iconv m mariadb X11
+WANTLIB += Qt5Widgets Qt5Xml X11 c glib-2.0 iconv m mariadb
SITES = ${SITE_KDE:=stable/kexi/src/}
EXTRACT_SUFX = .tar.xz
@@ -75,14 +74,17 @@ LIB_DEPENDS = databases/kdb>=3.2.0 \
devel/kf5/kxmlgui \
devel/kproperty>=3.2.0 \
devel/kreport>=3.2.0 \
- databases/mariadb \
- x11/qt5/qtwebkit
+ databases/mariadb
CONFIGURE_ARGS = -DBUILD_TESTING=On \
-DBUILD_EXAMPLES=On \
-DKEXI_QTGUI_RUNTIME_AVAILABLE=On \
-DKEXI_ENABLE_QTGUI_FOR_TESTS=Off
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=ON
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+
TEST_IS_INTERACTIVE = X11
.include <bsd.port.mk>
diff --git a/databases/kexi/pkg/PLIST b/databases/kexi/pkg/PLIST
index 93ed2fc1ef0..6418760f116 100644
--- a/databases/kexi/pkg/PLIST
+++ b/databases/kexi/pkg/PLIST
@@ -18,7 +18,6 @@ lib/qt5/plugins/kexi/3.2/
lib/qt5/plugins/kexi/3.2/forms/
lib/qt5/plugins/kexi/3.2/forms/widgets/
@so
lib/qt5/plugins/kexi/3.2/forms/widgets/org.kexi-project.form.widgets.main.so
-@so
lib/qt5/plugins/kexi/3.2/forms/widgets/org.kexi-project.form.widgets.web-browser.so
@so lib/qt5/plugins/kexi/3.2/kexi_csvimportexportplugin.so
@so lib/qt5/plugins/kexi/3.2/kexi_formplugin.so
@so lib/qt5/plugins/kexi/3.2/kexi_migrationplugin.so
@@ -80,7 +79,6 @@ share/kexi/3.2/examples/Simple_Database.kexi
share/kexi/3.2/icons/
share/kexi/3.2/icons/kexi_breeze.rcc
share/kexi/3.2/icons/org.kexi-project.form.widgets.main_breeze.rcc
-share/kexi/3.2/icons/org.kexi-project.form.widgets.web-browser_breeze.rcc
share/kexi/3.2/status/
share/kexi/3.2/status/contribution_details.ui
share/kexi/3.2/status/contribution_help.ui
diff --git a/devel/kreport/Makefile b/devel/kreport/Makefile
index 187d796bbe2..5607972e4b1 100644
--- a/devel/kreport/Makefile
+++ b/devel/kreport/Makefile
@@ -2,7 +2,7 @@ COMMENT = framework for generation of reports in multiple
formats
VERSION = 3.2.0
DISTNAME = kreport-${VERSION}
-REVISION = 2
+REVISION = 3
CATEGORIES = devel
@@ -17,11 +17,9 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} KF5ConfigCore KF5ConfigGui KF5CoreAddons
WANTLIB += KF5WidgetsAddons KPropertyCore3 KPropertyWidgets3 Qt5Core
-WANTLIB += Qt5Gui Qt5Network Qt5PrintSupport Qt5Qml Qt5WebKit
-WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5Xml m marblewidget-qt5
-WANTLIB += Qt5Positioning Qt5QmlModels Qt5Quick Qt5WebChannel
-WANTLIB += Qt5WebEngine Qt5WebEngineCore Qt5WebEngineWidgets
-
+WANTLIB += Qt5Gui Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml
+WANTLIB += Qt5QmlModels Qt5Quick Qt5WebChannel Qt5WebEngine Qt5WebEngineCore
+WANTLIB += Qt5WebEngineWidgets Qt5Widgets Qt5Xml m marblewidget-qt5
SITES = ${SITE_KDE:=stable/kreport/src/}}
EXTRACT_SUFX = .tar.xz
@@ -41,11 +39,15 @@ LIB_DEPENDS = devel/kf5/kconfig \
devel/kf5/kwidgetsaddons \
devel/kproperty>=3.2.0 \
x11/kde-applications/marble \
- x11/qt5/qtwebkit
+ x11/qt5/qtwebengine
CONFIGURE_ARGS = -DBUILD_TESTING=Yes \
-DBUILD_EXAMPLES=Yes
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=ON
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+
TEST_IS_INTERACTIVE = X11
.include <bsd.port.mk>
diff --git a/devel/kreport/pkg/PLIST b/devel/kreport/pkg/PLIST
index 75f1867ae75..44bb46c0219 100644
--- a/devel/kreport/pkg/PLIST
+++ b/devel/kreport/pkg/PLIST
@@ -79,17 +79,14 @@ lib/cmake/KReport3/KReportTargets.cmake
@lib lib/libKReport3.so.${LIBKReport3_VERSION}
lib/pkgconfig/KReport3.pc
lib/qt5/plugins/kreport3/
-lib/qt5/plugins/kreport3/org.kde.kreport.barcode.so
-lib/qt5/plugins/kreport3/org.kde.kreport.maps.so
-lib/qt5/plugins/kreport3/org.kde.kreport.web.so
+@so lib/qt5/plugins/kreport3/org.kde.kreport.barcode.so
+@so lib/qt5/plugins/kreport3/org.kde.kreport.maps.so
share/kf5/mkspecs/qt_KReport3.pri
share/kreport3/
share/kreport3/icons/
share/kreport3/icons/kreport_breeze.rcc
share/kreport3/icons/org.kde.kreport.barcode_breeze.rcc
share/kreport3/icons/org.kde.kreport.maps_breeze.rcc
-share/kreport3/icons/org.kde.kreport.web_breeze.rcc
-share/kservicetypes5/
share/kservicetypes5/kreport_elementplugin.desktop
share/locale/af/LC_MESSAGES/kreport_qt.qm
share/locale/ar/LC_MESSAGES/kreport_qt.qm
