pesa 15/05/06 21:48:06 Modified: ChangeLog Added: qthelp-4.8.6-r3.ebuild Removed: qthelp-4.8.6-r2.ebuild Log: Properly fix building with USE=compat by teaching syncqt how to generate QtAssistant forwarding headers. Finally solves bug 529398. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.38 dev-qt/qthelp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.38&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.38&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?r1=1.37&r2=1.38 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ChangeLog 8 Mar 2015 14:01:23 -0000 1.37 +++ ChangeLog 6 May 2015 21:48:06 -0000 1.38 @@ -1,6 +1,15 @@ # ChangeLog for dev-qt/qthelp # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.37 2015/03/08 14:01:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.38 2015/05/06 21:48:06 pesa Exp $ + +*qthelp-4.8.6-r3 (06 May 2015) + + 06 May 2015; Davide Pesavento <[email protected]> + +files/qthelp-4.8.6-compat-install.patch, + +files/qthelp-4.8.6-compat-syncqt.patch, +qthelp-4.8.6-r3.ebuild, + -files/qthelp-4.8.6-fix-compat.patch, -qthelp-4.8.6-r2.ebuild: + Properly fix building with USE=compat by teaching syncqt how to generate + QtAssistant forwarding headers. Finally solves bug 529398. 08 Mar 2015; Davide Pesavento <[email protected]> qthelp-5.4.1.ebuild: Remove all keywords from "live" branch. 1.1 dev-qt/qthelp/qthelp-4.8.6-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild?rev=1.1&content-type=text/plain Index: qthelp-4.8.6-r3.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild,v 1.1 2015/05/06 21:48:06 pesa Exp $ EAPI=5 inherit qt4-build-multilib DESCRIPTION="The Help module for the Qt toolkit" SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )" if [[ ${QT4_BUILD_TYPE} == live ]]; then KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi IUSE="compat doc" DEPEND=" ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}] compat? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES=" tools/assistant/lib/fulltextsearch tools/assistant/lib tools/assistant/tools/qhelpgenerator tools/assistant/tools/qcollectiongenerator tools/assistant/tools/qhelpconverter tools/qdoc3" pkg_setup() { use compat && QT4_TARGET_DIRECTORIES+=" tools/assistant/compat tools/assistant/compat/lib" } src_unpack() { qt4-build-multilib_src_unpack # compat version # http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ if use compat; then mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die mv "${WORKDIR}"/QtAssistant "${S}"/include || die fi } src_prepare() { use compat && PATCHES+=( "${FILESDIR}/${PN}-4.8.6-compat-install.patch" "${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch" ) qt4-build-multilib_src_prepare # prevent rebuild of QtCore and QtXml (bug 348034) sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die } multilib_src_configure() { local myconf=( -system-libpng -system-libjpeg -system-zlib -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns -no-nas-sound -no-cups -no-nis -fontconfig ) qt4_multilib_src_configure } multilib_src_compile() { qt4_multilib_src_compile # release tarballs are shipped with prebuilt docs if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then # qhelpgenerator needs libQtHelp.so.4 export LD_LIBRARY_PATH=${BUILD_DIR}/lib export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework emake docs fi } multilib_src_install() { qt4_multilib_src_install if multilib_is_native_abi; then emake INSTALL_ROOT="${D}" install_qchdocs use doc && emake INSTALL_ROOT="${D}" install_htmldocs # do not compress .qch files docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch fi } multilib_src_install_all() { qt4_multilib_src_install_all if use compat; then insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features doins tools/assistant/compat/features/assistant.prf fi }
