cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdevelop: move from QtWebKit to QtWebEngine

Browse Source 
Also, remove the ports-gcc fix because no gcc archs can and will use
QtWebEngine (it's x86 and arm64 only)

OK rsadowski@ (maintainer)
This commit is contained in:
cwen 2020-07-01 22:24:08 +00:00
parent aad3ca9995
commit 1bef606716
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devel/kdevelop/Makefile
View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.37 2020/06/03 05:20:54 rsadowski Exp $
# $OpenBSD: Makefile,v 1.38 2020/07/01 22:24:08 cwen Exp $
# Qt5Webkit
# Qt5WebEngine
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 KF5WidgetsAddons KF5WindowSystem KF5XmlGui
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

17
devel/kdevelop/patches/patch-plugins_welcomepage_CMakeLists_txt
View File

@ -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()