| 1 |
commit: 83c3cadf0bb3202448cf7a803a0139c34ff2b1a2 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 4 12:39:19 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 4 12:39:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=83c3cadf |
| 7 |
|
| 8 |
dev-qt/qtgui: backport patch from upstream fixing accessibility |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch | 37 ++++++++++++++++++++++++++++++ |
| 13 |
dev-qt/qtgui/qtgui-5.9.1.ebuild | 2 ++ |
| 14 |
2 files changed, 39 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch b/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..82acd839 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch |
| 21 |
@@ -0,0 +1,37 @@ |
| 22 |
+From: Bernhard Rosenkränzer <bero@××××××.org> |
| 23 |
+Date: Fri, 30 Jun 2017 15:39:01 +0000 (+0200) |
| 24 |
+Subject: Fix detection of AT-SPI |
| 25 |
+X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=386af91c57948b88ba98cb040430e4a3878e3e3b;hp=989b9da3007ff06c79ab7ee553acfce9177df5b6 |
| 26 |
+ |
| 27 |
+Fix detection of AT-SPI |
| 28 |
+ |
| 29 |
+Building qtbase 5.9.1 on Linux always results in a build with |
| 30 |
+accessibility support disabled. |
| 31 |
+ |
| 32 |
+The problem is that the config option for accessibility-atspi-bridge |
| 33 |
+checks for config.atspi, which isn't defined anywhere - it should |
| 34 |
+check for libs.atspi (which is set if pkg-config finds atspi-2) instead. |
| 35 |
+ |
| 36 |
+[ChangeLog][QtGui][Platform Specific Changes][Linux/XCB] |
| 37 |
+Fixed detection of AT-SPI, allowing accessibility support to be built |
| 38 |
+again. |
| 39 |
+ |
| 40 |
+Task-number: QTBUG-61731 |
| 41 |
+Change-Id: If3bd5dfccda40158c566f8507e34b6877b59b6fb |
| 42 |
+Reviewed-by: Frederik Gladhorn <frederik.gladhorn@××.io> |
| 43 |
+Reviewed-by: Bernhard Rosenkränzer <bero@××××××.ch> |
| 44 |
+--- |
| 45 |
+ |
| 46 |
+diff --git a/src/gui/configure.json b/src/gui/configure.json |
| 47 |
+index a2a78aa..ef7ba51 100644 |
| 48 |
+--- a/src/gui/configure.json |
| 49 |
++++ b/src/gui/configure.json |
| 50 |
+@@ -434,7 +434,7 @@ |
| 51 |
+ "features": { |
| 52 |
+ "accessibility-atspi-bridge": { |
| 53 |
+ "label": "ATSPI Bridge", |
| 54 |
+- "condition": "features.accessibility && features.xcb && features.dbus && config.atspi", |
| 55 |
++ "condition": "features.accessibility && features.xcb && features.dbus && libs.atspi", |
| 56 |
+ "output": [ "privateFeature", "feature" ] |
| 57 |
+ }, |
| 58 |
+ "angle": { |
| 59 |
|
| 60 |
diff --git a/dev-qt/qtgui/qtgui-5.9.1.ebuild b/dev-qt/qtgui/qtgui-5.9.1.ebuild |
| 61 |
index 53aa133b..3af03f98 100644 |
| 62 |
--- a/dev-qt/qtgui/qtgui-5.9.1.ebuild |
| 63 |
+++ b/dev-qt/qtgui/qtgui-5.9.1.ebuild |
| 64 |
@@ -71,6 +71,8 @@ PDEPEND=" |
| 65 |
ibus? ( app-i18n/ibus ) |
| 66 |
" |
| 67 |
|
| 68 |
+PATCHES=( "${FILESDIR}/${P}-atspi.patch" ) |
| 69 |
+ |
| 70 |
QT5_TARGET_SUBDIRS=( |
| 71 |
src/gui |
| 72 |
src/openglextensions |
Archives