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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit eac52d6fdfca0dc97174542261723061ca6730bf
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Dec 14 00:26:03 2016 -0300

    Revert "Mark QPA symbols as private."
    
    This reverts commit 43ba7974b765636eec8eb9fbad08781a33bd035d.
---
 debian/changelog                    |  4 ----
 debian/patches/qpa_is_private.patch | 37 -------------------------------------
 debian/patches/series               |  1 -
 3 files changed, 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2a3fe4..8a1e38f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,6 @@ qtbase-opensource-src (5.7.1+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * 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).
   * Remove a bogus double hostdatadir entry while configuring Qt. Thanks
     Nick Shaforostoff for the bug! (Closes: 847769).
 
diff --git a/debian/patches/qpa_is_private.patch b/debian/patches/qpa_is_private.patch
deleted file mode 100644
index 6c3b9fc..0000000
--- a/debian/patches/qpa_is_private.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 2215a70..22dc365 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@ remove_privacy_breachs.diff
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
 armv4.diff
-qpa_is_private.patch

-- 
qtbase packaging