Author: bdubbs Date: Sat Jul 18 12:00:37 2020 New Revision: 4148 Log: Add a fix to a segmentation fault in cmake-gui
Added: trunk/cmake/cmake-3.18.0-regression_fix-1.patch Added: trunk/cmake/cmake-3.18.0-regression_fix-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/cmake/cmake-3.18.0-regression_fix-1.patch Sat Jul 18 12:00:37 2020 (r4148) @@ -0,0 +1,38 @@ +Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org> +Date: 2020-07-18 +Initial Package Version: 3.18.0 +Upstream Status: Unknown +Origin: https://gitlab.kitware.com/cmake/cmake/-/issues/20981 +Description: Fixes a segmentation fault in cmake-gui + +diff -Naur cmake-3.18.0.sav/Source/QtDialog/QCMakeCacheView.cxx cmake-3.18.0/Source/QtDialog/QCMakeCacheView.cxx +--- cmake-3.18.0.sav/Source/QtDialog/QCMakeCacheView.cxx 2020-07-15 06:19:20.000000000 -0500 ++++ cmake-3.18.0/Source/QtDialog/QCMakeCacheView.cxx 2020-07-18 13:54:45.857377257 -0500 +@@ -217,27 +217,14 @@ + QSet<QCMakeProperty> newProps2; + + if (this->ShowNewProperties) { +-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + newProps = props.toSet(); +-#else +- newProps = QSet<QCMakeProperty>(props.begin(), props.end()); +-#endif + newProps2 = newProps; +-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + QSet<QCMakeProperty> oldProps = this->properties().toSet(); +-#else +- QSet<QCMakeProperty> oldProps = QSet<QCMakeProperty>( +- this->properties().begin(), this->properties().end()); +-#endif + oldProps.intersect(newProps); + newProps.subtract(oldProps); + newProps2.subtract(newProps); + } else { +-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + newProps2 = props.toSet(); +-#else +- newProps2 = QSet<QCMakeProperty>(props.begin(), props.end()); +-#endif + } + + bool b = this->blockSignals(true); -- http://lists.linuxfromscratch.org/listinfo/patches FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
