summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Woodfall <dave@slackbuilds.org>2020-01-30 16:16:20 +0000
committerDave Woodfall <dave@slackbuilds.org>2020-04-05 16:23:14 +0100
commit0cf78e6394e19a50d8b44e6b226ba63eda3b0e43 (patch)
treea1a0179bfd2ed168021cc370ab9ef79ceca81381
parent2af04c52906912acd0a4ced84c3ed3c7bb8fa0b3 (diff)
downloadslackbuilds-0cf78e6394e19a50d8b44e6b226ba63eda3b0e43.tar.gz
libraries/qt5: Remove patch for private includes
-rw-r--r--libraries/qt5/qt5.SlackBuild8
1 files changed, 2 insertions, 6 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 2c95486181..0e16a88821 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -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