From c680414fbb183914ec6458c878ae57ede751068e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Nov 2019 03:27:31 +0100 Subject: [PATCH] qt5dxcb-plugin: rebuild against qt5.14 [ci skip] --- srcpkgs/qt5dxcb-plugin/template | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/srcpkgs/qt5dxcb-plugin/template b/srcpkgs/qt5dxcb-plugin/template index b5408ed89fb..a294b01309a 100644 --- a/srcpkgs/qt5dxcb-plugin/template +++ b/srcpkgs/qt5dxcb-plugin/template @@ -1,14 +1,14 @@ # Template file for 'qt5dxcb-plugin' pkgname=qt5dxcb-plugin version=5.0.1 -revision=3 +revision=4 build_style=qmake make_build_args="VERSION=${version}" hostmakedepends="pkg-config qt5-qmake" makedepends="cairo-devel libSM-devel libXi-devel libxkbcommon-devel qt5-x11extras-devel xcb-util-image-devel xcb-util-keysyms-devel - xcb-util-renderutil-devel xcb-util-wm-devel" -depends="qt5>=5.13.2<5.13.3" + xcb-util-renderutil-devel xcb-util-wm-devel qt5-xcb-private-headers" +depends="qt5-core>=5.14.2<5.14.3" short_desc="Qt platform plugins for DDE" maintainer="John " license="GPL-3.0-or-later" @@ -16,12 +16,11 @@ homepage="https://github.com/linuxdeepin/qt5dxcb-plugin/" changelog="https://github.com/linuxdeepin/qt5dxcb-plugin/blob/master/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/qt5dxcb-plugin/archive/${version}.tar.gz" checksum=b19253f9f577b2a9d86774ba95d252318f3d692ab92d2e62fbf0578d56db453d -patch_args="-Np1" pre_configure() { _qt5_dep_ver="${depends#*>=}" _qt5_dep_ver="${_qt5_dep_ver%<*}" - _qt5_version="$(xbps-uhelper version qt5)" + _qt5_version="$(xbps-uhelper version qt5-core)" if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then echo @@ -29,11 +28,7 @@ pre_configure() { msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n" exit 1 fi - - # no headers for 5.13.1 yet; 5.13.0 headers are the same for this - # remove on next version upgrade (after upstream has added them) - ln -s ${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.0 \ - ${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.2 + sed -i "s|error(Not support Qt Version: .*)|INCLUDEPATH += ${XBPS_CROSS_BASE}/usr/include/qt5xcb-private|" platformplugin/linux.pri } if [ "$CROSS_BUILD" ]; then