[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-259-g27e3221

[Simon Quigley]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=2dec545

The following commit has been merged in the ubuntu+1 branch:
commit 2dec545e998b51502d688d83dfe9dd1fe73dde79
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sun Jun 11 19:14:15 2017 -0500

    Revert "Change build deps from 5.8.0 to 5.7.1 because 5.8.0 never made it in Ubuntu."
    
    That was set to 5.8.0 for a reason, and this commit also adds a patch addressing that.
---
 debian/changelog                                   |  5 +-
 debian/control                                     |  4 +-
 .../revert-automatic-code-attribution-docs.patch   | 70 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78c4931..6b4f7cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ qtbase-opensource-src (5.9.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
     - armv4.diff
     - xcb-Fix-drag-and-drop-to-Emacs.patch
     - xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
-  * Change build deps from 5.8.0 to 5.7.1 because 5.8.0 never made it in
-    Ubuntu.
+  * Add revert-automatic-code-attribution-docs.patch which reverts a
+    commit from upstream because it requires a tool introduced in a Qt
+    Tools version (5.8) that Ubuntu skipped.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 08 Jun 2017 13:48:28 +0300
 
diff --git a/debian/control b/debian/control
index 84bffff..48f75eb 100644
--- a/debian/control
+++ b/debian/control
@@ -65,8 +65,8 @@ Build-Depends: debhelper (>= 9.20160114~),
                unixodbc-dev,
                xvfb,
                zlib1g-dev
-Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.1+dfsg~) <!nodoc>,
-                     qttools5-dev-tools (>= 5.7.1~) <!nodoc>
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.8.0+dfsg~) <!nodoc>,
+                     qttools5-dev-tools (>= 5.8.0~) <!nodoc>
 Standards-Version: 3.9.8
 Homepage: http://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtbase.git
diff --git a/debian/patches/revert-automatic-code-attribution-docs.patch b/debian/patches/revert-automatic-code-attribution-docs.patch
new file mode 100644
index 0000000..d26f793
--- /dev/null
+++ b/debian/patches/revert-automatic-code-attribution-docs.patch
@@ -0,0 +1,70 @@
+commit f5b46f59524cae0b2ee5dc577c75c3d2cdd76ab9
+Author: Simon Quigley <tsimonq2 at ubuntu.com>
+Date:   Sun Jun 11 19:04:52 2017 -0500
+
+    Revert "Automatically generate code attribution documentation"
+    
+    This commit needed to be reverted in order to build qtbase because the
+    automatic generation tool it uses in this commit is only available in Qt
+    Tools 5.8 and over, which Ubuntu does not have.
+    
+    This patch can be removed once Qt Tools 5.9.0 has landed in Ubuntu
+    Artful.
+
+diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf
+index a18396876d..bb7ffa8f45 100644
+--- a/doc/global/config.qdocconf
++++ b/doc/global/config.qdocconf
+@@ -10,7 +10,7 @@ dita.metadata.default.audience = programmer
+ #Set the main Qt index.html
+ navigation.homepage = "Qt $QT_VER"
+ 
+-sourcedirs += includes $$BUILDDIR
++sourcedirs += includes
+ 
+ url = http://doc.qt.io/qt-5
+ 
+diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
+index 72dde61a40..183d0c9502 100644
+--- a/mkspecs/features/qt_docs.prf
++++ b/mkspecs/features/qt_docs.prf
+@@ -21,16 +21,12 @@ qtvertag.name = QT_VERSION_TAG
+ qtvertag.value = $$replace(qtver.value, \.,)
+ qtdocs.name = QT_INSTALL_DOCS
+ qtdocs.value = $$[QT_INSTALL_DOCS/src]
+-builddir.name = BUILDDIR
+-builddir.value = $$OUT_PWD
+-QT_TOOL_ENV = qtver qtmver qtvertag qtdocs builddir
++QT_TOOL_ENV = qtver qtmver qtvertag qtdocs
+ qtPrepareTool(QDOC, qdoc)
+ QT_TOOL_ENV =
+ 
+ !build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
+ 
+-qtPrepareTool(QTATTRIBUTIONSSCANNER, qtattributionsscanner)
+-
+ # qtPrepareTool() must be called outside a build pass, as it protects
+ # against concurrent wrapper creation by omitting it during build passes.
+ # However, creating the actual targets is reserved to the build passes.
+@@ -67,21 +63,12 @@ DOC_INDEXES =
+         PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
+     DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
+ }
+-
+-qtattributionsscanner.target = qtattributionsscanner
+-qtattributionsscanner.commands = $$QTATTRIBUTIONSSCANNER $$shell_quote($$MODULE_BASE_INDIR) \
+-    --filter "QDocModule=$$QMAKE_DOCS_TARGET" -o $$shell_quote($$OUT_PWD/codeattributions.qdoc)
+-qtattributionsscanner.CONFIG += phony
+-QMAKE_EXTRA_TARGETS += qtattributionsscanner
+-
+ doc_command = $$QDOC $$QMAKE_DOCS
+ prepare_docs {
+     prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors
+     generate_docs.commands += $$doc_command -generate $$DOC_INDEXES
+-    prepare_docs.depends += qtattributionsscanner
+ } else {
+     html_docs.commands += $$doc_command $$DOC_INDEXES
+-    html_docs.depends += qtattributionsscanner
+ }
+ 
+ !build_online_docs {
diff --git a/debian/patches/series b/debian/patches/series
index 28a8e9f..8d53e2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ armv4.diff
 
 # Ubuntu specific.
 #enable-tests.patch
+revert-automatic-code-attribution-docs.patch

-- 
qtbase packaging