[SCM] qtbase packaging branch, experimental, updated. debian/5.9.0+dfsg-1-8-g44f21ce

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Jun 30 21:53:07 UTC 2017


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

The following commit has been merged in the experimental branch:
commit 5c7cdaedb623c68c07ee3d73679da7e867affa28
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jun 30 23:30:25 2017 +0300

    Add a patch to fix ATSPI enablement condition.
---
 debian/changelog                        |  1 +
 debian/patches/fix_atspi_condition.diff | 16 ++++++++++++++++
 debian/patches/series                   |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c31d905..3c61d13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtbase-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
     It was needed only for 90qt5-opengl script, which we no longer ship.
   * Update symbols files from buildds’ logs.
   * Simplify debian/watch to track only stable releases.
+  * Add a patch to fix ATSPI enablement condition (fix_atspi_condition.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Jun 2017 13:48:28 +0300
 
diff --git a/debian/patches/fix_atspi_condition.diff b/debian/patches/fix_atspi_condition.diff
new file mode 100644
index 0000000..bf00925
--- /dev/null
+++ b/debian/patches/fix_atspi_condition.diff
@@ -0,0 +1,16 @@
+Description: fix accessibility-atspi-bridge enablement condition
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://codereview.qt-project.org/198987
+Last-Update: 2017-06-30
+
+--- a/src/gui/configure.json
++++ b/src/gui/configure.json
+@@ -434,7 +434,7 @@
+     "features": {
+         "accessibility-atspi-bridge": {
+             "label": "ATSPI Bridge",
+-            "condition": "features.accessibility && features.xcb && features.dbus && config.atspi",
++            "condition": "features.accessibility && features.xcb && features.dbus && libs.atspi",
+             "output": [ "privateFeature", "feature" ]
+         },
+         "angle": {
diff --git a/debian/patches/series b/debian/patches/series
index 50c9b07..08bb3b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-# Backported from upstream
+# Forwarded upstream.
+fix_atspi_condition.diff
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list