summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2017-06-30 23:30:25 +0300
committerDmitry Shachnev <mitya57@gmail.com>2017-06-30 23:30:25 +0300
commit5c7cdaedb623c68c07ee3d73679da7e867affa28 (patch)
tree5df2bb6190d16b429c28b6708de1eb8ff8dfda46
parent0110c71c75220b4bf3c2ad2fb54839f0bac7a2a8 (diff)
downloadqtbase-5c7cdaedb623c68c07ee3d73679da7e867affa28.tar.gz
Add a patch to fix ATSPI enablement condition.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/fix_atspi_condition.diff16
-rw-r--r--debian/patches/series3
3 files changed, 19 insertions, 1 deletions
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@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@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