diff options
| -rw-r--r-- | dev-util/qdevelop/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-util/qdevelop/files/qdevelop-0.28-qt-4.7_fix.patch | 24 | ||||
| -rw-r--r-- | dev-util/qdevelop/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-util/qdevelop/qdevelop-0.26.1.ebuild | 35 | ||||
| -rw-r--r-- | dev-util/qdevelop/qdevelop-0.28.ebuild (renamed from dev-util/qdevelop/qdevelop-0.27.4.ebuild) | 24 |
5 files changed, 52 insertions, 46 deletions
diff --git a/dev-util/qdevelop/ChangeLog b/dev-util/qdevelop/ChangeLog index 4d047191b331..27003834d201 100644 --- a/dev-util/qdevelop/ChangeLog +++ b/dev-util/qdevelop/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-util/qdevelop -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/ChangeLog,v 1.9 2009/11/16 15:22:55 spatz Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/ChangeLog,v 1.10 2010/11/01 13:34:40 wired Exp $ + +*qdevelop-0.28 (01 Nov 2010) + + 01 Nov 2010; Alex Alexander <wired@gentoo.org> -qdevelop-0.26.1.ebuild, + -qdevelop-0.27.4.ebuild, +qdevelop-0.28.ebuild, + +files/qdevelop-0.28-qt-4.7_fix.patch, metadata.xml: + bumped to version 0.28, switched to cmake, added Qt-4.7 build fix, added + plugins USE flag, removed old versions. bug #338489 *qdevelop-0.27.4 (16 Nov 2009) diff --git a/dev-util/qdevelop/files/qdevelop-0.28-qt-4.7_fix.patch b/dev-util/qdevelop/files/qdevelop-0.28-qt-4.7_fix.patch new file mode 100644 index 000000000000..a1607779bf54 --- /dev/null +++ b/dev-util/qdevelop/files/qdevelop-0.28-qt-4.7_fix.patch @@ -0,0 +1,24 @@ +Description: Fix FTBFS with Qt 4.7. + +--- qdevelop-0.28.orig/src/build.h ++++ qdevelop-0.28/src/build.h +@@ -56,7 +56,7 @@ private: + int m_warnings; + QString m_forceMode; + signals: +- void message(QString, QString=0); ++ void message(QString, QString=QString()); + protected slots: + void slotBuildMessages(); + void slotStopBuild(); +--- qdevelop-0.28.orig/src/textEdit.h ++++ qdevelop-0.28/src/textEdit.h +@@ -142,7 +142,7 @@ public: + void setMouseHidden( bool hidden ); + public slots: + void gotoLine( int line, bool moveTop ); +- void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=0, QTextDocument::FindFlags options=0, bool fromButton=false); ++ void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=QString(), QTextDocument::FindFlags options=0, bool fromButton=false); + void slotIndent(bool indent=true); + void slotUnindent(); + void comment(ActionComment action); diff --git a/dev-util/qdevelop/metadata.xml b/dev-util/qdevelop/metadata.xml index 174647ba9166..7a273c637df4 100644 --- a/dev-util/qdevelop/metadata.xml +++ b/dev-util/qdevelop/metadata.xml @@ -6,4 +6,7 @@ <email>jokey@gentoo.org</email> <name>Markus Ullmann</name> </maintainer> +<use> + <flag name="plugins">Build and install additional plugins</flag> +</use> </pkgmetadata> diff --git a/dev-util/qdevelop/qdevelop-0.26.1.ebuild b/dev-util/qdevelop/qdevelop-0.26.1.ebuild deleted file mode 100644 index 236c527e0d5e..000000000000 --- a/dev-util/qdevelop/qdevelop-0.26.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.26.1.ebuild,v 1.3 2009/10/05 19:56:10 ayoy Exp $ - -EAPI="2" - -inherit base eutils qt4 toolchain-funcs - -DESCRIPTION="A development environment entirely dedicated to Qt4." -HOMEPAGE="http://qdevelop.org/" -SRC_URI="http://qdevelop.org/public/release/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -DEPEND="x11-libs/qt-gui:4 - x11-libs/qt-sql:4[sqlite]" -RDEPEND="${DEPEND}" - -src_configure() { - eqmake4 QDevelop.pro -} - -src_compile() { - emake CXX=$(tc-getCXX) || die "emake failed" -} - -src_install() { - dodoc ChangeLog.txt README.txt || die "dodoc failed" - dobin bin/qdevelop || die "dobin failed" - newicon "${S}"/resources/images/QDevelop.png qdevelop.png - domenu "${FILESDIR}"/qdevelop.desktop -} diff --git a/dev-util/qdevelop/qdevelop-0.27.4.ebuild b/dev-util/qdevelop/qdevelop-0.28.ebuild index 433508c7fc53..f5ae1201baf3 100644 --- a/dev-util/qdevelop/qdevelop-0.27.4.ebuild +++ b/dev-util/qdevelop/qdevelop-0.28.ebuild @@ -1,33 +1,39 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.27.4.ebuild,v 1.1 2009/11/16 15:22:55 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.28.ebuild,v 1.1 2010/11/01 13:34:40 wired Exp $ EAPI="2" -inherit eutils qt4 +inherit eutils cmake-utils +MY_P="${PN}-v${PV}" DESCRIPTION="A development environment entirely dedicated to Qt4." -HOMEPAGE="http://qdevelop.org/" -SRC_URI="http://qdevelop.org/public/release/${P}.tar.gz" +HOMEPAGE="http://biord-software.org/qdevelop/" +SRC_URI="http://biord-software.org/downloads/${MY_P}.tar.gz" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="debug" +IUSE="debug plugins" DEPEND="x11-libs/qt-gui:4 x11-libs/qt-sql:4[sqlite]" RDEPEND="${DEPEND}" +S="${WORKDIR}"/"${MY_P}" + +PATCHES=( "${FILESDIR}"/"${P}"-qt-4.7_fix.patch ) + src_configure() { - eqmake4 QDevelop.pro + mycmakeargs=( "-DAUTOPLUGINS=$(use plugins && echo 1 || echo 0)" ) + cmake-utils_src_configure } src_install() { + cmake-utils_src_install dodoc ChangeLog.txt README.txt || die "dodoc failed" - dobin bin/qdevelop || die "dobin failed" newicon "${S}"/resources/images/QDevelop.png qdevelop.png - domenu "${FILESDIR}"/qdevelop.desktop + domenu "${S}"/qdevelop.desktop } pkg_postinst(){ |