* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-demo/
@ 2012-03-17 16:57 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2012-03-17 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 2d27ecb89039c9b1245d00bd0f8e69cfd639d91f
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sat Mar 17 16:56:03 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat Mar 17 16:56:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2d27ecb8
[x11-libs/qt-demo] Sync metadata with portage.
(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/qt-demo/metadata.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/x11-libs/qt-demo/metadata.xml b/x11-libs/qt-demo/metadata.xml
index 2a15291..80ed182 100644
--- a/x11-libs/qt-demo/metadata.xml
+++ b/x11-libs/qt-demo/metadata.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
+ <herd>qt</herd>
<use>
- <flag name='exceptions'>Build with support for exceptions</flag>
- <flag name='stable-branch'>Use the stable git branch - it is slightly behind
- master but guaranteed by Nokia to compile</flag>
+ <flag name='exceptions'>Add support for exceptions - like catching them
+ inside the event loop (recommended by Nokia)</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>
+ this does not mean you can compile pure Qt3 programs with Qt4.</flag>
+ <flag name='c++0x'>Build Qt using the C++11 standard</flag>
+ <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-demo/
@ 2012-04-01 18:10 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2012-04-01 18:10 UTC (permalink / raw
To: gentoo-commits
commit: eda4a132e254aa33e1bf3d935f2cc74d754dfa1b
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sun Apr 1 18:09:29 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sun Apr 1 18:09:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=eda4a132
[x11-libs/qt-demo] Sync with portage.
(Portage version: 2.1.10.53/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/qt-demo/metadata.xml | 12 +++-
x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 81 +++++++++++++++++++++++-------
2 files changed, 72 insertions(+), 21 deletions(-)
diff --git a/x11-libs/qt-demo/metadata.xml b/x11-libs/qt-demo/metadata.xml
index 80ed182..9a353bd 100644
--- a/x11-libs/qt-demo/metadata.xml
+++ b/x11-libs/qt-demo/metadata.xml
@@ -3,11 +3,17 @@
<pkgmetadata>
<herd>qt</herd>
<use>
+ <flag name='c++0x'>Build Qt using the C++11 standard</flag>
+ <flag name='dbus'>Build QtDBus examples and demos</flag>
+ <flag name='declarative'>Build QtDeclarative examples and demos</flag>
<flag name='exceptions'>Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</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='c++0x'>Build Qt using the C++11 standard</flag>
+ <flag name='multimedia'>Build QtMultimedia examples and demos</flag>
+ <flag name='opengl'>Build QtOpenGL examples and demos</flag>
+ <flag name='openvg'>Build QtOpenVG examples and demos</flag>
<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+ <flag name='qt3support'>Build Qt3Support examples and demos</flag>
+ <flag name='webkit'>Build QtWebKit examples and demos</flag>
+ <flag name='xmlpatterns'>Build QtXmlPatterns examples and demos</flag>
</use>
</pkgmetadata>
diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index e7188d5..d0d4d0d 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.1.ebuild,v 1.1 2012/03/29 22:11:13 pesa Exp $
+# $Header: $
EAPI=4
@@ -13,27 +13,28 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
else
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
-IUSE="kde qt3support"
+IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
DEPEND="
- ~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-core-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,webkit]
- ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+ ~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+ dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+ declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
+ ~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+ multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+ opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
+ openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
kde? ( media-libs/phonon[aqua=] )
!kde? ( || (
- ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+ ~x11-libs/qt-phonon-${PV}:4[aqua=,c++0x=,debug=,qpa=]
media-libs/phonon[aqua=]
) )
- ~x11-libs/qt-script-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-test-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+ qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+ ~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+ ~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+ webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+ xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
"
RDEPEND="${DEPEND}"
@@ -54,14 +55,58 @@ pkg_setup() {
qt4-build_pkg_setup
}
+src_prepare() {
+ qt4-build_src_prepare
+
+ # Array mapping USE flags to subdirs
+ local flags_subdirs_map=(
+ 'dbus'
+ 'declarative:declarative'
+ 'multimedia:spectrum'
+ 'opengl:boxes|glhypnotizer'
+ 'openvg'
+ 'webkit:browser'
+ 'xmlpatterns'
+ )
+ # Disable unwanted examples/demos
+ for flag in "${flags_subdirs_map[@]}"; do
+ if ! use ${flag%:*}; then
+ einfo "Disabling ${flag%:*} examples"
+ sed -i -e "/SUBDIRS += ${flag%:*}/d" \
+ examples/examples.pro || die
+
+ if [[ ${flag} == *:* ]]; then
+ einfo "Disabling ${flag%:*} demos"
+ sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
+ demos/demos.pro || die
+ fi
+ fi
+ done
+
+ if ! use qt3support; then
+ einfo "Disabling qt3support examples"
+ sed -i -e '/QT_CONFIG, qt3support/d' \
+ examples/graphicsview/graphicsview.pro || die
+ fi
+}
+
src_configure() {
- myconf="${myconf} $(qt_use qt3support)"
+ myconf+="
+ $(qt_use dbus)
+ $(qt_use declarative)
+ $(qt_use multimedia)
+ $(qt_use opengl)
+ $(qt_use openvg)
+ $(qt_use qt3support)
+ $(qt_use webkit)
+ $(qt_use xmlpatterns)"
+
qt4-build_src_configure
}
src_install() {
insinto "${QTDOCDIR#${EPREFIX}}"/src
- doins -r "${S}"/doc/src/images
+ doins -r doc/src/images
qt4-build_src_install
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-demo/
@ 2012-05-12 10:30 Davide Pesavento
0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2012-05-12 10:30 UTC (permalink / raw
To: gentoo-commits
commit: fc3d33ac7928ae2147118701e5596220536b318b
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat May 12 10:27:30 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May 12 10:27:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fc3d33ac
[x11-libs/qt-demo] Sync with portage.
(Portage version: 2.2.0_alpha103/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index d0d4d0d..103c1e6 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -6,33 +6,30 @@ EAPI=4
inherit qt4-build
-DESCRIPTION="Demonstration module of the Qt toolkit"
+DESCRIPTION="Demonstration module and examples for the Qt toolkit"
SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
+KEYWORDS=""
IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
DEPEND="
~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+ ~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+ ~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+ ~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+ aqua? ( ~x11-libs/qt-assistant-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
- ~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
- multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
- opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
- openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
kde? ( media-libs/phonon[aqua=] )
!kde? ( || (
~x11-libs/qt-phonon-${PV}:4[aqua=,c++0x=,debug=,qpa=]
media-libs/phonon[aqua=]
) )
+ multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+ opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
+ openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
- ~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
- ~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
"
@@ -68,6 +65,7 @@ src_prepare() {
'webkit:browser'
'xmlpatterns'
)
+
# Disable unwanted examples/demos
for flag in "${flags_subdirs_map[@]}"; do
if ! use ${flag%:*}; then
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-demo/
@ 2012-05-22 15:09 Davide Pesavento
0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2012-05-22 15:09 UTC (permalink / raw
To: gentoo-commits
commit: 2d0db83b8433f8f61738f431e32168c41e176af2
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue May 22 15:08:36 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 22 15:08:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2d0db83b
[x11-libs/qt-{bearer,demo}] Sync with portage.
(Portage version: 2.2.0_alpha107/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index 84932bb..a9d79f8 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -16,13 +16,13 @@ fi
IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
DEPEND="
+ ~x11-libs/qt-assistant-${PV}:4[aqua=,c++0x=,debug=,qpa=]
~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
- aqua? ( ~x11-libs/qt-assistant-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
kde? ( media-libs/phonon[aqua=] )
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-22 15:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-01 18:10 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-demo/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2012-05-22 15:09 Davide Pesavento
2012-05-12 10:30 Davide Pesavento
2012-03-17 16:57 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox