On Sun Jul 13, 2025 at 10:32:53AM +0200, Rafael Sadowski wrote: > Simple diff to get rid of Qt5WebEngine. Inspired by FreebSD I > decided to disable the built-in facebook, user manual and printing > support. > > If anyone absolutely needs it, please speak now. > > Cheers Rafael >
This is based on the new version. I already got the OK from kn@, but forgot to commit it. It seems that Kristaps Dzonsons is using it. Kristaps, is that OK with you? Rafael diff --git a/misc/subsurface/Makefile b/misc/subsurface/Makefile index 93ad5e02275..9f8d8dc52d0 100644 --- a/misc/subsurface/Makefile +++ b/misc/subsurface/Makefile @@ -4,6 +4,7 @@ PKGNAME = subsurface-6.0.5459 DIST_TUPLE += github subsurface subsurface e0fbda77ef203a5a2539465e9fa44df56e2f5a9e . DIST_TUPLE += github subsurface libdc 64ecef5b3ee7342159349391c8b55281bebad2c2 libdivecomputer DIST_TUPLE += github subsurface googlemaps 7ce7124b385b2ebac0f72c38b094f436d4fe5c58 gmaps +REVISION = 0 CATEGORIES = misc HOMEPAGE = https://subsurface-divelog.org @@ -11,15 +12,11 @@ HOMEPAGE = https://subsurface-divelog.org # GPLv2, LGPLv2.1 for libdivecomputer, MIT for googlemaps PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} -WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Location Qt5Network -WANTLIB += Qt5Positioning Qt5PositioningQuick Qt5Qml Qt5QmlModels -WANTLIB += Qt5Quick Qt5QuickWidgets Qt5Svg Qt5Widgets c crypto -WANTLIB += git2 lcms2 m raw_r sqlite3 ssh2 ssl usb-1.0 xml2 xslt -WANTLIB += zip - -# presumably dlopen()'d? -WANTLIB += Qt5WebKit Qt5WebKitWidgets +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Gui +WANTLIB += Qt5Location Qt5Network Qt5Positioning Qt5PositioningQuick +WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets Qt5Svg +WANTLIB += Qt5Widgets c crypto git2 lcms2 m mtp raw_r sqlite3 +WANTLIB += ssh2 ssl usb-1.0 xml2 xslt zip USE_GMAKE = Yes @@ -40,6 +37,7 @@ LIB_DEPENDS = archivers/libzip \ databases/sqlite3 \ devel/libgit2/libgit2 \ devel/libusb1 \ + devel/libmtp \ graphics/lcms2 \ graphics/libraw \ security/libssh2 \ @@ -49,18 +47,23 @@ LIB_DEPENDS = archivers/libzip \ x11/qt5/qtdeclarative \ x11/qt5/qtlocation \ x11/qt5/qtsvg \ - x11/qt5/qtwebkit \ x11/qt5/qtlocation RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+4,-guic -CONFIGURE_ARGS += -DBTSUPPORT:Bool=OFF -CONFIGURE_ARGS += -DLIBGIT2_FROM_PKGCONFIG:Bool=ON -CONFIGURE_ARGS += -DNO_USERMANUAL:Bool=ON + +# Disable the built-in facebook, user manual and printing support which require +# qt5-webkit/qt5-webengine +CONFIGURE_ARGS += -DNO_DOCS=ON \ + -DUSE_WEBENGINE=OFF \ + -DFBSUPPORT=OFF \ + -DBTSUPPORT=OFF \ + -DNO_PRINTING=ON \ + -DNO_USERMANUAL=ON + +CONFIGURE_ARGS += -DLIBGIT2_FROM_PKGCONFIG=ON CONFIGURE_ARGS += -DWRKINST=${WRKINST} -CONFIGURE_ARGS += -DUSE_WEBENGINE:Bool=OFF -CONFIGURE_ARGS += -DNO_PRINTING:Bool=ON # It's possible to run the tests, but they fail. # First, add the subsurface/large-anonymous-sample-data repo to DISTFILES.
