diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/piklab/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/piklab/files/piklab-0.15.10-gcc46.patch | 12 | ||||
| -rw-r--r-- | dev-util/piklab/piklab-0.15.10.ebuild | 21 | ||||
| -rw-r--r-- | dev-util/piklab/piklab-0.15.7.ebuild | 13 |
4 files changed, 37 insertions, 17 deletions
diff --git a/dev-util/piklab/ChangeLog b/dev-util/piklab/ChangeLog index 86e55b80fa89..e97b22e7c7d3 100644 --- a/dev-util/piklab/ChangeLog +++ b/dev-util/piklab/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/piklab -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/ChangeLog,v 1.2 2010/10/07 21:34:04 vapier Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/ChangeLog,v 1.3 2011/06/03 15:02:45 jlec Exp $ + + 03 Jun 2011; Justin Lecher <jlec@gentoo.org> piklab-0.15.7.ebuild, + piklab-0.15.10.ebuild, +files/piklab-0.15.10-gcc46.patch: + Make it gcc46 resistant, #369887 *piklab-0.15.10 (07 Oct 2010) diff --git a/dev-util/piklab/files/piklab-0.15.10-gcc46.patch b/dev-util/piklab/files/piklab-0.15.10-gcc46.patch new file mode 100644 index 000000000000..e53b594db423 --- /dev/null +++ b/dev-util/piklab/files/piklab-0.15.10-gcc46.patch @@ -0,0 +1,12 @@ +diff -ur piklab-0.15.10/src/xml_to_data/device_xml_to_data.h piklab-0.15.10-gcc46/src/xml_to_data/device_xml_to_data.h +--- piklab-0.15.10/src/xml_to_data/device_xml_to_data.h 2010-07-05 18:16:57.000000000 +0200 ++++ piklab-0.15.10-gcc46/src/xml_to_data/device_xml_to_data.h 2011-01-31 17:03:42.000000000 +0100 +@@ -61,7 +61,7 @@ + ts << "const char *" << namespaceName() << "::DATA_STREAM =" << endl; + QValueList<DataType *> list; + for (QMap<QString, Data *>::const_iterator it=_map.begin(); it!=_map.end(); ++it) +- list.append(static_cast<const DataType *>(it.data())); ++ list.append(static_cast<DataType *>(it.data())); + uint size = toCppString(list, ts); + ts << ";" << endl; + ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl; diff --git a/dev-util/piklab/piklab-0.15.10.ebuild b/dev-util/piklab/piklab-0.15.10.ebuild index 9467fc3f7ea8..a0ee0a3599a7 100644 --- a/dev-util/piklab/piklab-0.15.10.ebuild +++ b/dev-util/piklab/piklab-0.15.10.ebuild @@ -1,32 +1,35 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/piklab-0.15.10.ebuild,v 1.1 2010/10/07 21:34:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/piklab-0.15.10.ebuild,v 1.2 2011/06/03 15:02:45 jlec Exp $ -EAPI="2" +EAPI=4 inherit qt4-r2 cmake-utils -DESCRIPTION="command-line programmer and debugger for PIC and dsPIC microcontrollers" +DESCRIPTION="CLI programmer and debugger for PIC and dsPIC microcontrollers" HOMEPAGE="http://piklab.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz -> ${P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="x11-libs/qt-gui:4 +RDEPEND=" + x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 - virtual/libusb:0 sys-libs/ncurses - sys-libs/readline" + sys-libs/readline + virtual/libusb:0" DEPEND="${RDEPEND}" MYCMAKEARGS="-DQT_ONLY=1" +PATCHES=( "${FILESDIR}"/${P}-gcc46.patch ) + src_prepare() { sed -i \ -e "/\<share.doc.piklab\>/s:/piklab:/${PF}:" \ CMakeLists.txt - default + base_src_prepare } diff --git a/dev-util/piklab/piklab-0.15.7.ebuild b/dev-util/piklab/piklab-0.15.7.ebuild index c4fde02c6ae9..ad4599a6a92c 100644 --- a/dev-util/piklab/piklab-0.15.7.ebuild +++ b/dev-util/piklab/piklab-0.15.7.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/piklab-0.15.7.ebuild,v 1.3 2010/09/22 18:36:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/piklab-0.15.7.ebuild,v 1.4 2011/06/03 15:02:45 jlec Exp $ EAPI=2 inherit qt4-r2 -DESCRIPTION="command-line programmer and debugger for PIC and dsPIC microcontrollers" +DESCRIPTION="CLI programmer and debugger for PIC and dsPIC microcontrollers" HOMEPAGE="http://piklab.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" @@ -14,11 +14,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="x11-libs/qt-gui:4 +RDEPEND=" + x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 - virtual/libusb:0 sys-libs/ncurses - sys-libs/readline" + sys-libs/readline + virtual/libusb:0" DEPEND="${RDEPEND}" MAKEOPTS="${MAKEOPTS} -j1" |