[SCM] qtbase packaging branch, experimental, updated. debian/5.10.0+dfsg-2-2-g9bf76c5

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 9bf76c5a8618db0b33d8f8e4be7aba01a76b05e2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Dec 7 19:17:46 2017 +0300

    Rename gnukfreebsd_cloexec.diff to gnukfreebsd_linker_warnings.diff.
    
    Add two more places where config tests are currently false positives.
---
 debian/changelog                                |  3 +++
 debian/patches/gnukfreebsd_cloexec.diff         | 16 -------------
 debian/patches/gnukfreebsd_linker_warnings.diff | 32 +++++++++++++++++++++++++
 debian/patches/series                           |  2 +-
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 774d540..e0bb8b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.10.0+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Rename gnukfreebsd_cloexec.diff to gnukfreebsd_linker_warnings.diff.
+    Add two more places where config tests are currently false positives.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Dec 2017 19:16:38 +0300
 
diff --git a/debian/patches/gnukfreebsd_cloexec.diff b/debian/patches/gnukfreebsd_cloexec.diff
deleted file mode 100644
index e97273a..0000000
--- a/debian/patches/gnukfreebsd_cloexec.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: catch linker warnings in cloexec test
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: https://codereview.qt-project.org/163214 (rejected)
-Bug: https://bugs.debian.org/827935
-Last-Update: 2017-09-23
-
---- 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/gnukfreebsd_linker_warnings.diff b/debian/patches/gnukfreebsd_linker_warnings.diff
new file mode 100644
index 0000000..78c9cde
--- /dev/null
+++ b/debian/patches/gnukfreebsd_linker_warnings.diff
@@ -0,0 +1,32 @@
+Description: catch linker warnings in some config tests
+ Without this, qmake wrongly thinks that the tests succeed, for example:
+ .
+ ./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
+ test config.corelib.tests.futimens succeeded
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://codereview.qt-project.org/163214 (rejected)
+Bug: https://bugs.debian.org/827935
+Last-Update: 2017-12-07
+
+--- a/config.tests/unix/futimens/futimens.pro
++++ b/config.tests/unix/futimens/futimens.pro
+@@ -4,3 +4,4 @@
+ # targets. This simplifies the logic at the call site dramatically, as it isn't
+ # strictly needed compared to futimes().
+ darwin: QMAKE_CXXFLAGS += -Werror=unguarded-availability
++QMAKE_LFLAGS += -Wl,--fatal-warnings
+--- a/config.tests/unix/getentropy/getentropy.pro
++++ b/config.tests/unix/getentropy/getentropy.pro
+@@ -1 +1,2 @@
+ SOURCES = getentropy.cpp
++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/series b/debian/patches/series
index 76aa7ce..f117e19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,7 @@ gnukfreebsd.diff
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 link_fbclient.diff
-gnukfreebsd_cloexec.diff
+gnukfreebsd_linker_warnings.diff
 armv4.diff
 nonlinux_utime.diff
 no_arc4random_buf.diff

-- 
qtbase packaging