svn commit: r496074 - in head: Mk/Uses x11/kf5-plasma-framework
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sun Mar 17 17:12:30 UTC 2019
Author: rakuco
Date: Sun Mar 17 17:12:29 2019
New Revision: 496074
URL: https://svnweb.freebsd.org/changeset/ports/496074
Log:
Revert r496041 and r496054.
The changes were right, but they broke `make configure' in ports that have
USE_KDE=wayland because now both Mk/Uses/qt.mk and Mk/Uses/kde.mk set
wayland_PORT and wayland_LIB, and qt.mk's version overrides kde.mk's. This
means we will end up installing graphics/qt5-wayland rather than
x11/kf5-kwayland:
CMake Error at CMakeLists.txt:27 (find_package):
Could not find a package configuration file provided by "KF5Wayland"
(requested version 5.54.0) with any of the following names:
KF5WaylandConfig.cmake
kf5wayland-config.cmake
Add the installation prefix of "KF5Wayland" to CMAKE_PREFIX_PATH or set
"KF5Wayland_DIR" to a directory containing one of the above files. If
"KF5Wayland" provides a separate development package or SDK, be sure it has
been installed.
Bump PORTREVISION in x11/kf5-plasma-framework, it has an optional dependency on
kf5-kwayland and was thus building fine despite the wrong dependencies.
Modified:
head/Mk/Uses/qt.mk
head/x11/kf5-plasma-framework/Makefile
Modified: head/Mk/Uses/qt.mk
==============================================================================
--- head/Mk/Uses/qt.mk Sun Mar 17 16:46:47 2019 (r496073)
+++ head/Mk/Uses/qt.mk Sun Mar 17 17:12:29 2019 (r496074)
@@ -431,9 +431,6 @@ uitools_PATH= ${LOCALBASE}/${QT_LIBDIR_REL}/libQt${_Q
virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard
virtualkeyboard_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforminputcontexts/libqtvirtualkeyboardplugin.so
-wayland_PORT= graphics/${_QT_RELNAME}-wayland
-wayland_LIB= libQt${_QT_LIBVER}WaylandClient.so
-
webchannel_PORT= www/${_QT_RELNAME}-webchannel
webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
Modified: head/x11/kf5-plasma-framework/Makefile
==============================================================================
--- head/x11/kf5-plasma-framework/Makefile Sun Mar 17 16:46:47 2019 (r496073)
+++ head/x11/kf5-plasma-framework/Makefile Sun Mar 17 17:12:29 2019 (r496074)
@@ -2,6 +2,7 @@
PORTNAME= plasma-framework
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-frameworks
MAINTAINER= kde at FreeBSD.org
More information about the svn-ports-all
mailing list