Date: Tuesday, January 20, 2015 @ 09:10:13
Author: andrea
Revision: 229604
upgpkg: qt5 5.4.0-2
Fix sed rules to apply our {C,LD}FLAGS; we don't need staticlibs anymore
because of pacman 4.2
Modified:
qt5/trunk/PKGBUILD
----------+
PKGBUILD | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-20 05:15:47 UTC (rev 229603)
+++ PKGBUILD 2015-01-20 08:10:13 UTC (rev 229604)
@@ -27,7 +27,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -51,12 +51,15 @@
prepare() {
cd ${_pkgfqn}
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g"
qtbase/mkspecs/common/gcc-base.conf
+ # Build using Arch {C,LD}FLAGS
+ sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
+ qtbase/mkspecs/common/gcc-base.conf
+ sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
+ qtbase/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|' {} +
-
# There are still a lot of relative calls which need a workaround
mkdir "${srcdir}"/python2-path
ln -s /usr/bin/python2 "${srcdir}"/python2-path/python
@@ -69,8 +72,10 @@
export
LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}"
export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
+ # python2 workaround
export PATH="${srcdir}/python2-path:$PATH"
+ # FS#38796
[[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
@@ -95,12 +100,19 @@
make
- # Fix paths
- find "${QTDIR}" -name Makefile -exec sed -i
"s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
- find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i
"s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
- find "${QTDIR}" -name Makefile -exec sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
- find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
- sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g"
qtwebkit/Source/Makefile.api
+ # Fix docs build when qt is not installed
+ sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \
+ "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
+ find "${QTDIR}" -name Makefile \
+ -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
+ sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
+ "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
+ find "${QTDIR}" -name Makefile \
+ -exec sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
+ sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
+ qtwebkit/Source/Makefile.api
+ find "${QTDIR}" -name Makefile \
+ -exec sed -i
"s|/usr/lib/qt/bin/qmlplugindump|${QTDIR}/qtdeclarative/bin/qmlplugindump|g" {}
+
make docs
}
@@ -119,7 +131,6 @@
'libsm: xcb plugin'
'gtk2: GTK2 plugin')
conflicts=('qt')
- options=('staticlibs') #libQt5PlatformSupport builds static only
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT="${pkgdir}" install
