| 1 |
wired 12/01/29 16:59:14 |
| 2 |
|
| 3 |
Added: qt-assistant-4.8.0-install-fix.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qt-assistant-4.8.0-install-fix.patch |
| 16 |
=================================================================== |
| 17 |
fix qt-assistant-4.8.0 not installing |
| 18 |
|
| 19 |
gentoo bug #395067 |
| 20 |
https://bugs.gentoo.org/show_bug.cgi?id=395067 |
| 21 |
|
| 22 |
--- doc/doc.pri.org |
| 23 |
+++ doc/doc.pri |
| 24 |
@@ -17,11 +17,6 @@ |
| 25 |
COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt |
| 26 |
COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html |
| 27 |
|
| 28 |
-EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml |
| 29 |
-DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml |
| 30 |
-EXAMPLESMANIFESTTARGET = $$QT_BUILD_TREE/examples |
| 31 |
-DEMOSMANIFESTTARGET = $$QT_BUILD_TREE/demos |
| 32 |
- |
| 33 |
$$unixstyle { |
| 34 |
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 |
| 35 |
} else { |
| 36 |
@@ -30,18 +25,12 @@ |
| 37 |
COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\") |
| 38 |
COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\") |
| 39 |
COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\") |
| 40 |
- EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST, "/", "\\") |
| 41 |
- DEMOSMANIFEST = $$replace(DEMOSMANIFEST, "/", "\\") |
| 42 |
- EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET, "/", "\\") |
| 43 |
- DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET, "/", "\\") |
| 44 |
} |
| 45 |
ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf |
| 46 |
QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ |
| 47 |
linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ |
| 48 |
(cd $$QT_BUILD_TREE && \ |
| 49 |
$$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \ |
| 50 |
- $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTTARGET && \ |
| 51 |
- $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET && \ |
| 52 |
$$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ |
| 53 |
$$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \ |
| 54 |
$$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \ |
| 55 |
@@ -85,14 +74,6 @@ |
| 56 |
htmldocs.path = $$[QT_INSTALL_DOCS] |
| 57 |
htmldocs.CONFIG += no_check_exist directory |
| 58 |
|
| 59 |
-examplesmanifest.files = $$EXAMPLESMANIFEST |
| 60 |
-examplesmanifest.path = $$[QT_INSTALL_EXAMPLES] |
| 61 |
-examplesmanifest.CONFIG += no_check_exist directory |
| 62 |
- |
| 63 |
-demosmanifest.files = $$DEMOSMANIFEST |
| 64 |
-demosmanifest.path = $$[QT_INSTALL_DEMOS] |
| 65 |
-demosmanifest.CONFIG += no_check_exist directory |
| 66 |
- |
| 67 |
qchdocs.files= $$QT_BUILD_TREE/doc/qch |
| 68 |
qchdocs.path = $$[QT_INSTALL_DOCS] |
| 69 |
qchdocs.CONFIG += no_check_exist directory |
| 70 |
@@ -104,4 +85,4 @@ |
| 71 |
sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE)) |
| 72 |
|
| 73 |
QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP |
| 74 |
-INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest |
| 75 |
+INSTALLS += htmldocs qchdocs docimages |
Archives