From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CB1B713877A for ; Sat, 2 Aug 2014 22:45:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A3EBE08EE; Sat, 2 Aug 2014 22:45:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE0D1E08EE for ; Sat, 2 Aug 2014 22:45:06 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C49E33FDDB for ; Sat, 2 Aug 2014 22:45:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id BBE5F18815 for ; Sat, 2 Aug 2014 22:45:03 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1407019483.5d80ca71ee095d15aca1d9a4e654ceb41c26b1f2.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtdeclarative/metadata.xml dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 5d80ca71ee095d15aca1d9a4e654ceb41c26b1f2 X-VCS-Branch: master Date: Sat, 2 Aug 2014 22:45:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b77323f1-4bfb-45de-98ca-4fdcf9925fc9 X-Archives-Hash: 55c3de10269bdb3111d4a95c5ceb5e68 commit: 5d80ca71ee095d15aca1d9a4e654ceb41c26b1f2 Author: Davide Pesavento gentoo org> AuthorDate: Sat Aug 2 22:44:43 2014 +0000 Commit: Davide Pesavento gentoo 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 @@ Add support for exceptions - like catching them inside the event loop (recommended by Nokia) - Build the LocalStorage import for - QtQuick (requires QtSql) + Use OpenGL ES instead of desktop OpenGL + Build the LocalStorage import for QtQuick (requires QtSql) Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4. Build the WebView QML component Enable QtWidgets support - Build the XmlListModel import for QtQuick2 - (requires QtXmlPatterns) + Build the XmlListModel import for QtQuick (requires QtXmlPatterns) https://bugreports.qt-project.org/ 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