From owner-svn-ports-all@freebsd.org Sun Mar 17 17:12:30 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D7401543B78; Sun, 17 Mar 2019 17:12:30 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 315A1881E3; Sun, 17 Mar 2019 17:12:30 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 082ADD00D; Sun, 17 Mar 2019 17:12:30 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2HHCTTk093924; Sun, 17 Mar 2019 17:12:29 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2HHCTUU093922; Sun, 17 Mar 2019 17:12:29 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201903171712.x2HHCTUU093922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 17 Mar 2019 17:12:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496074 - in head: Mk/Uses x11/kf5-plasma-framework X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: in head: Mk/Uses x11/kf5-plasma-framework X-SVN-Commit-Revision: 496074 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 315A1881E3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Mar 2019 17:12:30 -0000 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@FreeBSD.org