wok-next diff qt5/receipt @ rev 20957
Random updates
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Sep 05 15:26:05 2018 +0300 (2018-09-05) |
parents | 30967bd5b948 |
children | f48456621a9d |
line diff
1.1 --- a/qt5/receipt Wed Apr 11 01:07:35 2018 +0300 1.2 +++ b/qt5/receipt Wed Sep 05 15:26:05 2018 +0300 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="qt5" 1.7 -VERSION="5.9.1" 1.8 +VERSION="5.10.1" 1.9 CATEGORY="meta" 1.10 SHORT_DESC="Cross-platform application framework" 1.11 MAINTAINER="al.bobylev@gmail.com" 1.12 @@ -9,7 +9,7 @@ 1.13 WEB_SITE="https://www.qt.io/" 1.14 LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/qt5.html" 1.15 1.16 -TARBALL="qt-everywhere-opensource-src-$VERSION.tar.xz" 1.17 +TARBALL="qt-everywhere-src-$VERSION.tar.xz" 1.18 WGET_URL="https://download.qt.io/archive/qt/${VERSION%.*}/$VERSION/single/$TARBALL" 1.19 1.20 PATCH="Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch" 1.21 @@ -32,7 +32,7 @@ 1.22 qt5-serialbus qt5-serialport qt5-speech \ 1.23 qt5-svg qt5-tools qt5-virtualkeyboard \ 1.24 qt5-wayland qt5-webchannel qt5-websockets \ 1.25 -qt5-x11extras qt5-xmlpatterns qt5-base-egl \ 1.26 +qt5-x11extras qt5-xmlpatterns qt5-base-egl \ 1.27 \ 1.28 qt5-locale-ar qt5-locale-ca qt5-locale-cs qt5-locale-da \ 1.29 qt5-locale-de qt5-locale-en qt5-locale-es qt5-locale-fa \ 1.30 @@ -45,7 +45,6 @@ 1.31 qt5-doc qt5-dev" 1.32 1.33 compile_rules() { 1.34 -# fix math 1.35 export QT5PREFIX=/usr # or /opt/qt5 1.36 if [ "$QT5PREFIX" == '/usr' ]; then 1.37 QT5OPTS="\ 1.38 @@ -61,24 +60,24 @@ 1.39 " 1.40 fi 1.41 1.42 - echo "INCLUDEPATH += /usr/include/openssl-1.0" >> qtbase/src/network/network.pro 1.43 - export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' 1.44 - 1.45 - [ -s $SRC/$PATCH ] || wget -O $SRC/$PATCH $PATCH_URL$PATCH 1.46 - cd $src/qtdeclarative 1.47 - cp $SRC/$PATCH ./$PATCH 1.48 - patch -p1 -i $PATCH 1.49 - cd .. 1.50 - 1.51 - # Build qmake (and all following things with it) using existing CFLAGS and LDFLAGS 1.52 - sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 $CFLAGS -DQT_MATH_H_DEFINES_MACROS=1|" \ 1.53 - qtbase/mkspecs/common/gcc-base.conf 1.54 - sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 $LDFLAGS|" \ 1.55 - qtbase/mkspecs/common/g++-unix.conf 1.56 - 1.57 - # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417 1.58 - sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i \ 1.59 - qtbase/mkspecs/features/create_cmake.prf 1.60 +# echo "INCLUDEPATH += /usr/include/openssl-1.0" >> qtbase/src/network/network.pro 1.61 +# export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' 1.62 +# 1.63 +# [ -s $SRC/$PATCH ] || wget -O $SRC/$PATCH $PATCH_URL$PATCH 1.64 +# cd $src/qtdeclarative 1.65 +# cp $SRC/$PATCH ./$PATCH 1.66 +# patch -p1 -i $PATCH 1.67 +# cd .. 1.68 +# 1.69 +# # Build qmake (and all following things with it) using existing CFLAGS and LDFLAGS 1.70 +# sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 $CFLAGS -DQT_MATH_H_DEFINES_MACROS=1|" \ 1.71 +# qtbase/mkspecs/common/gcc-base.conf 1.72 +# sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 $LDFLAGS|" \ 1.73 +# qtbase/mkspecs/common/g++-unix.conf 1.74 +# 1.75 +# # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417 1.76 +# sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i \ 1.77 +# qtbase/mkspecs/features/create_cmake.prf 1.78 1.79 ./configure \ 1.80 -prefix $QT5PREFIX \