[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+dfsg-3-5-g22aab82

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=22aab82

The following commit has been merged in the master branch:
commit 22aab82dbea98308a7224d990757c9e9e48ae780
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Aug 28 00:08:01 2013 -0300

    Build the documentation as offline.
---
 debian/changelog                              |    3 +++
 debian/patches/qtdoc-build-offline-docs.patch |   22 ++++++++++++++++++++++
 debian/patches/series                         |    1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 171e09f..debc2e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qt4-x11 (4:4.8.5+dfsg-4) UNRELEASED; urgency=low
   * Fix typo in libqt4-opengl-dev dependencies (Closes: #720302).
   * Fix broken symlink to use the system's jquery javascript library
     (Closes: #720950).
+  * Apply qtdoc-build-offline-docs.patch to build documentation as offline.
+    This means the searchbox will not be available, but it wasn't functional
+    after all (Closes: #721111).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 26 Aug 2013 13:29:53 -0300
 
diff --git a/debian/patches/qtdoc-build-offline-docs.patch b/debian/patches/qtdoc-build-offline-docs.patch
new file mode 100644
index 0000000..81dfb06
--- /dev/null
+++ b/debian/patches/qtdoc-build-offline-docs.patch
@@ -0,0 +1,22 @@
+Author: Roland Hieber <rohieb at rohieb.name>
+Subject: Build HTML documentation suited for offline usage
+
+Currently, the generated documentation includes a search box which relies on an
+external search service, and which does not work for local usage. Therefore, the
+generated search box does not work and confuses users, so it is best to build
+the documentation in offline format which does not include the search box, but
+does also not confuse users.
+
+Index: qt4-x11-4.8.5+dfsg/doc/doc.pri
+===================================================================
+--- qt4-x11-4.8.5+dfsg.orig/doc/doc.pri	2013-06-07 07:16:49.000000000 +0200
++++ qt4-x11-4.8.5+dfsg/doc/doc.pri	2013-08-26 16:49:44.000000000 +0200
+@@ -35,7 +35,7 @@
+     EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET,  "/", "\")
+     DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET,  "/", "\")
+ }
+-ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
++ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf
+ DITA_DOCS_QDOCCONF_FILE = qt-ditaxml.qdocconf
+ QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
+                     linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
diff --git a/debian/patches/series b/debian/patches/series
index bb3af16..286d023 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,4 @@ add_missing_method_for_QBasicAtomicPointer_on_s390.patch
 no_libicu_message.diff
 QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
 qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
+qtdoc-build-offline-docs.patch

-- 
Qt 4 packaging