diff options
| author |   Alex Alexander <wired@gentoo.org> | 2012-01-29 16:59:14 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2012-01-29 16:59:14 +0000 |
| commit | 4305ca592df1195cde7adc16b322cbe8b5eadf07 (patch) | |
| tree | c5b49fb54d2e970248fe09721c333d6262059d44 /x11-libs/qt-assistant/files | |
| parent | arm stable, bug #399319 (diff) | |
| download | gentoo-2-4305ca592df1195cde7adc16b322cbe8b5eadf07.tar.gz gentoo-2-4305ca592df1195cde7adc16b322cbe8b5eadf07.tar.bz2 gentoo-2-4305ca592df1195cde7adc16b322cbe8b5eadf07.zip | |
version bump
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-assistant/files')
| -rw-r--r-- | x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch | 59 |
1 files changed, 59 insertions, 0 deletions
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 |