On Sat Feb 12, 2022 at 12:26:12PM +0000, Stuart Henderson wrote:
> On 2022/02/12 07:27, Rafael Sadowski wrote:
> > On Fri Feb 11, 2022 at 10:24:29PM +0000, Stuart Henderson wrote:
> > > On 2022/02/11 21:45, Rafael Sadowski wrote:
> > > > 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?
> > >
> > > I don't know exactly what that hack does,
> > >
> >
> > It searches for webkit/webengine (lower-case search) in all link-entries
> > for EXECUTABLE/SHARED_LIBRARY targets. If the search match it adds
> > "-Wl,-z,wxneeded".
>
> So it seems a bit more targetted than USE_WXNEEDED=Yes.
> This could be good (it means that only executables which link
> against those library get wxneeded, so it may avoid adding
> wxneeded to some tools which don't need it). But could be
> bad (it doesn't catch executables which bring webkit/webengine
> in via dlopen).
Totally agree. USE_WXNEEDED=Yes is the big hammer and all executables
and shared libs get wxneeded but it is too much work to fix all ports in
detail. We already use it. CMake doesn't have to be the smart-ass here
if other build systems don't handle is case.
>
> Not sure which way is best here. But in any event I think
> any ports affected by this want a bump because it could change
> some packaged executables files to have the wxneeded annotation
> where they didn't before. (Maybe not all of them, but I think
> it's easier to bump than check all the binaries).
Agree, new diff below.
>
> > > but I checked recoll and that does not currently have an
> > > OPENBSD_WXNEEDED section (check with objdump -p).
> >
> > recoll is not a cmake port. I think I found that through my analysis. I
> > looked ports that use Qt5WebKit or Qt5WebEngine but have no
> > USE_WXNEEDED=Yes.
> >
> > I come to two questions:
> >
> > 1. USE_WXNEEDED=Yes is broken for recoll and maybe other QMake ports
> > or
> > 2. Not all ports depending on Qt5WebKit,Qt5WebEngine need wxneeded. I
> > don't think so.
>
> Depends what they do I guess. For recoll, qtwebkit or qtwebengine are
> used to display the UI in the gui version, and this does work as-is
> with the default config, though it's possible that some local config to
> modify the UI to use javascript might cause it to fail.
>
> I think I'd prefer not to add wxneeded to recoll unless we run into
> problems without it. (And if we do need to add it I'd prefer to target
> just the gui, and leave the indexer alone).
Agree. Thanks for the feedback.
New diff with following changes:
- Remove the cmake webkit/webengine hack.
- Add USE_WXNEEDED=yes ONLY in cmake ports. No more on py-qt ... as in
the previous one.
- Add the missing bump.
OK?
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index cd48c4340ee..64a3519a7a5 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -1,11 +1,13 @@
# $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
GH_ACCOUNT= Stellarium
GH_PROJECT= stellarium
-REVISION= 1
+REVISION= 2
CATEGORIES= astro x11
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..2eaf1771b5f 100644
--- a/devel/kf5/kdewebkit/Makefile
+++ b/devel/kf5/kdewebkit/Makefile
@@ -1,7 +1,10 @@
# $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}
+REVISION = 0
SHARED_LIBS = KF5WebKit 6.0
diff --git a/devel/kreport/Makefile b/devel/kreport/Makefile
index e4ee6e1e007..13a53845328 100644
--- a/devel/kreport/Makefile
+++ b/devel/kreport/Makefile
@@ -1,10 +1,12 @@
# $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
DISTNAME = kreport-${VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = devel
diff --git a/devel/qt-creator/Makefile b/devel/qt-creator/Makefile
index c9902825443..bc6999606fa 100644
--- a/devel/qt-creator/Makefile
+++ b/devel/qt-creator/Makefile
@@ -1,10 +1,13 @@
# $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
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
+REVISION = 0
SHARED_LIBS += Aggregation 1.0 # 0.0
SHARED_LIBS += CPlusPlus 5.0 # 0.0
diff --git a/editors/sigil/Makefile b/editors/sigil/Makefile
index 324e1828f70..6f2b23a3a2f 100644
--- a/editors/sigil/Makefile
+++ b/editors/sigil/Makefile
@@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2021/11/02 00:01:13 sthen Exp $
+USE_WXNEEDED = Yes
+
COMMENT = EPUB ebook editor
PKGNAME = sigil-${GH_TAGNAME}
-REVISION = 0
+REVISION = 1
GH_ACCOUNT = Sigil-Ebook
GH_PROJECT = Sigil
diff --git a/geo/gpsbabel/Makefile b/geo/gpsbabel/Makefile
index 68437012965..4036dfb2583 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
@@ -13,7 +15,7 @@ PKGNAME-main= gpsbabel-${VERSION}
PKGNAME-tk= gpsbabel-tk-${VERSION}
PKGNAME-qt= gpsbabel-qt-${VERSION}
REVISION-main= 1
-REVISION-qt= 2
+REVISION-qt= 3
CATEGORIES= geo
HOMEPAGE= https://www.gpsbabel.org/
diff --git a/geo/kgeotag/Makefile b/geo/kgeotag/Makefile
index 2bf98b4a1ed..3bc46aa960d 100644
--- a/geo/kgeotag/Makefile
+++ b/geo/kgeotag/Makefile
@@ -1,10 +1,13 @@
# $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
DISTNAME = kgeotag-${V}
CATEGORIES = geo x11
+REVISION = 0
HOMEPAGE = https://kgeotag.kde.org
diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile
index 4805edc6e85..f4e9077ecff 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
@@ -7,6 +9,7 @@ COMMENT = desktop geographical information system
DPB_PROPERTIES = parallel
DISTNAME = qgis-3.22.3
+REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
DEBUG_PACKAGES =${BUILD_PACKAGES}
diff --git a/geo/qmapshack/Makefile b/geo/qmapshack/Makefile
index f1fc3794b3c..c8b42f55d79 100644
--- a/geo/qmapshack/Makefile
+++ b/geo/qmapshack/Makefile
@@ -1,10 +1,13 @@
# $OpenBSD: Makefile,v 1.6 2021/06/10 19:07:11 landry Exp $
+USE_WXNEEDED = Yes
+
COMMENT = map management tool
GH_ACCOUNT = Maproom
GH_PROJECT = qmapshack
GH_TAGNAME = V_1.16.0
+REVISION = 0
CATEGORIES = geo
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 473700dabd5..7ca1420d94a 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,11 +1,14 @@
# $OpenBSD: Makefile,v 1.75 2022/02/12 10:23:23 rsadowski Exp $
+USE_WXNEEDED = Yes
+
COMMENT = KDE digital photo and video management utility
V = 7.5.0
PKGNAME = digikam-${V}
DISTNAME = digiKam-${V}
CATEGORIES = graphics
+REVISION = 0
HOMEPAGE = https://www.digikam.org/
diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
index 8e0fdd8a7b5..aacb2e551ff 100644
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@@ -1,9 +1,11 @@
# $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
-REVISION = 13
+REVISION = 14
SHARED_LIBS = trojita_plugins 2.0 # 2.0
diff --git a/math/rstudio/Makefile b/math/rstudio/Makefile
index 8ba7907fabe..67c9f7b86c9 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.
@@ -10,7 +12,7 @@ ONLY_FOR_ARCHS = ${LP64_ARCHS}
V = 1.3.959
COMMENT = Integrated Development Environment (IDE) for R
PKGNAME = rstudio-${V}
-REVISION = 4
+REVISION = 5
CATEGORIES = math x11
HOMEPAGE = https://www.rstudio.com/
diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index d73ace3e3bd..8bd6df45778 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -1,8 +1,11 @@
# $OpenBSD: Makefile,v 1.62 2022/01/05 08:02:50 rsadowski Exp $
+USE_WXNEEDED = Yes
+
COMMENT = BitTorrent Client
DISTNAME = ktorrent-${MODKDE_VERSION}
+REVISION = 0
SHARED_LIBS += ktcore 2.1 # 0.0
diff --git a/net/nextcloudclient/Makefile b/net/nextcloudclient/Makefile
index e53db6847b8..f67b6150761 100644
--- a/net/nextcloudclient/Makefile
+++ b/net/nextcloudclient/Makefile
@@ -1,9 +1,12 @@
# $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
DISTNAME = nextcloudclient-${V}
+REVISION = 0
GH_ACCOUNT = nextcloud
GH_PROJECT = desktop
diff --git a/net/psi/Makefile b/net/psi/Makefile
index 873b301129d..48195493960 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
@@ -7,6 +9,7 @@ COMMENT= multiplatform Jabber client
V= 1.5
DISTNAME= psi-${V}
CATEGORIES= net
+REVISION= 0
HOMEPAGE= https://psi-im.org/
diff --git a/productivity/kmymoney/Makefile b/productivity/kmymoney/Makefile
index 5132d7fcc81..2cc43a8774f 100644
--- a/productivity/kmymoney/Makefile
+++ b/productivity/kmymoney/Makefile
@@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.41 2021/11/10 11:55:27 rsadowski Exp $
+USE_WXNEEDED = Yes
COMMENT = accounting for KDE 5
VERSION = 5.1.2
DISTNAME = kmymoney-${VERSION}
+REVISION = 0
CATEGORIES = productivity x11
diff --git a/productivity/libalkimia/Makefile b/productivity/libalkimia/Makefile
index 296120c2ced..f90b1ec161b 100644
--- a/productivity/libalkimia/Makefile
+++ b/productivity/libalkimia/Makefile
@@ -1,12 +1,14 @@
# $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
V = 8.0.4
PKGNAME = libalkimia-$V
DISTNAME = alkimia-$V
-REVISION = 0
+REVISION = 1
SHARED_LIBS = alkimia5 1.0 # 8.0.4
diff --git a/www/dooble/Makefile b/www/dooble/Makefile
old mode 100755
new mode 100644
index a46f0443629..e1305858717
--- a/www/dooble/Makefile
+++ b/www/dooble/Makefile
@@ -1,11 +1,14 @@
# $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
GH_ACCOUNT = textbrowser
GH_PROJECT = dooble
GH_TAGNAME = 2021.11.05
+REVISION = 0
HOMEPAGE = https://textbrowser.github.io/dooble/
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
index 9d475f6e460..1cada438dba 100644
--- a/www/otter-browser/Makefile
+++ b/www/otter-browser/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
CATEGORIES = www
diff --git a/x11/kde-applications/akregator/Makefile
b/x11/kde-applications/akregator/Makefile
index 3c31a8073e5..68521e2f67f 100644
--- a/x11/kde-applications/akregator/Makefile
+++ b/x11/kde-applications/akregator/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
SHARED_LIBS += akregatorinterfaces 1.0 # 5.13.2
SHARED_LIBS += akregatorprivate 2.1 # 5.13.2
diff --git a/x11/kde-applications/cantor/Makefile
b/x11/kde-applications/cantor/Makefile
index e5eb7fefde9..51035ebd8a6 100644
--- a/x11/kde-applications/cantor/Makefile
+++ b/x11/kde-applications/cantor/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
SHARED_LIBS += cantorlibs 54.0 # 17.08
diff --git a/x11/kde-applications/grantlee-editor/Makefile
b/x11/kde-applications/grantlee-editor/Makefile
index 36f88118266..82473ce811a 100644
--- a/x11/kde-applications/grantlee-editor/Makefile
+++ b/x11/kde-applications/grantlee-editor/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
SHARED_LIBS += grantleethemeeditor 1.0 # 5.13.2
diff --git a/x11/kde-applications/kdepim-addons/Makefile
b/x11/kde-applications/kdepim-addons/Makefile
index 2d8120f1eeb..813ba685ca8 100644
--- a/x11/kde-applications/kdepim-addons/Makefile
+++ b/x11/kde-applications/kdepim-addons/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
SHARED_LIBS += adblocklibprivate 1.0 # 5.13.2
SHARED_LIBS += coisceim_widget 1.0 # 5.13.2
diff --git a/x11/kde-applications/kdepim-runtime/Makefile
b/x11/kde-applications/kdepim-runtime/Makefile
index c321b029f2f..0c516524bb7 100644
--- a/x11/kde-applications/kdepim-runtime/Makefile
+++ b/x11/kde-applications/kdepim-runtime/Makefile
@@ -1,9 +1,12 @@
# $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}
CATEGORIES = devel
+REVISION = 0
SHARED_LIBS += akonadi-filestore 1.0 # 5.13.2
SHARED_LIBS += akonadi-singlefileresource 1.0 # 5.13.2
diff --git a/x11/kde-applications/kimagemapeditor/Makefile
b/x11/kde-applications/kimagemapeditor/Makefile
index e8f0010abb3..2e2b136e2de 100644
--- a/x11/kde-applications/kimagemapeditor/Makefile
+++ b/x11/kde-applications/kimagemapeditor/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Codecs KF5Completion
WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
diff --git a/x11/kde-applications/kmail/Makefile
b/x11/kde-applications/kmail/Makefile
index 1012765f053..706b0bd7f49 100644
--- a/x11/kde-applications/kmail/Makefile
+++ b/x11/kde-applications/kmail/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
SHARED_LIBS += kmailprivate 5.0 # 5.13.2
diff --git a/x11/kde-applications/konqueror/Makefile
b/x11/kde-applications/konqueror/Makefile
index c3237f7fca8..3d6f0a3152c 100644
--- a/x11/kde-applications/konqueror/Makefile
+++ b/x11/kde-applications/konqueror/Makefile
@@ -1,9 +1,11 @@
# $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
-REVISION = 0
+REVISION = 1
SHARED_LIBS += KF5Konq 1.1 # 5.97.0
SHARED_LIBS += konquerorprivate 1.1 # 5.97.0
diff --git a/x11/kde-applications/kontact/Makefile
b/x11/kde-applications/kontact/Makefile
index b66dfd24763..ad1c5d07100 100644
--- a/x11/kde-applications/kontact/Makefile
+++ b/x11/kde-applications/kontact/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
SHARED_LIBS += kontactprivate 0.1 # 5.13.2
diff --git a/x11/kde-applications/libksieve/Makefile
b/x11/kde-applications/libksieve/Makefile
index 2dd5af77804..e8d7c98d508 100644
--- a/x11/kde-applications/libksieve/Makefile
+++ b/x11/kde-applications/libksieve/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
SHARED_LIBS += KF5KManageSieve 1.0 # 5.13.2
SHARED_LIBS += KF5KSieve 1.0 # 5.13.2
diff --git a/x11/kde-applications/marble/Makefile
b/x11/kde-applications/marble/Makefile
index 5f6ad303fef..553a2c80449 100644
--- a/x11/kde-applications/marble/Makefile
+++ b/x11/kde-applications/marble/Makefile
@@ -1,9 +1,12 @@
# $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}
CATEGORIES = geo
+REVISION = 0
HOMEPAGE = https://marble.kde.org/
diff --git a/x11/kde-applications/messagelib/Makefile
b/x11/kde-applications/messagelib/Makefile
index 5514ec3755d..9e1f149977b 100644
--- a/x11/kde-applications/messagelib/Makefile
+++ b/x11/kde-applications/messagelib/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
SHARED_LIBS += KF5MessageComposer 9.0 # 5.13.2
SHARED_LIBS += KF5MessageCore 3.0 # 5.13.2
diff --git a/x11/kde-applications/umbrello/Makefile
b/x11/kde-applications/umbrello/Makefile
index fbc4a2336a1..c3437655c8a 100644
--- a/x11/kde-applications/umbrello/Makefile
+++ b/x11/kde-applications/umbrello/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
HOMEPAGE = https://umbrello.kde.org/
diff --git a/x11/qt5/qtwebview/Makefile b/x11/qt5/qtwebview/Makefile
index e33f32c3999..774d09cdd13 100644
--- a/x11/qt5/qtwebview/Makefile
+++ b/x11/qt5/qtwebview/Makefile
@@ -1,7 +1,10 @@
# $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
+REVISION = 0
MULTI_PACKAGES = -main -examples
diff --git a/x11/tellico/Makefile b/x11/tellico/Makefile
index 52960439edc..a7fab2e79cb 100644
--- a/x11/tellico/Makefile
+++ b/x11/tellico/Makefile
@@ -1,8 +1,11 @@
# $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
+REVISION = 0
CATEGORIES = x11
