From 261fabd6d1b0182c8291e680b0736674875c834d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 14 Oct 2019 22:50:35 +0200 Subject: [PATCH] Qt5: rewrite mesa package links to qt5_devel package links. --- dev-qt/qt5/qt5-5.13.1.recipe | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dev-qt/qt5/qt5-5.13.1.recipe b/dev-qt/qt5/qt5-5.13.1.recipe index 9f82db081..b17a71d54 100644 --- a/dev-qt/qt5/qt5-5.13.1.recipe +++ b/dev-qt/qt5/qt5-5.13.1.recipe @@ -7,7 +7,7 @@ HOMEPAGE="https://qt.io/" COPYRIGHT="2015-2019 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" -REVISION="4" +REVISION="5" SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/single/qt-everywhere-src-$portVersion.tar.xz" CHECKSUM_SHA256="adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e" SOURCE_DIR="qt-everywhere-src-$portVersion" @@ -561,6 +561,14 @@ INSTALL() mimeset -f "$appsDir/Qt5/$j" done + local packageLinksDir=$(dirname $portPackageLinksDir) + local develPackageName="${portName}_devel-$portFullVersion" + local mesaLinksDir="$packageLinksDir/${develPackageName}/devel~libgl$secondaryArchSuffix/" + sed -i -e "s|_GL_INCDIRS \".*\"|_GL_INCDIRS \"$mesaLinksDir$relativeIncludeDir\"|" \ + -e "s|_qt5gui_find_extra_libs.EGL \".*\" \"\" \".*\"|_qt5gui_find_extra_libs\(EGL \"$mesaLinksDir${relativeDevelopLibDir}/libEGL.so\" \"\" \"$mesaLinksDir$relativeIncludeDir\"|" \ + -e "s|_qt5gui_find_extra_libs.OPENGL \".*\" \"\" \".*\"|_qt5gui_find_extra_libs\(OPENGL \"$mesaLinksDir${relativeDevelopLibDir}/libGL.so\" \"\" \"$mesaLinksDir$relativeIncludeDir\"|" \ + $libDir/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake + packageEntries docs \ $docDir/Qt5