diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-06-25 17:18:36 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-06-25 17:18:36 +0000 |
| commit | 06bf20861bfdff99cf97ff6ff9cfd528e2fbbba1 (patch) | |
| tree | c157981af31c447cf1e1ee42aa0a079f15e6d71c /app-text | |
| parent | dev-libs/libtar: Fix implicit declarations; Fix install failure if app-portag... (diff) | |
| download | gentoo-2-06bf20861bfdff99cf97ff6ff9cfd528e2fbbba1.tar.gz gentoo-2-06bf20861bfdff99cf97ff6ff9cfd528e2fbbba1.tar.bz2 gentoo-2-06bf20861bfdff99cf97ff6ff9cfd528e2fbbba1.zip | |
app-text/searchmonkey: Fix for gcc-4.7, #423191
(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/searchmonkey/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch | 40 | ||||
| -rw-r--r-- | app-text/searchmonkey/metadata.xml | 6 | ||||
| -rw-r--r-- | app-text/searchmonkey/searchmonkey-2.0.0.ebuild | 21 |
4 files changed, 60 insertions, 13 deletions
diff --git a/app-text/searchmonkey/ChangeLog b/app-text/searchmonkey/ChangeLog index a29f2e28631d..a1da69c9a00e 100644 --- a/app-text/searchmonkey/ChangeLog +++ b/app-text/searchmonkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/searchmonkey # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/ChangeLog,v 1.8 2012/05/04 03:33:17 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/ChangeLog,v 1.9 2012/06/25 17:18:36 jlec Exp $ + + 25 Jun 2012; Justin Lecher <jlec@gentoo.org> searchmonkey-2.0.0.ebuild, + +files/searchmonkey-2.0.0-gcc4.7.patch, metadata.xml: + Fix for gcc-4.7, #423191 04 May 2012; Jeff Horelick <jdhore@gentoo.org> searchmonkey-0.8.1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch new file mode 100644 index 000000000000..f9d1718dd7b4 --- /dev/null +++ b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch @@ -0,0 +1,40 @@ + Utility.h | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Utility.h b/Utility.h +index 890eada..99f9a4e 100644 +--- a/Utility.h ++++ b/Utility.h +@@ -92,16 +92,6 @@ QRegExp::PatternSyntax uint2syntax(uint _index); + CallEach(observers, searchable, &Subject::Register);
+ here the Subject is the type of Caller
+ */
+-template <typename CalleeContainer, typename Caller, typename Op>
+-void CallEach(const CalleeContainer& container, Caller& caller, Op op)
+-{
+- for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));
+-}
+-template <typename T>
+-bool IsValueInRange(T value, T lowerBound, T upperBound)
+-{
+- return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);
+-}
+ template <typename T>
+ bool BoundSpecified(T boundValue)
+ {
+@@ -129,5 +119,15 @@ bool UpperBoundFit(T value, T upperBound) +
+ return false;
+ }
++template <typename CalleeContainer, typename Caller, typename Op>
++void CallEach(const CalleeContainer& container, Caller& caller, Op op)
++{
++ for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));
++}
++template <typename T>
++bool IsValueInRange(T value, T lowerBound, T upperBound)
++{
++ return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);
++}
+
+ #endif
diff --git a/app-text/searchmonkey/metadata.xml b/app-text/searchmonkey/metadata.xml index ff62877c67ae..91f4e72fb544 100644 --- a/app-text/searchmonkey/metadata.xml +++ b/app-text/searchmonkey/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer> - <email>maintainer-needed@gentoo.org</email> -</maintainer> + <maintainer> + <email>maintainer-needed@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild index 772951fa0eb7..61bd70409077 100644 --- a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild +++ b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/searchmonkey-2.0.0.ebuild,v 1.1 2011/09/02 23:34:43 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/searchmonkey-2.0.0.ebuild,v 1.2 2012/06/25 17:18:36 jlec Exp $ -EAPI="3" +EAPI=4 inherit qt4-r2 MY_PN=${PN}2 MY_P=${PN}_v${PV} + DESCRIPTION="Powerful text searches using regular expressions" HOMEPAGE="http://searchmonkey.sourceforge.net/" SRC_URI="mirror://sourceforge/project/${PN}/${MY_PN^}/${PV}%20%5Bstable%5D/${MY_P}.zip" @@ -17,19 +18,21 @@ SLOT="2" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="x11-libs/qt-gui - x11-libs/qt-core" +RDEPEND=" + x11-libs/qt-core + x11-libs/qt-gui" DEPEND="${RDEPEND} app-arch/unzip" S="${WORKDIR}"/${MY_P} +PATCHES=( "${FILESDIR}"/${P}-gcc4.7.patch ) + src_install() { - newbin ${PN} ${MY_PN} || die + newbin ${PN} ${MY_PN} # Hand-made desktop icon - insinto /usr/share/pixmaps/ - doins pixmaps/searchmonkey-300x300.png || die + doicon pixmaps/searchmonkey-300x300.png insinto /usr/share/applications/ - doins "${FILESDIR}"/${P}.desktop || die + doins "${FILESDIR}"/${P}.desktop } |