libraries/qt5: Remove patch for private includes

This commit is contained in:
Dave Woodfall 2020-01-30 16:16:20 +00:00
parent 2af04c5290
commit 0cf78e6394
1 changed files with 2 additions and 6 deletions

View File

@ -51,7 +51,7 @@
PRGNAM=qt5
SRCNAM=${PRGNAM%%[[:digit:]]*}
VERSION=${VERSION:-5.12.6}
BUILD=${BUILD:-3}
BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -176,10 +176,6 @@ cd qtbase
| patch -p1 --verbose || exit 1
cd - 1>/dev/null
# Fix missing private includes: QTBUG-37417
sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \
-i qtbase/mkspecs/features/create_cmake.prf
# Use our custom compiler and linker flags:
sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \
-i qtbase/mkspecs/common/gcc-base.conf || exit 1
@ -332,7 +328,7 @@ done
# Remove executable bits from files.
find $PKG \( -name "*.qml" -o -name "*.app" \) -perm 755 -exec chmod 644 '{}' \;
# Add missing verions info
# Add missing version info
sed -i "s,set(PACKAGE_VERSION ),set(PACKAGE_VERSION $VERSION)," \
$PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt5/Qt5ConfigVersion.cmake