Skip to content
Snippets Groups Projects
Commit 5ca80abd authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

upgrel : 5.11.0-3

parent 22745be2
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ pkgbase=qt5-base ...@@ -7,7 +7,7 @@ pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers) pkgname=(qt5-base qt5-xcb-private-headers)
_qtver=5.11.0 _qtver=5.11.0
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=2 pkgrel=3
arch=(x86_64) arch=(x86_64)
url='http://qt-project.org/' url='http://qt-project.org/'
license=('GPL3' 'LGPL3' 'FDL' 'custom') license=('GPL3' 'LGPL3' 'FDL' 'custom')
...@@ -43,10 +43,7 @@ prepare() { ...@@ -43,10 +43,7 @@ prepare() {
sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
mkspecs/common/g++-unix.conf mkspecs/common/g++-unix.conf
# Use python2 for Python 2.x
find . -name '*.py' -exec sed -i \
's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
# Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417 # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
patch -p1 -i ../qt-private-includes.patch patch -p1 -i ../qt-private-includes.patch
...@@ -55,13 +52,10 @@ prepare() { ...@@ -55,13 +52,10 @@ prepare() {
build() { build() {
cd ${_pkgfqn} cd ${_pkgfqn}
# FS#38796
#[[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
echo "INCLUDEPATH += /usr/include/openssl-1.0" >> src/network/network.pro echo "INCLUDEPATH += /usr/include/openssl-1.0" >> src/network/network.pro
export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \ ./configure -confirm-license -opensource -v \
-prefix /usr \ -prefix /usr \
-docdir /usr/share/doc/qt \ -docdir /usr/share/doc/qt \
-headerdir /usr/include/qt \ -headerdir /usr/include/qt \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment