[SCM] qtbase packaging branch, experimental, updated. debian/5.9.1+dfsg-10-3-g040fae7

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 040fae7090ac7f75281a4f9ea15e17272e150af4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 23 23:39:53 2017 +0300

    Port other patches.
---
 debian/changelog                        |  1 +
 debian/patches/gnukfreebsd_cloexec.diff | 22 ++++++++++++----------
 debian/patches/link_fbclient.diff       |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0267e85..74aee8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.9.2+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Drop fix_atspi_condition.diff, it was coming from upstream.
+  * Port gnukfreebsd_cloexec.diff to new upstream code.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Sep 2017 23:28:13 +0300
 
diff --git a/debian/patches/gnukfreebsd_cloexec.diff b/debian/patches/gnukfreebsd_cloexec.diff
index 6ff7c63..e97273a 100644
--- a/debian/patches/gnukfreebsd_cloexec.diff
+++ b/debian/patches/gnukfreebsd_cloexec.diff
@@ -1,14 +1,16 @@
 Description: catch linker warnings in cloexec test
 Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: https://codereview.qt-project.org/163214
+Forwarded: https://codereview.qt-project.org/163214 (rejected)
 Bug: https://bugs.debian.org/827935
-Last-Update: 2016-06-23
+Last-Update: 2017-09-23
 
---- a/config.tests/unix/cloexec/cloexec.pro
-+++ b/config.tests/unix/cloexec/cloexec.pro
-@@ -1,3 +1,5 @@
- SOURCES = cloexec.cpp
- CONFIG -= qt
- QT =
-+
-+QMAKE_LFLAGS += -Wl,--fatal-warnings
+--- a/src/corelib/configure.json
++++ b/src/corelib/configure.json
+@@ -236,6 +236,7 @@
+             "label": "O_CLOEXEC",
+             "type": "compile",
+             "test": {
++                "qmake": "QMAKE_LFLAGS += -Wl,--fatal-warnings",
+                 "head": "#define _GNU_SOURCE 1",
+                 "include": [ "sys/types.h", "sys/socket.h", "fcntl.h", "unistd.h" ],
+                 "main": [
diff --git a/debian/patches/link_fbclient.diff b/debian/patches/link_fbclient.diff
index 02cba5b..cbc1ecd 100644
--- a/debian/patches/link_fbclient.diff
+++ b/debian/patches/link_fbclient.diff
@@ -6,8 +6,8 @@ Last-Update: 2017-06-30
 
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
-@@ -50,7 +50,7 @@
-             "test": "unix/ibase",
+@@ -54,7 +54,7 @@
+             },
              "sources": [
                  { "libs": "-lgds32_ms", "condition": "config.win32" },
 -                { "libs": "-lgds", "condition": "!config.win32" }

-- 
qtbase packaging