From 3bd6c4b71ae74df3b5712aca6e974d22009afe46 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Tue, 30 Jul 2013 18:10:30 +0000 Subject: Properly fix bug 477316, also fixing bug 478034 that was caused by the ugly hacks in -r1. (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 17A85C72) --- dev-qt/qthelp/ChangeLog | 10 +- dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch | 21 ++++ dev-qt/qthelp/qthelp-4.8.5-r1.ebuild | 141 ---------------------- dev-qt/qthelp/qthelp-4.8.5-r2.ebuild | 127 +++++++++++++++++++ 4 files changed, 157 insertions(+), 142 deletions(-) create mode 100644 dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch delete mode 100644 dev-qt/qthelp/qthelp-4.8.5-r1.ebuild create mode 100644 dev-qt/qthelp/qthelp-4.8.5-r2.ebuild (limited to 'dev-qt') diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog index 3948f7af10e2..263f8b1abfdc 100644 --- a/dev-qt/qthelp/ChangeLog +++ b/dev-qt/qthelp/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-qt/qthelp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.9 2013/07/19 06:19:38 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.10 2013/07/30 18:10:30 pesa Exp $ + +*qthelp-4.8.5-r2 (30 Jul 2013) + + 30 Jul 2013; Davide Pesavento + +files/qthelp-4.8.5-fix-compat.patch, +qthelp-4.8.5-r2.ebuild, + -qthelp-4.8.5-r1.ebuild: + Properly fix bug 477316, also fixing bug 478034 that was caused by the ugly + hacks in -r1. *qthelp-4.8.5-r1 (19 Jul 2013) diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch new file mode 100644 index 000000000000..cc7621969991 --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch @@ -0,0 +1,21 @@ +--- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300 ++++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300 +@@ -14,6 +14,8 @@ + + PROJECTNAME = Assistant + ++DESTDIR = ../../../bin ++ + FORMS += helpdialog.ui \ + mainwindow.ui \ + tabbedbrowser.ui \ +@@ -59,6 +61,9 @@ + TARGET = Assistant_adp + } + ++target.path=$$[QT_INSTALL_BINS] ++INSTALLS += target ++ + TRANSLATIONS = translations/assistant_adp_de.ts \ + translations/assistant_adp_ja.ts \ + translations/assistant_adp_pl.ts \ diff --git a/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild deleted file mode 100644 index c9f90750e551..000000000000 --- a/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild,v 1.1 2013/07/19 06:19:38 patrick Exp $ - -EAPI=5 - -inherit eutils qt4-build - -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 - )" - -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux" -fi - -IUSE="compat doc" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - tools/assistant/lib/fulltextsearch - tools/assistant/lib - tools/assistant/tools/qhelpgenerator - tools/assistant/tools/qcollectiongenerator - tools/assistant/tools/qhelpconverter - tools/qdoc3" - QT4_EXTRACT_DIRECTORIES=" - demos - doc - examples - include - src - tools" - - qt4-build_pkg_setup -} - -src_unpack() { - qt4-build_src_unpack - - # compat version - # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ - if use compat; then - unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \ - qt-assistant-compat-headers-4.7.tar.gz - 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() { - qt4-build_src_prepare - - use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch - - # bug 348034 - sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die -} - -src_configure() { - 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-svg -no-webkit -no-xmlpatterns - -no-nas-sound -no-dbus -no-cups -no-nis -fontconfig" - - qt4-build_src_configure -} - -src_compile() { - # help libQtHelp find freshly built libQtCLucene (bug #289811) - export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" - export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" - - qt4-build_src_compile - - if use compat; then - # need to explicitly mangle this as we lack the toplevel makefiles - pushd . - cd src/plugins/accessible - "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" && make || die - cd ../../../tools/assistant/compat/lib - "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" && make || die - popd - fi - # ugly hack to build docs - "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die - - if use doc; then - emake docs - elif [[ ${QT4_BUILD_TYPE} == release ]]; then - # live ebuild cannot build qch_docs, it will build them through emake docs - emake qch_docs - fi -} - -src_install() { - qt4-build_src_install - if use compat; then - # need to explicitly mangle this as we lack the toplevel makefiles - pushd . - cd src/plugins/accessible && emake INSTALL_ROOT="${D}" install || die - cd ../../../tools/assistant/compat/lib && emake INSTALL_ROOT="${D}" install || die - popd - insinto /usr/include/qt4/ - doins -r include/QtAssistant - insinto /usr/include/qt4/QtAssistant/ - # this is rather confusing - doins -r tools/assistant/compat/lib/*.h || die - # collides with qtgui - rm "${D}"/usr/lib64/qt4/plugins/accessible/libqtaccessiblewidgets.so - fi - emake INSTALL_ROOT="${D}" install_qchdocs - - # do not compress .qch files - docompress -x "${QTDOCDIR}"/qch - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs - fi - - if use compat; then - insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features - doins tools/assistant/compat/features/assistant.prf - fi -} diff --git a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild new file mode 100644 index 000000000000..95678475231a --- /dev/null +++ b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild,v 1.1 2013/07/30 18:10:30 pesa Exp $ + +EAPI=5 + +inherit eutils qt4-build + +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 + )" + +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux" +fi + +IUSE="compat doc" + +DEPEND=" + ~dev-qt/qtcore-${PV}[aqua=,debug=] + ~dev-qt/qtgui-${PV}[aqua=,debug=] + ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite] + compat? ( + ~dev-qt/qtdbus-${PV}[aqua=,debug=] + sys-libs/zlib + ) +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + tools/assistant/lib/fulltextsearch + tools/assistant/lib + tools/assistant/tools/qhelpgenerator + tools/assistant/tools/qcollectiongenerator + tools/assistant/tools/qhelpconverter + tools/qdoc3" + QT4_EXTRACT_DIRECTORIES=" + demos + doc + examples + include + src + tools" + + use compat && QT4_TARGET_DIRECTORIES+=" + tools/assistant/compat + tools/assistant/compat/lib" + + qt4-build_pkg_setup +} + +src_unpack() { + qt4-build_src_unpack + + # compat version + # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ + if use compat; then + unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \ + qt-assistant-compat-headers-4.7.tar.gz + 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() { + qt4-build_src_prepare + + use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch + + # bug 348034 + sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die +} + +src_configure() { + 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-svg -no-webkit -no-xmlpatterns + -no-nas-sound -no-cups -no-nis -fontconfig" + + qt4-build_src_configure +} + +src_compile() { + # help libQtHelp find freshly built libQtCLucene (bug #289811) + export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" + export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" + + qt4-build_src_compile + + # ugly hack to build docs + "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die + + if use doc; then + emake docs + elif [[ ${QT4_BUILD_TYPE} == release ]]; then + # live ebuild cannot build qch_docs, it will build them through emake docs + emake qch_docs + fi +} + +src_install() { + qt4-build_src_install + + emake INSTALL_ROOT="${D}" install_qchdocs + + # do not compress .qch files + docompress -x "${QTDOCDIR}"/qch + + if use doc; then + emake INSTALL_ROOT="${D}" install_htmldocs + fi + + if use compat; then + insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features + doins tools/assistant/compat/features/assistant.prf + fi +} -- cgit v1.2.3-65-gdbad