From 24f672156bf661a8ea65e71f8e5cb7939c357739 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Sat, 22 Oct 2016 18:35:56 +0200 Subject: [PATCH] qt5-doc: update to 5.6.2 Enable cross building with qt5-host-tools. --- srcpkgs/qt5-doc/template | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/srcpkgs/qt5-doc/template b/srcpkgs/qt5-doc/template index fc045eae9c4..fa5849851bd 100644 --- a/srcpkgs/qt5-doc/template +++ b/srcpkgs/qt5-doc/template @@ -1,32 +1,33 @@ # Template file for 'qt5-doc' pkgname=qt5-doc -version=5.6.1 +version=5.6.2 revision=1 -_patch=-1 wrksrc="qt-everywhere-opensource-src-${version}" -hostmakedepends="python perl pkg-config qt5 qt5-tools qt5-qmake qt5-plugin-sqlite" -makedepends="qt5-devel qt5-tools-devel" +hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools qt5-plugin-sqlite + libxcb-devel" +makedepends="libxcb-devel qt5-devel qt5-tools-devel" depends="qt5>=5.6.0 qt5-plugin-sqlite" -nocross=yes homepage="http://qt.io/" short_desc="A cross-platform application and UI framework (QT5) - Documentation" maintainer="Juan RP " license="GPL-3, LGPL-2.1" -distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}${_patch}/single/qt-everywhere-opensource-src-${version}${_patch}.tar.xz" -checksum=ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-opensource-src-${version}.tar.xz" +checksum=83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3 post_extract() { # The file /usr/include/qt5/QtCore/qconfig.h is expected # to reside in src/corelib/global/qconfig.h as well ln -s /usr/include/qt5/QtCore/qconfig.h ${wrksrc}/qtbase/src/corelib/global/ + # Tools are expected to be found in qttools/bin + rm -rf qttools/bin + ln -sf /usr/lib/qt5/bin qttools/ + # Plugins are expected to be found in qttools/plugins + rm -rf qttools/plugins + ln -sf /usr/lib/qt5/plugins qttools/ } do_build() { export LD="$CXX" unset CPP AR AS RANLIB - # Tools are expected to be found in qttools/bin - ln -sf /usr/lib/qt5/bin qttools/ - # Some binaries are expected to be found in qtbase/bin - ln -sf /usr/lib/qt5/bin/{rcc,uic,moc} qtbase/bin/ ./configure -confirm-license -opensource \ -prefix /usr \ @@ -39,7 +40,9 @@ do_build() { -importdir /usr/lib/qt5/imports \ -translationdir /usr/share/qt5/translations \ -examplesdir /usr/share/qt5/examples \ - -archdatadir /usr/lib/qt5 -qt-xcb + -archdatadir /usr/lib/qt5 \ + -nomake examples \ + -qt-xcb make ${makejobs} docs }