diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2017-09-23 23:39:53 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2017-09-23 23:39:53 +0300 |
| commit | 040fae7090ac7f75281a4f9ea15e17272e150af4 (patch) | |
| tree | b32965460e049010f701279acbd7d7c5b0652b0c | |
| parent | 496ca1beab8c31a1366df63a5c6b24d3f15098e9 (diff) | |
| download | qtbase-040fae7090ac7f75281a4f9ea15e17272e150af4.tar.gz | |
Port other patches.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/gnukfreebsd_cloexec.diff | 22 | ||||
| -rw-r--r-- | 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@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@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" } |