commit: 5d80ca71ee095d15aca1d9a4e654ceb41c26b1f2
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 2 22:44:43 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 2 22:44:43 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5d80ca71
[dev-qt/qtdeclarative:5] Add USE=gles2 in order to fix bug 504322.
Plus a couple of fixes wrt USE=widgets.
Package-Manager: portage-2.2.10
---
dev-qt/qtdeclarative/metadata.xml | 7 +++----
dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild | 9 ++++++---
dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild | 9 ++++++---
dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 9 ++++++---
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/dev-qt/qtdeclarative/metadata.xml
b/dev-qt/qtdeclarative/metadata.xml
index b0bba8a..db5d53d 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -5,14 +5,13 @@
<use>
<flag name="exceptions">Add support for exceptions - like
catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="localstorage">Build the LocalStorage import for
- QtQuick (requires QtSql)</flag>
+ <flag name="gles2">Use OpenGL ES instead of desktop
OpenGL</flag>
+ <flag name="localstorage">Build the LocalStorage import for
QtQuick (requires QtSql)</flag>
<flag name="qt3support">Enable the Qt3Support libraries for
Qt4. Note that
this does not mean you can compile pure Qt3 programs
with Qt4.</flag>
<flag name="webkit">Build the WebView QML component</flag>
<flag name="widgets">Enable QtWidgets support</flag>
- <flag name="xml">Build the XmlListModel import for QtQuick2
- (requires QtXmlPatterns)</flag>
+ <flag name="xml">Build the XmlListModel import for QtQuick
(requires QtXmlPatterns)</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild
index d01f6f9..c40af5a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild
@@ -14,11 +14,11 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+localstorage +widgets +xml"
+IUSE="gles2 +localstorage +widgets +xml"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=,opengl]
+ >=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qttest-${PV}:5[debug=]
localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
@@ -31,8 +31,11 @@ src_prepare() {
use localstorage || sed -i -e '/localstorage/d' \
src/imports/imports.pro || die
+ use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
+ src/qmltest/qmltest.pro || die
+
qt_use_disable_mod widgets widgets \
- src/imports/imports.pro \
+ src/src.pro \
tools/tools.pro \
tools/qmlscene/qmlscene.pro \
tools/qml/qml.pro
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild
index d01f6f9..c40af5a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild
@@ -14,11 +14,11 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+localstorage +widgets +xml"
+IUSE="gles2 +localstorage +widgets +xml"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=,opengl]
+ >=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qttest-${PV}:5[debug=]
localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
@@ -31,8 +31,11 @@ src_prepare() {
use localstorage || sed -i -e '/localstorage/d' \
src/imports/imports.pro || die
+ use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
+ src/qmltest/qmltest.pro || die
+
qt_use_disable_mod widgets widgets \
- src/imports/imports.pro \
+ src/src.pro \
tools/tools.pro \
tools/qmlscene/qmlscene.pro \
tools/qml/qml.pro
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
index d01f6f9..c40af5a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
@@ -14,11 +14,11 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+localstorage +widgets +xml"
+IUSE="gles2 +localstorage +widgets +xml"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=,opengl]
+ >=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qttest-${PV}:5[debug=]
localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
@@ -31,8 +31,11 @@ src_prepare() {
use localstorage || sed -i -e '/localstorage/d' \
src/imports/imports.pro || die
+ use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
+ src/qmltest/qmltest.pro || die
+
qt_use_disable_mod widgets widgets \
- src/imports/imports.pro \
+ src/src.pro \
tools/tools.pro \
tools/qmlscene/qmlscene.pro \
tools/qml/qml.pro
