[SCM] qtbase packaging branch, master, updated. debian/5.7.1-20161021+dfsg-6-3-g43ba797

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 43ba7974b765636eec8eb9fbad08781a33bd035d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Dec 7 11:40:52 2016 -0300

    Mark QPA symbols as private.
---
 debian/changelog                    |  4 ++++
 debian/patches/qpa_is_private.patch | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 41dc748..d464cc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtbase-opensource-src (5.7.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream final release.
   * Build with system libdouble-conversion library (closes: #845372).
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Mark QPA symbols as private with qpa_is_private.patch. This might get
+    solved upstream in the future (see the thread pointed in the patch).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 23 Nov 2016 15:19:37 +0300
 
 qtbase-opensource-src (5.7.1~20161021+dfsg-6) unstable; urgency=medium
diff --git a/debian/patches/qpa_is_private.patch b/debian/patches/qpa_is_private.patch
new file mode 100644
index 0000000..6c3b9fc
--- /dev/null
+++ b/debian/patches/qpa_is_private.patch
@@ -0,0 +1,37 @@
+Description: QPA is private, mark it's symbols as such.
+  QPA headers are still private stuff, even if lots of apps
+  needs them. This patch ensures that QPA's symbols are
+  then marked as such.
+Origin: vendor,http://lists.qt-project.org/pipermail/development/2016-December/028040.html
+
+---
+ mkspecs/features/qt_module.prf |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/mkspecs/features/qt_module.prf
++++ b/mkspecs/features/qt_module.prf
+@@ -197,12 +197,14 @@ android: CONFIG += qt_android_deps no_li
+     verscript = $${TARGET}.version
+     QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
+ 
++    private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
++
+     internal_module {
+         verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
+     } else {
+         verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
+                             "    qt_private_api_tag*;"
+-        for(header, SYNCQT.PRIVATE_HEADER_FILES): \
++        for(header, private_api_headers): \
+             verscript_content += "    @FILE:$${_PRO_FILE_PWD_}/$$header@"
+         verscript_content += "};"
+ 
+@@ -223,7 +225,7 @@ android: CONFIG += qt_android_deps no_li
+         verscriptprocess.name = linker version script ${QMAKE_FILE_BASE}
+         verscriptprocess.input = verscript_in
+         verscriptprocess.CONFIG += no_link target_predeps
+-        for(header, SYNCQT.PRIVATE_HEADER_FILES): \
++        for(header, private_api_headers): \
+             verscriptprocess.depends += $${_PRO_FILE_PWD_}/$$header
+         verscriptprocess.output = $$verscript
+         verscriptprocess.commands = perl $${PWD}/data/unix/findclasslist.pl < ${QMAKE_FILE_IN} > $@
diff --git a/debian/patches/series b/debian/patches/series
index 22dc365..2215a70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ remove_privacy_breachs.diff
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
 armv4.diff
+qpa_is_private.patch

-- 
qtbase packaging