* [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/assistant/files/, dev-qt/qthelp/files/, dev-qt/pixeltool/, ...
@ 2013-06-17 10:38 Davide Pesavento
0 siblings, 0 replies; only message in thread
From: Davide Pesavento @ 2013-06-17 10:38 UTC (permalink / raw
To: gentoo-commits
commit: 17bd18dffead3bb12f6a897bff405486b3e0f00f
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 17 10:35:19 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 10:35:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=17bd18df
[dev-qt/qthelp:4] Dismember qthelp package.
Move assistant and pixeltool to separate packages.
Move qttracereplay into qtgui behind USE=trace.
---
dev-qt/assistant/assistant-4.8.9999.ebuild | 65 ++++++++++++++++++++++
.../files/assistant-4.8.2+gcc-4.7.patch} | 0
.../files/disable-webkit.patch | 0
dev-qt/assistant/metadata.xml | 14 +++++
dev-qt/pixeltool/metadata.xml | 14 +++++
dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 42 ++++++++++++++
dev-qt/qtgui/metadata.xml | 5 +-
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 2 +-
dev-qt/qthelp/metadata.xml | 9 +--
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 59 +++++++-------------
10 files changed, 161 insertions(+), 49 deletions(-)
diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild b/dev-qt/assistant/assistant-4.8.9999.ebuild
new file mode 100644
index 0000000..809e8f2
--- /dev/null
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils qt4-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+ QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
+
+ qt4-build_pkg_setup
+}
+
+src_prepare() {
+ # bug 401173
+ use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
+
+ qt4-build_src_prepare
+}
+
+src_configure() {
+ myconf+="
+ -system-libpng -system-libjpeg -system-zlib
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
+ $(qt_use webkit)"
+
+ qt4-build_src_configure
+}
+
+src_install() {
+ qt4-build_src_install
+
+ doicon tools/assistant/tools/assistant/images/assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
diff --git a/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
similarity index 100%
rename from dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch
rename to dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
diff --git a/dev-qt/qthelp/files/disable-webkit.patch b/dev-qt/assistant/files/disable-webkit.patch
similarity index 100%
rename from dev-qt/qthelp/files/disable-webkit.patch
rename to dev-qt/assistant/files/disable-webkit.patch
diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
new file mode 100644
index 0000000..782c134
--- /dev/null
+++ b/dev-qt/assistant/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <use>
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="exceptions">Add support for exceptions - like catching them
+ inside the event loop (recommended by Nokia)</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
new file mode 100644
index 0000000..782c134
--- /dev/null
+++ b/dev-qt/pixeltool/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <use>
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="exceptions">Add support for exceptions - like catching them
+ inside the event loop (recommended by Nokia)</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
new file mode 100644
index 0000000..05aa992
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build
+
+DESCRIPTION="Qt screen magnifier"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+fi
+
+IUSE=""
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="tools/pixeltool"
+ QT4_EXTRACT_DIRECTORIES="
+ include
+ tools/pixeltool"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ -system-libpng -system-libjpeg -system-zlib
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
+
+ qt4-build_src_configure
+}
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index d86d15d..e48197a 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -19,9 +19,8 @@
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
<flag name="trace">
Build the 'trace' graphicssystem engine which allows to record
- all drawing operations into a trace buffer. Later it can be replayed
- with the qttracereplay utility
- </flag>
+ all drawing operations into a trace buffer. The trace can be replayed
+ later with the qttracereplay tool.</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 8f91384..a002ac5 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -84,7 +84,7 @@ pkg_setup() {
use dbus && QT4_TARGET_DIRECTORIES+=" tools/qdbus/qdbusviewer"
use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
- use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace"
+ use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
# mac version does not contain qtconfig?
[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
index 114530d..839b641 100644
--- a/dev-qt/qthelp/metadata.xml
+++ b/dev-qt/qthelp/metadata.xml
@@ -4,15 +4,10 @@
<herd>qt</herd>
<use>
<flag name="c++0x">Build Qt using the C++11 standard</flag>
- <flag name="compat">Build the extra compatibility layer required by a few packages,
- see http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
+ <flag name="compat">Build the extra compatibility layer required by a few packages, see
+ http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</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="trace">Build the 'qttracereplay' utility which is required to
- play drawings recorded with the trace graphicssystem</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index a04ca36..49d2666 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -2,11 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
inherit eutils qt4-build
-DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
+DESCRIPTION="The Help module for the Qt toolkit"
SRC_URI+="
compat? (
ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
@@ -19,38 +19,30 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
fi
-IUSE="compat doc +glib qt3support trace webkit"
+
+IUSE="compat doc"
DEPEND="
- ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,sqlite]
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
-)
-
pkg_setup() {
- # Pixeltool isn't really assistant related, but it relies on
- # the assistant libraries.
QT4_TARGET_DIRECTORIES="
- tools/assistant
- tools/pixeltool
+ tools/assistant/lib
+ tools/assistant/qhelpgenerator
+ tools/assistant/qcollectiongenerator
+ tools/assistant/qhelpconverter
tools/qdoc3"
QT4_EXTRACT_DIRECTORIES="
- tools
demos
+ doc
examples
- src
include
- doc"
-
- use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- ${QT4_EXTRACT_DIRECTORIES}"
+ src
+ tools"
qt4-build_pkg_setup
}
@@ -74,23 +66,17 @@ src_prepare() {
use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
- # bug 401173
- use webkit || epatch "${FILESDIR}"/disable-webkit.patch
-
# bug 348034
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
}
src_configure() {
myconf+="
- -no-xkb -no-fontconfig -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-multimedia -no-svg
- $(qt_use qt3support) $(qt_use webkit)"
- use glib || myconf+=" -no-glib"
+ -system-libpng -system-libjpeg -system-zlib
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -no-multimedia -no-opengl -no-phonon -no-svg -no-webkit -no-xmlpatterns
+ -no-nas-sound -no-dbus -no-cups -no-nis -fontconfig"
qt4-build_src_configure
}
@@ -103,7 +89,7 @@ src_compile() {
qt4-build_src_compile
# ugly hack to build docs
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
+ "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die
if use doc; then
emake docs
@@ -125,11 +111,8 @@ src_install() {
emake INSTALL_ROOT="${D}" install_htmldocs
fi
- doicon tools/assistant/tools/assistant/images/assistant.png
- make_desktop_entry assistant Assistant assistant 'Qt;Development'
-
if use compat; then
- insinto /usr/share/qt4/mkspecs/features
+ insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features
doins tools/assistant/compat/features/assistant.prf
fi
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-06-17 10:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-17 10:38 [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/assistant/files/, dev-qt/qthelp/files/, dev-qt/pixeltool/, Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox