Hi,
The below diff moves KDevelop from QtWebKit to QtWebEngine (x86 + arm64
only), this change implies 2 things:
- it can't be built on !QtWebEngine archs, so remove the ports-gcc fix
because no gcc archs can and will use QtWebEngine
- re-enable QtWebEngine detection in the port Makefile; since it takes
precedence over QtWebKit we don't need to disable it
And as a consequence clang-tools-extra has no consumers anymore on
!QtWebEngine archs, since qt-creator already moved to QtWebEngine:
$ show-reverse-deps devel/clang-tools-extra
devel/kdevelop
devel/kdevelop,
devel/qt-creator
As such, i'm proposing to not build clang-tools-extra on macppc, to
reduce wasted time. It saves 25 build hours (almost the same as
lang/gcc/8 for comparison), on top of the 10 hours needed to build
KDevelop!
As far as testing goes, build/install/testing have been run in an empty
amd64 chroot for good measure.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/kdevelop/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- Makefile 3 Jun 2020 05:20:54 -0000 1.37
+++ Makefile 1 Jul 2020 17:00:30 -0000
@@ -6,6 +6,7 @@ USE_WXNEEDED = Yes
COMMENT = IDE for C, C++, Python, QML/JavaScript and PHP
VERSION = 5.5.2
+REVISION= 0
DISTNAME = kdevelop-${VERSION}
HOMEPAGE = https://www.kdevelop.org/
@@ -44,10 +45,11 @@ WANTLIB += KF5ThreadWeaver KF5WidgetsAdd
WANTLIB += Kasten4Controllers Kasten4Core Kasten4Gui Kasten4Okteta2Controllers
WANTLIB += Kasten4Okteta2Core Kasten4Okteta2Gui Okteta3Core Okteta3Gui
WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Help Qt5Network
-WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Sql Qt5Test Qt5WebKit
-WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5Xml apr-1 aprutil-1
-WANTLIB += c clang komparediff2 m svn_client-1 svn_fs-1 svn_ra-1
-WANTLIB += svn_repos-1 svn_subr-1 svn_wc-1
+WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
+WANTLIB += Qt5Sql Qt5Test Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
+WANTLIB += Qt5Widgets Qt5Xml apr-1 aprutil-1 c clang komparediff2
+WANTLIB += m svn_client-1 svn_fs-1 svn_ra-1 svn_repos-1 svn_subr-1
+WANTLIB += svn_wc-1
MASTER_SITES = ${MASTER_SITE_KDE:=stable/kdevelop/${VERSION}/src/}
@@ -103,9 +105,7 @@ LIB_DEPENDS = devel/kf5/kconfig \
x11/kde-applications/libkomparediff2 \
x11/kde-applications/okteta>=0.26.1v0 \
x11/qt5/qttools \
- x11/qt5/qtwebkit
-
-CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=ON
+ x11/qt5/qtwebengine
TEST_IS_INTERACTIVE = X11
Index: patches/patch-plugins_welcomepage_CMakeLists_txt
===================================================================
RCS file: patches/patch-plugins_welcomepage_CMakeLists_txt
diff -N patches/patch-plugins_welcomepage_CMakeLists_txt
--- patches/patch-plugins_welcomepage_CMakeLists_txt 15 Nov 2019 14:30:20
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-plugins_welcomepage_CMakeLists_txt,v 1.1 2019/11/15 14:30:20
cwen Exp $
-
-Drop useless fix used for gcc-5, because it breaks the build with
-ports-gcc>=8.3.0.
-
-Index: plugins/welcomepage/CMakeLists.txt
---- plugins/welcomepage/CMakeLists.txt.orig
-+++ plugins/welcomepage/CMakeLists.txt
-@@ -28,8 +28,3 @@ target_link_libraries(kdevwelcomepage
- Qt5::QuickWidgets
- KF5::Declarative
- )
--# see https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
--if (UNIX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-- message(WARNING "Applying workaround for
https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899";)
-- target_link_libraries(kdevwelcomepage gcc_s gcc)
--endif()
