diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2017-02-16 11:18:23 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2017-02-16 11:18:23 +0300 |
| commit | c025dd4a48187f56a0f0740736113a566109920e (patch) | |
| tree | 992cc91a7237e8f5f89a3c18d3d1dbb6abfabf1f | |
| parent | 1dc752132886cd603266a263ecaa6f41020689f7 (diff) | |
| download | qtbase-c025dd4a48187f56a0f0740736113a566109920e.tar.gz | |
Drop no_dbus_dependency.diff.
We do not run tests so it is not needed.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/no_dbus_dependency.diff | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index 71746cb..f3e593b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qtbase-opensource-src (5.8.0+dfsg-3) UNRELEASED; urgency=medium * Mark hurd_tilde.diff as applied upstream. * Replace qvncscreen_semicolon.diff with a more complete patch from Shawn Rutledge (vnc_big_endian.diff). + * Drop no_dbus_dependency.diff. We do not run tests so it is not needed. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 16 Feb 2017 10:51:02 +0300 diff --git a/debian/patches/no_dbus_dependency.diff b/debian/patches/no_dbus_dependency.diff deleted file mode 100644 index a1db8a9..0000000 --- a/debian/patches/no_dbus_dependency.diff +++ /dev/null @@ -1,22 +0,0 @@ -Description: do not fail when D-Bus is not available on configure time - According to comments in https://codereview.qt-project.org/125499, this check - will be dropped before the final Qt 5.6 release. - . - According to comments in https://codereview.qt-project.org/174643, upstream - have changed their mind since then. -Author: Dmitry Shachnev <mitya57@debian.org> -Last-Update: 2017-01-24 - ---- a/tests/auto/auto.pro -+++ b/tests/auto/auto.pro -@@ -34,10 +34,6 @@ - # Disable the QtDBus tests if we can't connect to the session bus - !cross_compile:qtHaveModule(dbus) { - !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") { -- qtConfig(dbus-linked): \ -- error("QtDBus is enabled but session bus is not available. Please check the installation.") -- else: \ -- warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.") - SUBDIRS -= dbus - } - } diff --git a/debian/patches/series b/debian/patches/series index 1f330aa..120b00b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,7 +7,6 @@ hurd_tilde.diff vnc_big_endian.diff # Debian specific. -no_dbus_dependency.diff gnukfreebsd.diff no_htmlinfo_example.diff remove_privacy_breachs.diff |