[SCM] qtbase packaging branch, experimental, updated. debian/5.6.1+dfsg-2-4-g957b43b

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 957b43b1145c631893980f50538dda2162eb7aa2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jun 18 11:59:09 2016 +0300

    Refresh patches for the new release.
---
 debian/changelog                       | 1 +
 debian/patches/gnukfreebsd.diff        | 2 +-
 debian/patches/no_dbus_dependency.diff | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a84835c..a76221a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtbase-opensource-src (5.7.0+dfsg-1) UNRELEASED; urgency=medium
   * Drop debian/scripts/migrate-symbols.py, no longer needed.
   * Drop lib/fonts/* from excluded files, these are no longer shipped
     (since upstream commit c5ceabb9a1caf6b9).
+  * Refresh patches for the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jun 2016 11:38:32 +0300
 
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index 99a8f52..0ab6f72 100644
--- a/debian/patches/gnukfreebsd.diff
+++ b/debian/patches/gnukfreebsd.diff
@@ -157,7 +157,7 @@ Forwarded: no
 +#endif // QPLATFORMDEFS_H
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -184,6 +184,8 @@
+@@ -193,6 +193,8 @@
              deppath.name = PATH
          } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
              deppath.name = LD_LIBRARY_PATH
diff --git a/debian/patches/no_dbus_dependency.diff b/debian/patches/no_dbus_dependency.diff
index fe2c81a..736b893 100644
--- a/debian/patches/no_dbus_dependency.diff
+++ b/debian/patches/no_dbus_dependency.diff
@@ -6,9 +6,9 @@ Last-Update: 2015-12-29
 
 --- a/tests/auto/auto.pro
 +++ b/tests/auto/auto.pro
-@@ -33,10 +33,6 @@
+@@ -34,10 +34,6 @@
  # Disable the QtDBus tests if we can't connect to the session bus
- qtHaveModule(dbus) {
+ !cross_compile:qtHaveModule(dbus) {
      !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") {
 -        contains(QT_CONFIG, dbus-linked): \
 -            error("QtDBus is enabled but session bus is not available. Please check the installation.")
@@ -16,4 +16,4 @@ Last-Update: 2015-12-29
 -            warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.")
          SUBDIRS -= dbus
      }
- } else {
+ }

-- 
qtbase packaging