* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-declarative/, x11-libs/qt-opengl/, x11-libs/qt-webkit/, eclass/, ...
@ 2013-02-16 9:59 Davide Pesavento
0 siblings, 0 replies; only message in thread
From: Davide Pesavento @ 2013-02-16 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 2ac37e3882ca2fd89c82c1456cd9defae2487c39
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Feb 16 09:56:37 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 09:56:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2ac37e38
[Qt5] Always enable accessibility support, as recommended by upstream.
In >qt-gui-5.0.1, make USE=accessibility control the accessibility-atspi-bridge feature.
---
eclass/qt5-build.eclass | 5 ++++-
.../qt-declarative/qt-declarative-5.0.1.ebuild | 6 +++---
.../qt-declarative/qt-declarative-5.0.9999.ebuild | 6 +++---
.../qt-declarative/qt-declarative-5.9999.ebuild | 6 +++---
x11-libs/qt-gui/qt-gui-5.0.1.ebuild | 4 +---
x11-libs/qt-gui/qt-gui-5.0.9999.ebuild | 7 +++----
x11-libs/qt-gui/qt-gui-5.9999.ebuild | 7 +++----
x11-libs/qt-opengl/qt-opengl-5.0.1.ebuild | 1 -
x11-libs/qt-opengl/qt-opengl-5.0.9999.ebuild | 1 -
x11-libs/qt-opengl/qt-opengl-5.9999.ebuild | 1 -
x11-libs/qt-webkit/qt-webkit-5.0.1.ebuild | 6 +++---
x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild | 6 +++---
x11-libs/qt-webkit/qt-webkit-5.9999.ebuild | 6 +++---
x11-libs/qt-widgets/qt-widgets-5.0.1.ebuild | 11 ++---------
x11-libs/qt-widgets/qt-widgets-5.0.9999.ebuild | 11 ++---------
x11-libs/qt-widgets/qt-widgets-5.9999.ebuild | 11 ++---------
16 files changed, 35 insertions(+), 60 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 93ef523..652b707 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -394,6 +394,10 @@ qt5_base_configure() {
# build shared libraries
-shared
+ # disabling accessibility support is not recommended by upstream,
+ # as it will break QStyle and may break other internal parts of Qt
+ -accessibility
+
# use pkg-config to detect include and library paths
-pkg-config
@@ -432,7 +436,6 @@ qt5_base_configure() {
# disable gtkstyle because it adds qt4 include paths to the compiler
# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
- # TODO: fix properly in qt-widgets
-no-gtkstyle
# module-specific options
diff --git a/x11-libs/qt-declarative/qt-declarative-5.0.1.ebuild b/x11-libs/qt-declarative/qt-declarative-5.0.1.ebuild
index 2da8182..1f43848 100644
--- a/x11-libs/qt-declarative/qt-declarative-5.0.1.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-5.0.1.ebuild
@@ -14,18 +14,18 @@ else
KEYWORDS="~amd64"
fi
-IUSE="+accessibility localstorage"
+IUSE="localstorage"
# TODO: easingcurveeditor|qmlscene? ( qt-widgets )
# TODO: xml? ( qt-xmlpatterns )
DEPEND="
~x11-libs/qt-core-${PV}[debug=]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=,opengl]
+ ~x11-libs/qt-gui-${PV}[debug=,opengl]
~x11-libs/qt-jsbackend-${PV}[debug=]
~x11-libs/qt-network-${PV}[debug=]
~x11-libs/qt-test-${PV}[debug=]
- ~x11-libs/qt-widgets-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-widgets-${PV}[debug=]
localstorage? ( ~x11-libs/qt-sql-${PV}[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-declarative/qt-declarative-5.0.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-5.0.9999.ebuild
index 2da8182..1f43848 100644
--- a/x11-libs/qt-declarative/qt-declarative-5.0.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-5.0.9999.ebuild
@@ -14,18 +14,18 @@ else
KEYWORDS="~amd64"
fi
-IUSE="+accessibility localstorage"
+IUSE="localstorage"
# TODO: easingcurveeditor|qmlscene? ( qt-widgets )
# TODO: xml? ( qt-xmlpatterns )
DEPEND="
~x11-libs/qt-core-${PV}[debug=]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=,opengl]
+ ~x11-libs/qt-gui-${PV}[debug=,opengl]
~x11-libs/qt-jsbackend-${PV}[debug=]
~x11-libs/qt-network-${PV}[debug=]
~x11-libs/qt-test-${PV}[debug=]
- ~x11-libs/qt-widgets-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-widgets-${PV}[debug=]
localstorage? ( ~x11-libs/qt-sql-${PV}[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-declarative/qt-declarative-5.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-5.9999.ebuild
index 2da8182..1f43848 100644
--- a/x11-libs/qt-declarative/qt-declarative-5.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-5.9999.ebuild
@@ -14,18 +14,18 @@ else
KEYWORDS="~amd64"
fi
-IUSE="+accessibility localstorage"
+IUSE="localstorage"
# TODO: easingcurveeditor|qmlscene? ( qt-widgets )
# TODO: xml? ( qt-xmlpatterns )
DEPEND="
~x11-libs/qt-core-${PV}[debug=]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=,opengl]
+ ~x11-libs/qt-gui-${PV}[debug=,opengl]
~x11-libs/qt-jsbackend-${PV}[debug=]
~x11-libs/qt-network-${PV}[debug=]
~x11-libs/qt-test-${PV}[debug=]
- ~x11-libs/qt-widgets-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-widgets-${PV}[debug=]
localstorage? ( ~x11-libs/qt-sql-${PV}[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-gui/qt-gui-5.0.1.ebuild b/x11-libs/qt-gui/qt-gui-5.0.1.ebuild
index 63692ac..f13d9a4 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.1.ebuild
@@ -71,7 +71,6 @@ QT5_TARGET_SUBDIRS=(
pkg_setup() {
QCONFIG_ADD="
- $(usev accessibility)
$(usev egl)
$(usev eglfs)
$(usev evdev)
@@ -82,7 +81,7 @@ pkg_setup() {
$(use udev && echo libudev)
$(usev xcb)"
- QCONFIG_DEFINE="$(use accessibility || echo QT_NO_ACCESSIBILITY)
+ QCONFIG_DEFINE="
$(use egl && echo QT_EGL)
$(use eglfs && echo QT_EGLFS)
$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
@@ -104,7 +103,6 @@ src_configure() {
fi
local myconf=(
- $(qt_use accessibility)
${dbus}
$(qt_use egl)
$(qt_use eglfs)
diff --git a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
index 63692ac..fe5e056 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
@@ -16,7 +16,7 @@ fi
# TODO: directfb, linuxfb, ibus
-IUSE="+accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
REQUIRED_USE="
egl? ( gles2 )
eglfs? ( egl evdev )
@@ -71,7 +71,7 @@ QT5_TARGET_SUBDIRS=(
pkg_setup() {
QCONFIG_ADD="
- $(usev accessibility)
+ $(use accessibility && echo accessibility-atspi-bridge)
$(usev egl)
$(usev eglfs)
$(usev evdev)
@@ -82,7 +82,7 @@ pkg_setup() {
$(use udev && echo libudev)
$(usev xcb)"
- QCONFIG_DEFINE="$(use accessibility || echo QT_NO_ACCESSIBILITY)
+ QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
$(use egl && echo QT_EGL)
$(use eglfs && echo QT_EGLFS)
$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
@@ -104,7 +104,6 @@ src_configure() {
fi
local myconf=(
- $(qt_use accessibility)
${dbus}
$(qt_use egl)
$(qt_use eglfs)
diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 63692ac..fe5e056 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -16,7 +16,7 @@ fi
# TODO: directfb, linuxfb, ibus
-IUSE="+accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
REQUIRED_USE="
egl? ( gles2 )
eglfs? ( egl evdev )
@@ -71,7 +71,7 @@ QT5_TARGET_SUBDIRS=(
pkg_setup() {
QCONFIG_ADD="
- $(usev accessibility)
+ $(use accessibility && echo accessibility-atspi-bridge)
$(usev egl)
$(usev eglfs)
$(usev evdev)
@@ -82,7 +82,7 @@ pkg_setup() {
$(use udev && echo libudev)
$(usev xcb)"
- QCONFIG_DEFINE="$(use accessibility || echo QT_NO_ACCESSIBILITY)
+ QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
$(use egl && echo QT_EGL)
$(use eglfs && echo QT_EGLFS)
$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
@@ -104,7 +104,6 @@ src_configure() {
fi
local myconf=(
- $(qt_use accessibility)
${dbus}
$(qt_use egl)
$(qt_use eglfs)
diff --git a/x11-libs/qt-opengl/qt-opengl-5.0.1.ebuild b/x11-libs/qt-opengl/qt-opengl-5.0.1.ebuild
index 9a4a5d8..5df1fdd 100644
--- a/x11-libs/qt-opengl/qt-opengl-5.0.1.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-5.0.1.ebuild
@@ -31,7 +31,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- -accessibility
$(qt_use egl)
-opengl
)
diff --git a/x11-libs/qt-opengl/qt-opengl-5.0.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-5.0.9999.ebuild
index 9a4a5d8..5df1fdd 100644
--- a/x11-libs/qt-opengl/qt-opengl-5.0.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-5.0.9999.ebuild
@@ -31,7 +31,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- -accessibility
$(qt_use egl)
-opengl
)
diff --git a/x11-libs/qt-opengl/qt-opengl-5.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-5.9999.ebuild
index 9a4a5d8..5df1fdd 100644
--- a/x11-libs/qt-opengl/qt-opengl-5.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-5.9999.ebuild
@@ -31,7 +31,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- -accessibility
$(qt_use egl)
-opengl
)
diff --git a/x11-libs/qt-webkit/qt-webkit-5.0.1.ebuild b/x11-libs/qt-webkit/qt-webkit-5.0.1.ebuild
index c53f2df..26bb41b 100644
--- a/x11-libs/qt-webkit/qt-webkit-5.0.1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-5.0.1.ebuild
@@ -19,7 +19,7 @@ fi
# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
# FIXME: tons of automagic deps
-IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
+IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
RDEPEND="
dev-db/sqlite
@@ -32,7 +32,7 @@ RDEPEND="
x11-libs/libXcomposite
x11-libs/libXrender
~x11-libs/qt-core-${PV}[debug=,icu]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-gui-${PV}[debug=]
~x11-libs/qt-network-${PV}[debug=]
~x11-libs/qt-sql-${PV}[debug=]
gstreamer? (
@@ -46,7 +46,7 @@ RDEPEND="
qml? ( ~x11-libs/qt-declarative-${PV}[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp )
- widgets? ( ~x11-libs/qt-widgets-${PV}[accessibility=,debug=] )
+ widgets? ( ~x11-libs/qt-widgets-${PV}[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
!libxml2? ( ~x11-libs/qt-xmlpatterns-${PV}[debug=] )
diff --git a/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
index c53f2df..26bb41b 100644
--- a/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
@@ -19,7 +19,7 @@ fi
# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
# FIXME: tons of automagic deps
-IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
+IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
RDEPEND="
dev-db/sqlite
@@ -32,7 +32,7 @@ RDEPEND="
x11-libs/libXcomposite
x11-libs/libXrender
~x11-libs/qt-core-${PV}[debug=,icu]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-gui-${PV}[debug=]
~x11-libs/qt-network-${PV}[debug=]
~x11-libs/qt-sql-${PV}[debug=]
gstreamer? (
@@ -46,7 +46,7 @@ RDEPEND="
qml? ( ~x11-libs/qt-declarative-${PV}[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp )
- widgets? ( ~x11-libs/qt-widgets-${PV}[accessibility=,debug=] )
+ widgets? ( ~x11-libs/qt-widgets-${PV}[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
!libxml2? ( ~x11-libs/qt-xmlpatterns-${PV}[debug=] )
diff --git a/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild
index c53f2df..26bb41b 100644
--- a/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild
@@ -19,7 +19,7 @@ fi
# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
# FIXME: tons of automagic deps
-IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
+IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
RDEPEND="
dev-db/sqlite
@@ -32,7 +32,7 @@ RDEPEND="
x11-libs/libXcomposite
x11-libs/libXrender
~x11-libs/qt-core-${PV}[debug=,icu]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-gui-${PV}[debug=]
~x11-libs/qt-network-${PV}[debug=]
~x11-libs/qt-sql-${PV}[debug=]
gstreamer? (
@@ -46,7 +46,7 @@ RDEPEND="
qml? ( ~x11-libs/qt-declarative-${PV}[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp )
- widgets? ( ~x11-libs/qt-widgets-${PV}[accessibility=,debug=] )
+ widgets? ( ~x11-libs/qt-widgets-${PV}[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
!libxml2? ( ~x11-libs/qt-xmlpatterns-${PV}[debug=] )
diff --git a/x11-libs/qt-widgets/qt-widgets-5.0.1.ebuild b/x11-libs/qt-widgets/qt-widgets-5.0.1.ebuild
index baa601a..e1e5854 100644
--- a/x11-libs/qt-widgets/qt-widgets-5.0.1.ebuild
+++ b/x11-libs/qt-widgets/qt-widgets-5.0.1.ebuild
@@ -14,11 +14,11 @@ else
KEYWORDS="~amd64"
fi
-IUSE="+accessibility"
+IUSE=""
DEPEND="
~x11-libs/qt-core-${PV}[debug=]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-gui-${PV}[debug=]
"
RDEPEND="${DEPEND}"
@@ -27,10 +27,3 @@ QT5_TARGET_SUBDIRS=(
src/widgets
src/plugins/accessible
)
-
-src_configure() {
- local myconf=(
- $(qt_use accessibility)
- )
- qt5-build_src_configure
-}
diff --git a/x11-libs/qt-widgets/qt-widgets-5.0.9999.ebuild b/x11-libs/qt-widgets/qt-widgets-5.0.9999.ebuild
index baa601a..e1e5854 100644
--- a/x11-libs/qt-widgets/qt-widgets-5.0.9999.ebuild
+++ b/x11-libs/qt-widgets/qt-widgets-5.0.9999.ebuild
@@ -14,11 +14,11 @@ else
KEYWORDS="~amd64"
fi
-IUSE="+accessibility"
+IUSE=""
DEPEND="
~x11-libs/qt-core-${PV}[debug=]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-gui-${PV}[debug=]
"
RDEPEND="${DEPEND}"
@@ -27,10 +27,3 @@ QT5_TARGET_SUBDIRS=(
src/widgets
src/plugins/accessible
)
-
-src_configure() {
- local myconf=(
- $(qt_use accessibility)
- )
- qt5-build_src_configure
-}
diff --git a/x11-libs/qt-widgets/qt-widgets-5.9999.ebuild b/x11-libs/qt-widgets/qt-widgets-5.9999.ebuild
index baa601a..e1e5854 100644
--- a/x11-libs/qt-widgets/qt-widgets-5.9999.ebuild
+++ b/x11-libs/qt-widgets/qt-widgets-5.9999.ebuild
@@ -14,11 +14,11 @@ else
KEYWORDS="~amd64"
fi
-IUSE="+accessibility"
+IUSE=""
DEPEND="
~x11-libs/qt-core-${PV}[debug=]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=]
+ ~x11-libs/qt-gui-${PV}[debug=]
"
RDEPEND="${DEPEND}"
@@ -27,10 +27,3 @@ QT5_TARGET_SUBDIRS=(
src/widgets
src/plugins/accessible
)
-
-src_configure() {
- local myconf=(
- $(qt_use accessibility)
- )
- qt5-build_src_configure
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-16 9:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-16 9:59 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-declarative/, x11-libs/qt-opengl/, x11-libs/qt-webkit/, eclass/, Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox