Re: Remove: x11/qt5/qtwebkit preparations
On 2024/02/15 14:20, Theo Buehler wrote: > On Thu, Feb 15, 2024 at 12:42:44PM +, Klemens Nanni wrote: > > On Thu, Feb 15, 2024 at 01:37:17PM +0100, Theo Buehler wrote: > > > Even if you nuke this port, could you try to get a backtrace? SIGILL > > > might be an IBT issue we need to track down. > > > > Core was generated by `QSyncthingTray'. > > Program terminated with signal SIGILL, Illegal instruction. > > #0 0x0a91ec9cd860 in ?? () > > [Current thread is 1 (process 609315)] > > #0 0x0a91ec9cd860 in ?? () > > #1 0x0a9135f203df in vmEntryToJavaScript () from > > /usr/local/lib/libJavaScriptCore.so.0.0 > > #2 0x0a9135eb6c8e in JSC::JITCode::execute(JSC::VM*, > > JSC::ProtoCallFrame*) () from /usr/local/lib/libJavaScriptCore.so.0.0 > > This does smell a bit like 'NOBTCFI = Yes' could "fix" this... > > If I understood correctly, we need to keep x11/qt5/qtwebkit for the time > being, so someone with IBT hw should probably hunt this down. This might > be a starting point: > > https://github.com/WebKit/Webkit/blob/main/Source/JavaScriptCore/llint/LowLevelInterpreter.asm FWIW ports using it via py-qt5 should be happy, because lang/python has USE_NOBTCFI=Yes (for this exact reason). > More importantly, is there a qt6 equivalent of this code that people > could keep hitting for a longer time? Qt6 only has qtwebengine (mostly chromium, using a similar set of patches as www/chromium), no qtwebkit there.
Re: Remove: x11/qt5/qtwebkit preparations
On Thu, Feb 15, 2024 at 12:42:44PM +, Klemens Nanni wrote: > On Thu, Feb 15, 2024 at 01:37:17PM +0100, Theo Buehler wrote: > > Even if you nuke this port, could you try to get a backtrace? SIGILL > > might be an IBT issue we need to track down. > > Core was generated by `QSyncthingTray'. > Program terminated with signal SIGILL, Illegal instruction. > #0 0x0a91ec9cd860 in ?? () > [Current thread is 1 (process 609315)] > #0 0x0a91ec9cd860 in ?? () > #1 0x0a9135f203df in vmEntryToJavaScript () from > /usr/local/lib/libJavaScriptCore.so.0.0 > #2 0x0a9135eb6c8e in JSC::JITCode::execute(JSC::VM*, > JSC::ProtoCallFrame*) () from /usr/local/lib/libJavaScriptCore.so.0.0 This does smell a bit like 'NOBTCFI = Yes' could "fix" this... If I understood correctly, we need to keep x11/qt5/qtwebkit for the time being, so someone with IBT hw should probably hunt this down. This might be a starting point: https://github.com/WebKit/Webkit/blob/main/Source/JavaScriptCore/llint/LowLevelInterpreter.asm More importantly, is there a qt6 equivalent of this code that people could keep hitting for a longer time?
Re: Remove: x11/qt5/qtwebkit preparations
On Thu, Feb 15, 2024 at 01:37:17PM +0100, Theo Buehler wrote: > Even if you nuke this port, could you try to get a backtrace? SIGILL > might be an IBT issue we need to track down. Core was generated by `QSyncthingTray'. Program terminated with signal SIGILL, Illegal instruction. #0 0x0a91ec9cd860 in ?? () [Current thread is 1 (process 609315)] #0 0x0a91ec9cd860 in ?? () #1 0x0a9135f203df in vmEntryToJavaScript () from /usr/local/lib/libJavaScriptCore.so.0.0 #2 0x0a9135eb6c8e in JSC::JITCode::execute(JSC::VM*, JSC::ProtoCallFrame*) () from /usr/local/lib/libJavaScriptCore.so.0.0 #3 0x0a9135e9055f in JSC::Interpreter::execute(JSC::ProgramExecutable*, JSC::ExecState*, JSC::JSObject*) () from /usr/local/lib/libJavaScriptCore.so.0.0 #4 0x0a9136039f09 in JSC::evaluate(JSC::ExecState*, JSC::SourceCode const&, JSC::JSValue, WTF::NakedPtr&) () from /usr/local/lib/libJavaScriptCore.so.0.0 #5 0x0a91ce58a9e4 in WebCore::ScriptController::evaluateInWorld(WebCore::ScriptSourceCode const&, WebCore::DOMWrapperWorld&, WebCore::ExceptionDetails*) () from /usr/local/lib/libWebCore.so.1.0 #6 0x0a91ce58ac35 in WebCore::ScriptController::evaluate(WebCore::ScriptSourceCode const&, WebCore::ExceptionDetails*) () from /usr/local/lib/libWebCore.so.1.0 #7 0x0a91ce2b81ba in WebCore::ScriptElement::executeScript(WebCore::ScriptSourceCode const&) () from /usr/local/lib/libWebCore.so.1.0 #8 0x0a91ce66026a in WebCore::HTMLScriptRunner::executePendingScriptAndDispatchEvent(WebCore::PendingScript&) () from /usr/local/lib/libWebCore.so.1.0 #9 0x0a91ce660a89 in WebCore::HTMLScriptRunner::executeParsingBlockingScripts() () from /usr/local/lib/libWebCore.so.1.0 #10 0x0a91ce6551a4 in WebCore::HTMLDocumentParser::executeScriptsWaitingForStylesheets() () from /usr/local/lib/libWebCore.so.1.0 #11 0x0a91ce2367f4 in WebCore::Document::didRemoveAllPendingStylesheet() () from /usr/local/lib/libWebCore.so.1.0 #12 0x0a91ce12516c in WebCore::HTMLLinkElement::sheetLoaded() () from /usr/local/lib/libWebCore.so.1.0 #13 0x0a91ce3aeecb in WebCore::StyleSheetContents::checkLoaded() () from /usr/local/lib/libWebCore.so.1.0 #14 0x0a91ce3ae86c in WebCore::StyleRuleImport::setCSSStyleSheet(WTF::String const&, WebCore::URL const&, WTF::String const&, WebCore::CachedCSSStyleSheet const*) () from /usr/local/lib/libWebCore.so.1.0 #15 0x0a91ce6e837d in WebCore::CachedCSSStyleSheet::checkNotify() () from /usr/local/lib/libWebCore.so.1.0 #16 0x0a91ce6e825f in WebCore::CachedCSSStyleSheet::finishLoading(WebCore::SharedBuffer*) () from /usr/local/lib/libWebCore.so.1.0 #17 0x0a91ce6db0b8 in WebCore::SubresourceLoader::didFinishLoading(double) () from /usr/local/lib/libWebCore.so.1.0 #18 0x0a91ce9b78a6 in WebCore::QNetworkReplyHandler::finish() () from /usr/local/lib/libWebCore.so.1.0 #19 0x0a91ce9b64fb in WebCore::QNetworkReplyHandlerCallQueue::flush() () from /usr/local/lib/libWebCore.so.1.0 #20 0x0a90e94f9be2 in void doActivate(QObject*, int, void**) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #21 0x0a90e94f150a in QMetaObject::activate(QObject*, QMetaObject const*, int, void**) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #22 0x0a9177b69fd3 in QNetworkReply::finished() () from /usr/local/lib/qt5/./libQt5Network.so.4.0 #23 0x0a9177a93c38 in QNetworkReplyHttpImplPrivate::finished() () from /usr/local/lib/qt5/./libQt5Network.so.4.0 #24 0x0a9177a9aac0 in QNetworkReplyHttpImplPrivate::replyFinished() () from /usr/local/lib/qt5/./libQt5Network.so.4.0 #25 0x0a9177b6fa14 in QNetworkReplyHttpImpl::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) () from /usr/local/lib/qt5/./libQt5Network.so.4.0 #26 0x0a90e94e8067 in QMetaCallEvent::placeMetaCall(QObject*) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #27 0x0a90e94e992e in QObject::event(QEvent*) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #28 0x0a90f6f660ce in QApplicationPrivate::notify_helper(QObject*, QEvent*) () from /usr/local/lib/qt5/./libQt5Widgets.so.4.1 #29 0x0a90f6f67de7 in QApplication::notify(QObject*, QEvent*) () from /usr/local/lib/qt5/./libQt5Widgets.so.4.1 #30 0x0a90e947ef9a in QCoreApplication::notifyInternal2(QObject*, QEvent*) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #31 0x0a90e947fc7d in QCoreApplication::sendEvent(QObject*, QEvent*) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #32 0x0a90e94809d4 in QCoreApplicationPrivate::sendPostedEvents(QObject*, int, QThreadData*) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #33 0x0a90e947fb3e in QCoreApplication::sendPostedEvents(QObject*, int) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #34 0x0a90e955aa0c in postEventSourceDispatch(_GSource*, int (*)(void*), void*) () from /usr/local/lib/qt5/./libQt5Core.so.5.0 #35 0x0a91474cf25d in g_main_dispatch (context=0xa91d12f6580) at ../glib-2.78.4/glib/gmain.c:3476 #36
Re: Remove: x11/qt5/qtwebkit preparations
On Thu, Feb 15, 2024 at 12:29:00PM +, Klemens Nanni wrote: > On Mon, Feb 05, 2024 at 05:07:09AM +, Klemens Nanni wrote: > > On Sun, Feb 04, 2024 at 08:50:27PM +, Edd Barrett wrote: > > > On Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: > > > > - net/qsyncthingtray: dead upstream? > > > > > > Looks very dead to me. Feel free to kill it. > > > > ATT: NO LONGER ACTIVELY MAINTAINED, NEEDS NEW OWNER || A OS X / Windows / > > Linux Tray App for Syncthing written in C++ > > > > The webinterface works great, little is lost here, imho. > > OK kn > > It doesn't even work for me. Clicking the tray briefly opens a window > that is empty, but supposed to show the synchting web interface, then > it dies: > > $ QSyncthingTray > QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-kn' > Illegal instruction (core dumped) Even if you nuke this port, could you try to get a backtrace? SIGILL might be an IBT issue we need to track down.
Re: Remove: x11/qt5/qtwebkit preparations
On Mon, Feb 05, 2024 at 05:07:09AM +, Klemens Nanni wrote: > On Sun, Feb 04, 2024 at 08:50:27PM +, Edd Barrett wrote: > > On Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: > > > - net/qsyncthingtray: dead upstream? > > > > Looks very dead to me. Feel free to kill it. > > ATT: NO LONGER ACTIVELY MAINTAINED, NEEDS NEW OWNER || A OS X / Windows / > Linux Tray App for Syncthing written in C++ > > The webinterface works great, little is lost here, imho. > OK kn It doesn't even work for me. Clicking the tray briefly opens a window that is empty, but supposed to show the synchting web interface, then it dies: $ QSyncthingTray QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-kn' Illegal instruction (core dumped) If I stop syncthing and/or tell QSyncthingTray not to start it, the empty window remains and it does not crash... I'll remove the port.
Re: Remove: x11/qt5/qtwebkit preparations
On 2/4/24 08:25, Rafael Sadowski wrote: Hi ports@, hi ports hackers, I would like to get rid of 'x11/qt5/qtwebkit'. Here is a short list with ports using qtwebkit with some comments. All $MAINTAINER CC'd. - geo/qgis: I can't imagine that such an active project would still use it. - x11/py-qt5: Easy to remove - x11/qt5/docs: Easy to remove - x11/qt5/qttools: Easy to remove - x11/smtube: Upstream dead? Nobody package is anymore: https://repology.org/project/smtube/versions looks dead but I pinged the author for a final confirmation, if I don't get any feedback soon I will kill it. - devel/zeal: I have an WIP update. - www/ruby-capybara-webkit: Sent to ports for removal - textproc/goldendict: I know, there is an issue with qt6 goldendict. I think that is the same issue as it is in zeal. - databases/recoll: Needs an update, upstream switched to qt5-webengine - productivity/libalkimia: Needs an update, upstream switched to qt5-webengine - databases/kexi: On my list, remove the dependency - devel/kreport: On my list, remove the dependency - multimedia/upplay: Needs an update, ping maintainer - net/qsyncthingtray: dead upstream? - misc/subsurface: dead upstream? - meta/qt5: On my list - mail/trojita: Already removed I would be delighted if the maintainers could take a look at this. Grateful for any support! Rafael
Re: Remove: x11/qt5/qtwebkit preparations
On Sun Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: > Hi ports@, hi ports hackers, > > I would like to get rid of 'x11/qt5/qtwebkit'. Here is a short list with > ports using qtwebkit with some comments. All $MAINTAINER CC'd. > > - geo/qgis: I can't imagine that such an active project would still use it. > - x11/qt5/qttools: Easy to remove OK to remove qwebview? I doubt that anyone uses it for WYSIWYG development ;) Index: Makefile === RCS file: /cvs/ports/x11/qt5/qttools/Makefile,v diff -u -p -r1.21 Makefile --- Makefile18 Dec 2023 12:37:10 - 1.21 +++ Makefile11 Feb 2024 19:21:05 - @@ -1,8 +1,6 @@ QT5NAME = QtTools COMMENT-main = Qt development tools -COMMENT-webview = Webkit-based Qt Designer plugin -PKGNAME-webview = qwebview-${QT5_KDE_VERSION} REVISION = 0 KDE_COMMIT = 16d0a9944bbd4a05edfb364bc5c28f19533a7449 @@ -10,7 +8,7 @@ KDE_VERSION = 4 DPB_PROPERTIES = parallel -MULTI_PACKAGES = -main -examples -webview +MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5Designer 3.1 # 5.9 SHARED_LIBS += Qt5DesignerComponents 3.0 # 5.9 @@ -21,9 +19,6 @@ WANTLIB-main += Qt5PrintSupport Qt5Qml Q WANTLIB-main += Qt5Sql Qt5Widgets Qt5Xml c m WANTLIB-main += llvm${MODCLANG_VERSION}/lib/clang -WANTLIB-webview += ${COMPILER_LIBCXX} GL Qt5Core Qt5Designer Qt5Gui Qt5Network -WANTLIB-webview += Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml m - # avoid BDEP on ourselves MODQT5_DEPS = No @@ -38,13 +33,9 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \ ${MODCLANG_LIB_DEPENDS} \ x11/qt5/qtdeclarative>=${QT5_VERSION:R},<${QT5_NEXT_VERSION} -LIB_DEPENDS-webview = ${LIB_DEPENDS} \ - ${BUILD_PKGPATH}>=${QT5_VERSION},<${QT5_NEXT_VERSION} \ - x11/qt5/qtwebkit - FLAVORS = debug -PSEUDO_FLAVORS = bootstrap no_examples no_webview -FLAVOR ?= bootstrap no_examples no_webview +PSEUDO_FLAVORS = bootstrap no_examples +FLAVOR ?= bootstrap no_examples CONFIGURE_ENV = LLVM_INSTALL_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION} @@ -52,11 +43,5 @@ CONFIGURE_ENV = LLVM_INSTALL_DIR=${LOCA pre-configure: ${QT5_GEN_INCLUDES} - -.if !${BUILD_PACKAGES:M-webview} -post-configure: - perl -pi -e 's/^qtHaveModule.*webkitwidgets/\# $$&/' \ - ${WRKSRC}/src/designer/src/plugins/plugins.pro -.endif .include Index: pkg/DESCR-webview === RCS file: pkg/DESCR-webview diff -N pkg/DESCR-webview --- pkg/DESCR-webview 25 Dec 2016 14:13:14 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1 +0,0 @@ -Webkit plugin for Qt Designer. Index: pkg/PLIST-webview === RCS file: pkg/PLIST-webview diff -N pkg/PLIST-webview --- pkg/PLIST-webview 11 Mar 2022 20:17:03 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,2 +0,0 @@ -lib/qt5/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake -@so lib/qt5/plugins/designer/libqwebview.so
Re: Remove: x11/qt5/qtwebkit preparations
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 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 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
Re: Remove: x11/qt5/qtwebkit preparations
On Mon, February 5, 2024 22:52, Rafael Sadowski wrote: > On Sun Feb 04, 2024 at 02:30:16PM +, Klemens Nanni wrote: >> On Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: >> > - misc/subsurface: dead upstream? Hi! No, upstream is quite active but they stopped shipping releases the way it was before and have switched to CI/CD night builds in 2020: https://github.com/subsurface/nightly-builds/releases https://subsurface-divelog.org/current-release/?lang=en Most distributions freezed their packages on 5.0.10: https://repology.org/project/subsurface/versions which is the latest tag on github before ci/cd approach. >> >> Builds and runs, haven't tested extensively. > > Nice, thanks Klemens for investing your time in this port. I would say we > won't here anything from the $MAINTAINER when I look at the ports logs. > Please remove $MAINTAINER, it's the second timeout in a long time. > > OK rsadowski > >> >> Index: Makefile >> === >> RCS file: /cvs/ports/misc/subsurface/Makefile,v >> diff -u -p -r1.15 Makefile >> --- Makefile 27 Sep 2023 09:52:13 - 1.15 >> +++ Makefile 4 Feb 2024 14:26:41 - >> @@ -1,10 +1,7 @@ >> -# Qt5Webkit >> -USE_WXNEEDED = Yes >> - >> COMMENT = divelog program for recreational, tech, and free-divers >> >> VER = 4.8.5 >> -REVISION = 4 >> +REVISION = 5 >> PKGNAME = subsurface-${VER} >> DISTNAME = Subsurface-${VER} >> >> @@ -18,10 +15,10 @@ PERMIT_PACKAGE = Yes >> >> WANTLIB += ${COMPILER_LIBCXX} Grantlee_Templates Qt5Concurrent >> WANTLIB += Qt5Core Qt5Gui Qt5Location Qt5Network Qt5Positioning >> -WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Svg >> -WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets c crypto curl >> -WANTLIB += git2 m sqlite3 ssh2 ssl usb-1.0 xml2 xslt zip >> -WANTLIB += Qt5PositioningQuick Qt5QmlModels >> +WANTLIB += Qt5PositioningQuick Qt5PrintSupport Qt5Qml Qt5QmlModels >> +WANTLIB += Qt5Quick Qt5QuickWidgets Qt5Svg Qt5WebChannel Qt5WebEngineCore >> +WANTLIB += Qt5WebEngineWidgets Qt5Widgets c crypto curl git2 m >> +WANTLIB += sqlite3 ssh2 ssl usb-1.0 xml2 xslt zip >> >> SITES = https://subsurface-divelog.org/downloads/ >> EXTRACT_SUFX = .tgz >> @@ -50,11 +47,12 @@ LIB_DEPENDS =archivers/libzip \ >> x11/grantlee-qt5 \ >> x11/qt5/qtbase \ >> x11/qt5/qtsvg \ >> -x11/qt5/qtwebkit >> +x11/qt5/qtwebengine >> >> USE_GMAKE = Yes >> >> CONFIGURE_ARGS += -DNO_DOCS:Bool=ON \ >> +-DUSE_WEBENGINE=ON \ >> -DBTSUPPORT:Bool=OFF >> >> # many "undefined reference to `dc_*" when tests are enabled >> > >
Re: Remove: x11/qt5/qtwebkit preparations
On Sun Feb 04, 2024 at 02:30:16PM +, Klemens Nanni wrote: > On Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: > > - misc/subsurface: dead upstream? > > Builds and runs, haven't tested extensively. Nice, thanks Klemens for investing your time in this port. I would say we won't here anything from the $MAINTAINER when I look at the ports logs. Please remove $MAINTAINER, it's the second timeout in a long time. OK rsadowski > > Index: Makefile > === > RCS file: /cvs/ports/misc/subsurface/Makefile,v > diff -u -p -r1.15 Makefile > --- Makefile 27 Sep 2023 09:52:13 - 1.15 > +++ Makefile 4 Feb 2024 14:26:41 - > @@ -1,10 +1,7 @@ > -# Qt5Webkit > -USE_WXNEEDED = Yes > - > COMMENT =divelog program for recreational, tech, and free-divers > > VER =4.8.5 > -REVISION = 4 > +REVISION = 5 > PKGNAME =subsurface-${VER} > DISTNAME = Subsurface-${VER} > > @@ -18,10 +15,10 @@ PERMIT_PACKAGE = Yes > > WANTLIB += ${COMPILER_LIBCXX} Grantlee_Templates Qt5Concurrent > WANTLIB += Qt5Core Qt5Gui Qt5Location Qt5Network Qt5Positioning > -WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Svg > -WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets c crypto curl > -WANTLIB += git2 m sqlite3 ssh2 ssl usb-1.0 xml2 xslt zip > -WANTLIB += Qt5PositioningQuick Qt5QmlModels > +WANTLIB += Qt5PositioningQuick Qt5PrintSupport Qt5Qml Qt5QmlModels > +WANTLIB += Qt5Quick Qt5QuickWidgets Qt5Svg Qt5WebChannel Qt5WebEngineCore > +WANTLIB += Qt5WebEngineWidgets Qt5Widgets c crypto curl git2 m > +WANTLIB += sqlite3 ssh2 ssl usb-1.0 xml2 xslt zip > > SITES = https://subsurface-divelog.org/downloads/ > EXTRACT_SUFX = .tgz > @@ -50,11 +47,12 @@ LIB_DEPENDS = archivers/libzip \ > x11/grantlee-qt5 \ > x11/qt5/qtbase \ > x11/qt5/qtsvg \ > - x11/qt5/qtwebkit > + x11/qt5/qtwebengine > > USE_GMAKE = Yes > > CONFIGURE_ARGS +=-DNO_DOCS:Bool=ON \ > + -DUSE_WEBENGINE=ON \ > -DBTSUPPORT:Bool=OFF > > # many "undefined reference to `dc_*" when tests are enabled >
Re: Remove: x11/qt5/qtwebkit preparations
On Sun, Feb 04, 2024 at 08:50:27PM +, Edd Barrett wrote: > On Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: > > - net/qsyncthingtray: dead upstream? > > Looks very dead to me. Feel free to kill it. ATT: NO LONGER ACTIVELY MAINTAINED, NEEDS NEW OWNER || A OS X / Windows / Linux Tray App for Syncthing written in C++ The webinterface works great, little is lost here, imho. OK kn
Re: Remove: x11/qt5/qtwebkit preparations
On Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: > - net/qsyncthingtray: dead upstream? Looks very dead to me. Feel free to kill it. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: Remove: x11/qt5/qtwebkit preparations
On Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: > - misc/subsurface: dead upstream? Builds and runs, haven't tested extensively. Index: Makefile === RCS file: /cvs/ports/misc/subsurface/Makefile,v diff -u -p -r1.15 Makefile --- Makefile27 Sep 2023 09:52:13 - 1.15 +++ Makefile4 Feb 2024 14:26:41 - @@ -1,10 +1,7 @@ -# Qt5Webkit -USE_WXNEEDED = Yes - COMMENT = divelog program for recreational, tech, and free-divers VER = 4.8.5 -REVISION = 4 +REVISION = 5 PKGNAME = subsurface-${VER} DISTNAME = Subsurface-${VER} @@ -18,10 +15,10 @@ PERMIT_PACKAGE =Yes WANTLIB += ${COMPILER_LIBCXX} Grantlee_Templates Qt5Concurrent WANTLIB += Qt5Core Qt5Gui Qt5Location Qt5Network Qt5Positioning -WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Svg -WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets c crypto curl -WANTLIB += git2 m sqlite3 ssh2 ssl usb-1.0 xml2 xslt zip -WANTLIB += Qt5PositioningQuick Qt5QmlModels +WANTLIB += Qt5PositioningQuick Qt5PrintSupport Qt5Qml Qt5QmlModels +WANTLIB += Qt5Quick Qt5QuickWidgets Qt5Svg Qt5WebChannel Qt5WebEngineCore +WANTLIB += Qt5WebEngineWidgets Qt5Widgets c crypto curl git2 m +WANTLIB += sqlite3 ssh2 ssl usb-1.0 xml2 xslt zip SITES =https://subsurface-divelog.org/downloads/ EXTRACT_SUFX = .tgz @@ -50,11 +47,12 @@ LIB_DEPENDS = archivers/libzip \ x11/grantlee-qt5 \ x11/qt5/qtbase \ x11/qt5/qtsvg \ - x11/qt5/qtwebkit + x11/qt5/qtwebengine USE_GMAKE =Yes CONFIGURE_ARGS += -DNO_DOCS:Bool=ON \ + -DUSE_WEBENGINE=ON \ -DBTSUPPORT:Bool=OFF # many "undefined reference to `dc_*" when tests are enabled
Re: Remove: x11/qt5/qtwebkit preparations
On 2024/02/04 08:25, Rafael Sadowski wrote: > Hi ports@, hi ports hackers, > > I would like to get rid of 'x11/qt5/qtwebkit'. Here is a short list with > ports using qtwebkit with some comments. All $MAINTAINER CC'd. > ... > - misc/subsurface: dead upstream? not dead. 'Current "Weekly" Release: 6.0.5082 2024-02-03'
Re: Remove: x11/qt5/qtwebkit preparations
On 2024/02/04 08:25, Rafael Sadowski wrote: > - databases/recoll: Needs an update, upstream switched to qt5-webengine recoll already uses qtwebengine on arch where qtwebengine is available (amd64, aarch64, i386)
Re: Remove: x11/qt5/qtwebkit preparations
On Sun Feb 04, 2024 at 09:37:33AM +0100, Landry Breuil wrote: > Le Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski a écrit : > > Hi ports@, hi ports hackers, > > > > I would like to get rid of 'x11/qt5/qtwebkit'. Here is a short list with > > ports using qtwebkit with some comments. All $MAINTAINER CC'd. > > > > - geo/qgis: I can't imagine that such an active project would still use it. > > i'll have a look, from https://github.com/qgis/QGIS/issues/54965 there's > a will to port it to qtwebengine but lacks features ? apparently there's > a WITH_QTWEBKIT cmake flag, i'll see what happens. > Thanks > either way, i can't drop the dep right now because py-qt5 depends on it > :) > > $doas pkg_delete qtwebkit > can't delete qtwebkit-5.212.0alpha4p9v0 without deleting py3-qt5-5.15.9p1 > If it would be easy it would be Linux.
Re: Remove: x11/qt5/qtwebkit preparations
Le Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski a écrit : > Hi ports@, hi ports hackers, > > I would like to get rid of 'x11/qt5/qtwebkit'. Here is a short list with > ports using qtwebkit with some comments. All $MAINTAINER CC'd. > > - geo/qgis: I can't imagine that such an active project would still use it. i'll have a look, from https://github.com/qgis/QGIS/issues/54965 there's a will to port it to qtwebengine but lacks features ? apparently there's a WITH_QTWEBKIT cmake flag, i'll see what happens. either way, i can't drop the dep right now because py-qt5 depends on it :) $doas pkg_delete qtwebkit can't delete qtwebkit-5.212.0alpha4p9v0 without deleting py3-qt5-5.15.9p1