Hi ports! To work with upstream for a better OpenBSD support I would like to remove our deep openbsd hacks in the cmake base-system.
This diff removes the webkit/webengine-wxneeded hack in cmComputeLinkInformation.cxx. I added USE_WXNEEDED=Yes in all ports with Qt5WebKit and Qt5WebEngine*. Because the hack handles all "webkit" entries, do we need USE_WXNEEDED in all other ports where there is a "webkit"? What are they? www/webkitgtk4? Feedback? Rafael diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index cd48c4340ee..5246288010f 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.77 2022/02/07 16:11:53 sthen Exp $ +USE_WXNEEDED= Yes + COMMENT= free open source planetarium GH_TAGNAME= v0.21.3 diff --git a/databases/recoll/Makefile b/databases/recoll/Makefile index f32b123ba1a..413dfa47e5c 100644 --- a/databases/recoll/Makefile +++ b/databases/recoll/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.16 2021/11/26 09:04:57 sthen Exp $ +USE_WXNEEDED= Yes + COMMENT-main= full text search application COMMENT-gui= X user interface to recoll diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 4039243349a..da71c275899 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -8,7 +8,7 @@ VER = 3.20.3 EPOCH = 0 DISTNAME = cmake-${VER} CATEGORIES = devel -REVISION = 2 +REVISION = 3 HOMEPAGE = https://www.cmake.org/ diff --git a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx index 42a93134dec..3df3faab26b 100644 --- a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx +++ b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx @@ -13,33 +13,7 @@ Index: Source/cmComputeLinkInformation.cxx this->OrderRuntimeSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs); if (this->OrderDependentRPath) { this->OrderDependentRPath->SetImplicitDirectories(this->ImplicitLinkDirs); -@@ -488,6 +489,7 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() c - - bool cmComputeLinkInformation::Compute() - { -+ bool use_wxneeded = false; - // Skip targets that do not link. - if (!(this->Target->GetType() == cmStateEnums::EXECUTABLE || - this->Target->GetType() == cmStateEnums::SHARED_LIBRARY || -@@ -514,10 +516,17 @@ bool cmComputeLinkInformation::Compute() - if (linkEntry.IsSharedDep) { - this->AddSharedDepItem(linkEntry.Item, linkEntry.Target); - } else { -+ std::string litem_tolower = linkEntry.Item.Value; -+ transform(litem_tolower.begin(), litem_tolower.end(), litem_tolower.begin(), ::tolower); -+ if (litem_tolower.find("webkit") != std::string::npos || litem_tolower.find("webengine") != std::string::npos) -+ use_wxneeded = true; - this->AddItem(linkEntry.Item, linkEntry.Target); - } - } - -+ if (use_wxneeded == true) -+ this->AddUserItem(std::string("-Wl,-z,wxneeded"), false); -+ - // Restore the target link type so the correct system runtime - // libraries are found. - cmProp lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC"); -@@ -713,10 +722,16 @@ void cmComputeLinkInformation::AddItem(BT<std::string> +@@ -713,10 +714,16 @@ void cmComputeLinkInformation::AddItem(BT<std::string> // This is a directory. this->DropDirectoryItem(item.Value); } else { @@ -59,7 +33,7 @@ Index: Source/cmComputeLinkInformation.cxx } } else { // This is a library or option specified by the user. -@@ -1049,11 +1064,18 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s +@@ -1049,11 +1056,18 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s this->SharedLibrariesLinked.insert(target); } @@ -82,7 +56,7 @@ Index: Source/cmComputeLinkInformation.cxx } // For compatibility with CMake 2.4 include the item's directory in -@@ -1066,6 +1088,27 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s +@@ -1066,6 +1080,27 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s // Now add the full path to the library. this->Items.emplace_back(item, true, target); diff --git a/devel/kf5/kdewebkit/Makefile b/devel/kf5/kdewebkit/Makefile index b9cac69851b..9f5313dd640 100644 --- a/devel/kf5/kdewebkit/Makefile +++ b/devel/kf5/kdewebkit/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.17 2021/10/13 15:02:04 rsadowski Exp $ +USE_WXNEEDED= Yes + COMMENT = integration of the HTML rendering engine WebKit into KDE DISTNAME = kdewebkit-${VERSION} diff --git a/devel/kreport/Makefile b/devel/kreport/Makefile index e4ee6e1e007..ff4b88fb08d 100644 --- a/devel/kreport/Makefile +++ b/devel/kreport/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.9 2021/09/13 06:57:54 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = framework for generation of reports in multiple formats VERSION = 3.2.0 diff --git a/devel/qt-creator/Makefile b/devel/qt-creator/Makefile index c9902825443..4947f43e659 100644 --- a/devel/qt-creator/Makefile +++ b/devel/qt-creator/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.81 2022/01/04 17:14:28 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = cross-platform IDE for use with Qt V = 5.0.3 diff --git a/editors/sigil/Makefile b/editors/sigil/Makefile index 324e1828f70..24a7fa71a03 100644 --- a/editors/sigil/Makefile +++ b/editors/sigil/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.8 2021/11/02 00:01:13 sthen Exp $ +USE_WXNEEDED = Yes + COMMENT = EPUB ebook editor PKGNAME = sigil-${GH_TAGNAME} diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 3c14115007f..05213b3c2ad 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -5,7 +5,7 @@ NOT_FOR_ARCHS = ${BE_ARCHS} BROKEN-i386 = undefined reference to operator delete(void*, std::align_val_t), etc. -USE_WXNEEDED = Yes +USE_WXNEEDED = No COMMENT = nintendo 3DS emulator diff --git a/geo/gpsbabel/Makefile b/geo/gpsbabel/Makefile index 68437012965..7814fa8a6e4 100644 --- a/geo/gpsbabel/Makefile +++ b/geo/gpsbabel/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.38 2021/11/15 07:37:48 rsadowski Exp $ +USE_WXNEEDED= Yes + COMMENT-main= GPS waypoint, track, and route conversion tool COMMENT-tk= Tk front-end to gpsbabel COMMENT-qt= Qt front-end to gpsbabel diff --git a/geo/kgeotag/Makefile b/geo/kgeotag/Makefile index 2bf98b4a1ed..b915a4657ed 100644 --- a/geo/kgeotag/Makefile +++ b/geo/kgeotag/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.1.1.1 2022/01/04 06:28:02 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = stand-alone photo geotagging program V = 1.2.0 diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile index 4805edc6e85..20bf95222db 100644 --- a/geo/qgis/Makefile +++ b/geo/qgis/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.158 2022/01/15 07:47:37 landry Exp $ +USE_WXNEEDED = Yes + BROKEN-sparc64 = undefined reference to QOpenGLExtension_ARB_tessellation_shader::QOpenGLExtension_ARB_tessellation_shader() in libQt53DRender.so.2.0 when linking qgis_3drenderingtest COMMENT = desktop geographical information system diff --git a/geo/qmapshack/Makefile b/geo/qmapshack/Makefile index f1fc3794b3c..4e848a6847e 100644 --- a/geo/qmapshack/Makefile +++ b/geo/qmapshack/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.6 2021/06/10 19:07:11 landry Exp $ +USE_WXNEEDED = Yes + COMMENT = map management tool GH_ACCOUNT = Maproom diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 0c783a854fe..ef4d8c310aa 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.74 2021/12/16 20:58:29 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE digital photo and video management utility V = 7.4.0 diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile index 8e0fdd8a7b5..1323cac1d26 100644 --- a/mail/trojita/Makefile +++ b/mail/trojita/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.35 2021/07/25 09:27:36 cwen Exp $ +USE_WXNEEDED = Yes + COMMENT = fast Qt IMAP e-mail client DISTNAME = trojita-0.7 diff --git a/math/rstudio/Makefile b/math/rstudio/Makefile index 8ba7907fabe..3ea55e9a2de 100644 --- a/math/rstudio/Makefile +++ b/math/rstudio/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.6 2021/11/08 11:39:21 rsadowski Exp $ +USE_WXNEEDED = Yes + # XXX: patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp # must be kept in sync with math/R shlib bumps. diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile index d73ace3e3bd..29847319fcd 100644 --- a/net/ktorrent/Makefile +++ b/net/ktorrent/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.62 2022/01/05 08:02:50 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = BitTorrent Client DISTNAME = ktorrent-${MODKDE_VERSION} diff --git a/net/nextcloudclient/Makefile b/net/nextcloudclient/Makefile index e53db6847b8..02ba603dc05 100644 --- a/net/nextcloudclient/Makefile +++ b/net/nextcloudclient/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.28 2022/02/04 17:32:53 sthen Exp $ # +USE_WXNEEDED = Yes + COMMENT = desktop sync client for Nextcloud V = 3.4.2 diff --git a/net/psi/Makefile b/net/psi/Makefile index 873b301129d..0605b1eafbe 100644 --- a/net/psi/Makefile +++ b/net/psi/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.38 2021/06/05 04:28:12 rsadowski Exp $ +USE_WXNEEDED = Yes + BROKEN = Connection Error: Unable to connect to server COMMENT= multiplatform Jabber client diff --git a/productivity/kmymoney/Makefile b/productivity/kmymoney/Makefile index 5132d7fcc81..26307c3bc24 100644 --- a/productivity/kmymoney/Makefile +++ b/productivity/kmymoney/Makefile @@ -1,5 +1,6 @@ # $OpenBSD: Makefile,v 1.41 2021/11/10 11:55:27 rsadowski Exp $ +USE_WXNEEDED = Yes COMMENT = accounting for KDE 5 diff --git a/productivity/libalkimia/Makefile b/productivity/libalkimia/Makefile index 296120c2ced..a6105f0903f 100644 --- a/productivity/libalkimia/Makefile +++ b/productivity/libalkimia/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.18 2021/03/15 06:28:05 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE financial data handling library CATEGORIES = productivity x11 diff --git a/www/dooble/Makefile b/www/dooble/Makefile index a46f0443629..d8bde5cf576 100755 --- a/www/dooble/Makefile +++ b/www/dooble/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.3 2021/11/23 14:00:45 bcallah Exp $ +USE_WXNEEDED = Yes + COMMENT = small, lightweight QtWebEngine web browser CATEGORIES = www x11 diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile index 9d475f6e460..a8b76829a02 100644 --- a/www/otter-browser/Makefile +++ b/www/otter-browser/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.35 2021/01/19 06:27:43 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5 DISTNAME = otter-browser-1.0.02 diff --git a/www/py-qtwebengine/Makefile b/www/py-qtwebengine/Makefile index b5427284467..2029610e0d8 100644 --- a/www/py-qtwebengine/Makefile +++ b/www/py-qtwebengine/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.8 2021/11/02 00:02:54 sthen Exp $ +USE_WXNEEDED = Yes + COMMENT = python Qt5WebEngine bindings MODPY_EGG_VERSION = 5.15.5 diff --git a/x11/kde-applications/akregator/Makefile b/x11/kde-applications/akregator/Makefile index 3c31a8073e5..e6b51482e50 100644 --- a/x11/kde-applications/akregator/Makefile +++ b/x11/kde-applications/akregator/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.16 2022/01/05 08:02:51 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = news feed reader DISTNAME = akregator-${VERSION} CATEGORIES = net www diff --git a/x11/kde-applications/cantor/Makefile b/x11/kde-applications/cantor/Makefile index e5eb7fefde9..7e87261d1a8 100644 --- a/x11/kde-applications/cantor/Makefile +++ b/x11/kde-applications/cantor/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.28 2022/01/05 08:02:51 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE mathematical applications DISTNAME = cantor-${VERSION} CATEGORIES = education math diff --git a/x11/kde-applications/grantlee-editor/Makefile b/x11/kde-applications/grantlee-editor/Makefile index 36f88118266..d4800e1f4ba 100644 --- a/x11/kde-applications/grantlee-editor/Makefile +++ b/x11/kde-applications/grantlee-editor/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.12 2022/01/05 08:02:52 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = utilities and tools to manage themes in KDE PIM applications DISTNAME = grantlee-editor-${VERSION} CATEGORIES = devel diff --git a/x11/kde-applications/kdepim-addons/Makefile b/x11/kde-applications/kdepim-addons/Makefile index 2d8120f1eeb..de20ad6e504 100644 --- a/x11/kde-applications/kdepim-addons/Makefile +++ b/x11/kde-applications/kdepim-addons/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.14 2022/01/05 08:02:55 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE PIM mail related libraries DISTNAME = kdepim-addons-${VERSION} CATEGORIES = devel diff --git a/x11/kde-applications/kdepim-runtime/Makefile b/x11/kde-applications/kdepim-runtime/Makefile index c321b029f2f..1e9c99313ab 100644 --- a/x11/kde-applications/kdepim-runtime/Makefile +++ b/x11/kde-applications/kdepim-runtime/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.14 2022/01/05 08:02:55 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE PIM mail related libraries DISTNAME = kdepim-runtime-${VERSION} PKGNAME = kdepim-runtime-kf5-${VERSION} diff --git a/x11/kde-applications/kimagemapeditor/Makefile b/x11/kde-applications/kimagemapeditor/Makefile index e8f0010abb3..eb0d6aa76a7 100644 --- a/x11/kde-applications/kimagemapeditor/Makefile +++ b/x11/kde-applications/kimagemapeditor/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.6 2021/11/10 06:37:49 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE-based HTML image map editor DISTNAME = kimagemapeditor-${VERSION} CATEGORIES = devel diff --git a/x11/kde-applications/kmail/Makefile b/x11/kde-applications/kmail/Makefile index 1012765f053..a3e3ebcd3d6 100644 --- a/x11/kde-applications/kmail/Makefile +++ b/x11/kde-applications/kmail/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.16 2022/01/05 08:02:57 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE PIM email client DISTNAME = kmail-${VERSION} CATEGORIES = net mail diff --git a/x11/kde-applications/konqueror/Makefile b/x11/kde-applications/konqueror/Makefile index c3237f7fca8..4959acd8842 100644 --- a/x11/kde-applications/konqueror/Makefile +++ b/x11/kde-applications/konqueror/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.10 2022/01/06 07:36:03 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE File Manager & Web Browser DISTNAME = konqueror-${VERSION} CATEGORIES = www diff --git a/x11/kde-applications/kontact/Makefile b/x11/kde-applications/kontact/Makefile index b66dfd24763..66257ffcdf5 100644 --- a/x11/kde-applications/kontact/Makefile +++ b/x11/kde-applications/kontact/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.14 2022/01/05 08:02:59 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = documentenal information management suite DISTNAME = kontact-${VERSION} CATEGORIES = net www diff --git a/x11/kde-applications/libksieve/Makefile b/x11/kde-applications/libksieve/Makefile index 2dd5af77804..a6291b7d7cf 100644 --- a/x11/kde-applications/libksieve/Makefile +++ b/x11/kde-applications/libksieve/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.11 2022/01/05 08:03:02 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = sieve script library DISTNAME = libksieve-${VERSION} CATEGORIES = devel diff --git a/x11/kde-applications/marble/Makefile b/x11/kde-applications/marble/Makefile index 5f6ad303fef..e9aa3670317 100644 --- a/x11/kde-applications/marble/Makefile +++ b/x11/kde-applications/marble/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.24 2022/01/05 08:03:02 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = virtual globe and world atlas DISTNAME = marble-${VERSION} PKGNAME = marble-kf5-${VERSION} diff --git a/x11/kde-applications/messagelib/Makefile b/x11/kde-applications/messagelib/Makefile index 5514ec3755d..1f1971773a4 100644 --- a/x11/kde-applications/messagelib/Makefile +++ b/x11/kde-applications/messagelib/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.10 2022/01/05 08:03:02 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = KDE PIM messaging library DISTNAME = messagelib-${VERSION} CATEGORIES = devel diff --git a/x11/kde-applications/umbrello/Makefile b/x11/kde-applications/umbrello/Makefile index fbc4a2336a1..c2b021f96d0 100644 --- a/x11/kde-applications/umbrello/Makefile +++ b/x11/kde-applications/umbrello/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.22 2021/11/10 06:37:59 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = UML Modeller DISTNAME = umbrello-${VERSION} CATEGORIES = x11 productivity diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index 7bc25f37b29..b4e04e69243 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.30 2021/11/02 00:02:59 sthen Exp $ +USE_WXNEEDED = Yes + COMMENT= Python bindings for Qt5 DPB_PROPERTIES= parallel diff --git a/x11/qt5/qttools/Makefile b/x11/qt5/qttools/Makefile index 0f2c64551c7..db9e78cb003 100644 --- a/x11/qt5/qttools/Makefile +++ b/x11/qt5/qttools/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.14 2021/01/19 06:16:32 rsadowski Exp $ +USE_WXNEEDED = Yes + QT5NAME = QtTools COMMENT-main = Qt development tools COMMENT-webview = Webkit-based Qt Designer plugin diff --git a/x11/qt5/qtwebview/Makefile b/x11/qt5/qtwebview/Makefile index e33f32c3999..b633549940d 100644 --- a/x11/qt5/qtwebview/Makefile +++ b/x11/qt5/qtwebview/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.6 2021/01/19 06:16:36 rsadowski Exp $ +USE_WXNEEDED = Yes + QT5NAME = QtWebView COMMENT-main = simple web viewing component for Qt5 diff --git a/x11/tellico/Makefile b/x11/tellico/Makefile index 52960439edc..6474fa69726 100644 --- a/x11/tellico/Makefile +++ b/x11/tellico/Makefile @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.70 2021/11/09 10:48:02 rsadowski Exp $ +USE_WXNEEDED = Yes + COMMENT = organizer for book/dvd/music collections DISTNAME = tellico-3.4.2