diff options
| -rw-r--r-- | x11-libs/qt-assistant/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch | 59 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/metadata.xml | 3 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild | 146 |
4 files changed, 216 insertions, 2 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 601bf070bab2..0242c73ad2e4 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-assistant -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.116 2011/12/27 21:39:02 maekke Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.117 2012/01/29 16:59:14 wired Exp $ + +*qt-assistant-4.8.0 (29 Jan 2012) + + 29 Jan 2012; Alex Alexander <wired@gentoo.org> +qt-assistant-4.8.0.ebuild, + +files/qt-assistant-4.8.0-install-fix.patch, metadata.xml: + version bump 27 Dec 2011; Markus Meier <maekke@gentoo.org> qt-assistant-4.7.4.ebuild: x86 stable, bug #390963 diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch b/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch new file mode 100644 index 000000000000..f18f45e0190a --- /dev/null +++ b/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch @@ -0,0 +1,59 @@ +fix qt-assistant-4.8.0 not installing + +gentoo bug #395067 +https://bugs.gentoo.org/show_bug.cgi?id=395067 + +--- doc/doc.pri.org ++++ doc/doc.pri +@@ -17,11 +17,6 @@ + COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt + COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html + +-EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml +-DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml +-EXAMPLESMANIFESTTARGET = $$QT_BUILD_TREE/examples +-DEMOSMANIFESTTARGET = $$QT_BUILD_TREE/demos +- + $$unixstyle { + QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES + } else { +@@ -30,18 +25,12 @@ + COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\") + COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\") + COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\") +- EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST, "/", "\\") +- DEMOSMANIFEST = $$replace(DEMOSMANIFEST, "/", "\\") +- EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET, "/", "\\") +- DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET, "/", "\\") + } + ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf + QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ + linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ + (cd $$QT_BUILD_TREE && \ + $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \ +- $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTTARGET && \ +- $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET && \ + $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ + $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \ + $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \ +@@ -85,14 +74,6 @@ + htmldocs.path = $$[QT_INSTALL_DOCS] + htmldocs.CONFIG += no_check_exist directory + +-examplesmanifest.files = $$EXAMPLESMANIFEST +-examplesmanifest.path = $$[QT_INSTALL_EXAMPLES] +-examplesmanifest.CONFIG += no_check_exist directory +- +-demosmanifest.files = $$DEMOSMANIFEST +-demosmanifest.path = $$[QT_INSTALL_DEMOS] +-demosmanifest.CONFIG += no_check_exist directory +- + qchdocs.files= $$QT_BUILD_TREE/doc/qch + qchdocs.path = $$[QT_INSTALL_DOCS] + qchdocs.CONFIG += no_check_exist directory +@@ -104,4 +85,4 @@ + sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE)) + + QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP +-INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest ++INSTALLS += htmldocs qchdocs docimages diff --git a/x11-libs/qt-assistant/metadata.xml b/x11-libs/qt-assistant/metadata.xml index 8b96e26ce0e5..99d222518c8e 100644 --- a/x11-libs/qt-assistant/metadata.xml +++ b/x11-libs/qt-assistant/metadata.xml @@ -13,5 +13,8 @@ <flag name='trace'>Build the qttracereplay utility which is required to play drawings recorded with the trace graphicssystem engine</flag> <flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> + <flag name='webkit'>Build the WebView QML element</flag> + <flag name='c++0x'>Build Qt using the C++11 standard</flag> + <flag name='qpa'>Build a window system agnostic implementation of Qt</flag> </use> </pkgmetadata> diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild new file mode 100644 index 000000000000..25bcefae316a --- /dev/null +++ b/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild,v 1.1 2012/01/29 16:59:14 wired Exp $ + +EAPI="3" +if [[ ${PV} == 4*9999 ]]; then + ECLASS="-edge" +fi +inherit qt4-build${ECLASS} + +DESCRIPTION="The assistant help module for the Qt toolkit" +SLOT="4" +if [[ ${PV} != 4*9999 ]]; then + KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos" +else + KEYWORDS="" +fi +IUSE="compat doc +glib qt3support trace webkit" +SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )" + +DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?] + ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=,sqlite] + webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )" +RDEPEND="${DEPEND}" + +PATCHES=( + # bug 395067 + "${FILESDIR}/${P}-install-fix.patch" +) + +pkg_setup() { + # Pixeltool isn't really assistant related, but it relies on + # the assistant libraries. doc/qch/ + QT4_TARGET_DIRECTORIES=" + tools/assistant + tools/pixeltool + tools/qdoc3" + if [[ ${PV} != 4*9999 ]]; then + QT4_EXTRACT_DIRECTORIES=" + tools/ + demos/ + examples/ + src/ + include/ + doc/" + fi + + use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + tools/qttracereplay" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + ${QT4_EXTRACT_DIRECTORIES}" + + qt4-build${ECLASS}_pkg_setup +} + +src_unpack() { + qt4-build${ECLASS}_src_unpack + # compat version + # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ + if use compat; then + unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz + mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \ + "${S}"/tools/assistant/compat || + die "moving compat to the right place failed" + tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ || + die "unpacking the include files failed" + fi +} + +src_prepare() { + qt4-build${ECLASS}_src_prepare + if use compat; then + epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch + fi + sed -e "s/\(sub-qdoc3\.depends =\).*/\1/" \ + -i doc/doc.pri || die "patching qdoc3 depends failed" + # bug 401173 + ! use webkit && epatch "${FILESDIR}"/disable-webkit.patch +} + +src_configure() { + myconf="${myconf} -no-xkb -no-fontconfig -no-xrandr + -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon + -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility + -no-fontconfig -no-multimedia + -no-svg $(qt_use qt3support) $(qt_use webkit)" + ! use glib && myconf="${myconf} -no-glib" + + qt4-build${ECLASS}_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${ECLASS}_src_compile + + # ugly hack to build docs + cd "${S}" + qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die + # live ebuild cannot build qch_docs. It will build them through emake docs + if [[ ${PV} != 4*9999 ]]; then + emake qch_docs || die "emake qch_docs failed " + fi + if use doc; then + emake docs || die "emake docs failed" + fi + qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die +} + +src_install() { + qt4-build${ECLASS}_src_install + cd "${S}" + #see src_compile note + if [[ ${PV} != 4*9999 ]]; then + emake INSTALL_ROOT="${D}" install_qchdocs \ + || die "failed to install qch docs" + fi + if use doc; then + emake INSTALL_ROOT="${D}" install_htmldocs \ + || die "failed to install htmldocs" + # Now it is time for the live ebuild to install the qch docs + if [[ ${PV} == 4*9999 ]]; then + emake INSTALL_ROOT="${D}" install_qchdocs \ + || die "failed to install qch docs" + fi + fi + dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3" + # install correct assistant icon, bug 241208 + dodir /usr/share/pixmaps/ || die "dodir failed" + insinto /usr/share/pixmaps/ + doins tools/assistant/tools/assistant/images/assistant.png || + die "doins failed" + # Note: absolute image path required here! + make_desktop_entry assistant Assistant \ + "${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \ + || die "make_desktop_entry failed" + + if use compat; then + insinto /usr/share/qt4/mkspecs/features || die "insinto failed" + doins tools/assistant/compat/features/assistant.prf || die "doins failed" + fi +} |