diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-06 11:42:57 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-06 11:42:57 +0000 |
| commit | 04d2ab888f829cdfddb1bb3eca4d5d6aa94f2d00 (patch) | |
| tree | d577f1608eb3df2c729ff1e2bfcbf542f14ebc79 /sci-geosciences | |
| parent | version bump, removed some old versions (diff) | |
| download | historical-04d2ab888f829cdfddb1bb3eca4d5d6aa94f2d00.tar.gz historical-04d2ab888f829cdfddb1bb3eca4d5d6aa94f2d00.tar.bz2 historical-04d2ab888f829cdfddb1bb3eca4d5d6aa94f2d00.zip | |
Fix building with GCC 4.5+ wrt #318579 by Kacper Kowalik.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/gebabbel/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-geosciences/gebabbel/Manifest | 15 | ||||
| -rw-r--r-- | sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch | 15 | ||||
| -rw-r--r-- | sci-geosciences/gebabbel/gebabbel-0.3.ebuild | 11 |
4 files changed, 30 insertions, 19 deletions
diff --git a/sci-geosciences/gebabbel/ChangeLog b/sci-geosciences/gebabbel/ChangeLog index 46a0b3291adb..052aeac1d02e 100644 --- a/sci-geosciences/gebabbel/ChangeLog +++ b/sci-geosciences/gebabbel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/gebabbel -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/ChangeLog,v 1.4 2009/09/30 16:39:13 ayoy Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/ChangeLog,v 1.5 2010/05/06 11:42:57 ssuominen Exp $ + + 06 May 2010; Samuli Suominen <ssuominen@gentoo.org> gebabbel-0.3.ebuild, + +files/gebabbel-0.3-gcc45.patch: + Fix building with GCC 4.5+ wrt #318579 by Kacper Kowalik. 30 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> gebabbel-0.3.ebuild: Removed obsolete QT_BUILT_WITH_USE and the dependency on Qt metapackage, diff --git a/sci-geosciences/gebabbel/Manifest b/sci-geosciences/gebabbel/Manifest index 203b9c28dc2d..132bd50febf5 100644 --- a/sci-geosciences/gebabbel/Manifest +++ b/sci-geosciences/gebabbel/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gebabbel-0.3-fix.diff 545 RMD160 663f72fc848bc76167c900d19aaa69dc3f863bfc SHA1 27694e44e2fa37394a96637c08c5ccd0e891f8b9 SHA256 8a2d0d7babe2c902c41622bd24626b74212427520f6c5f5843f3dca35a7f77ca +AUX gebabbel-0.3-gcc45.patch 423 RMD160 6c6d9b21610cc7b28a0a17374c2f377869dab361 SHA1 a04701795f8c1d2632155486f45f4969adcb7534 SHA256 0aeec5c3a23e215cfc63cd8945e4e1ffe0a2f770e03fbe0a9d54b6fdbfd1f091 DIST Gebabbel-0.3-Src.tar.gz 2316428 RMD160 7b9779122fc416ef7df8573565db168a21ed92c9 SHA1 5183b46e2803c05238de52be557f76095527e3f1 SHA256 85f80c936b5db07150c2d5431cce6c6272c0ae8d5eacc8a058fc08cfd5693d5e -EBUILD gebabbel-0.3.ebuild 845 RMD160 80a6dc99532703a1894dba22df88510f38e31267 SHA1 96df475772c9a06cab50e4a151e1873e66291d06 SHA256 b24a52b3130bcd354363168c89584af23b1b5fb14496c9f02010b8ed2e21a5c7 -MISC ChangeLog 935 RMD160 58fe313456698cd8c04a7c12bc008219ddfd4579 SHA1 2cbf8d304e399cad143972fd5fe0d13c01b33ec0 SHA256 1bc47886fcf9df092d905af4f3c728b77091532f4c0306beee71d88650ad3355 +EBUILD gebabbel-0.3.ebuild 881 RMD160 37fc153277be4c60e9f60393bbcf777ffb114f55 SHA1 da76259e36e2a980a488ca42fa36ddd63813df3b SHA256 7afdd24d0c00a676c1f45e710e1012ab4b445818802d3ac06727b67cbbd4c2c3 +MISC ChangeLog 1111 RMD160 b8440bd1035c5bff30ea3df57b0af86ca6ac86fa SHA1 6981981e3caa7313e8fb46d463a7ad73d2eb4fd4 SHA256 a51fd6a1dfe9fb8ba0b069745feba2600e0d558fc3d6dc6c03f9ea7676b6dfe4 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkrDibwACgkQ+CZEqwt+F6Y1zACfSIRPMT9V5LSHdZyJu5fhuqvR -oVYAnR/NZDs8zAf6H3i9RASdoRZfjqMO -=jkqv ------END PGP SIGNATURE----- diff --git a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch new file mode 100644 index 000000000000..e8064e366c9c --- /dev/null +++ b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch @@ -0,0 +1,15 @@ +Fixing build with gcc 4.5 + +http://bugs.gentoo.org/show_bug.cgi?id=318579 + +--- src/MyMainWindow.cpp ++++ src/MyMainWindow.cpp +@@ -219,7 +219,7 @@ + + // Creating the toolbar + MainToolBar = addToolBar( tr( "Main Toolbar" ) ); +- MainToolBar->setIconSize( QSize::QSize( 16, 16 ) ); ++ MainToolBar->setIconSize( QSize( 16, 16 ) ); + MainToolBar->setAllowedAreas( Qt::TopToolBarArea ); + MainToolBar->setMovable( false ); + diff --git a/sci-geosciences/gebabbel/gebabbel-0.3.ebuild b/sci-geosciences/gebabbel/gebabbel-0.3.ebuild index 43bca68f87d9..506b89ce5250 100644 --- a/sci-geosciences/gebabbel/gebabbel-0.3.ebuild +++ b/sci-geosciences/gebabbel/gebabbel-0.3.ebuild @@ -1,8 +1,8 @@ -# 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/sci-geosciences/gebabbel/gebabbel-0.3.ebuild,v 1.4 2009/09/30 16:39:13 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/gebabbel-0.3.ebuild,v 1.5 2010/05/06 11:42:57 ssuominen Exp $ -EAPI="2" +EAPI=2 inherit eutils qt4 MY_PN=${PN/g/G} @@ -20,10 +20,11 @@ DEPEND="x11-libs/qt-core:4 RDEPEND="${DEPEND} sci-geosciences/gpsbabel" -S="${WORKDIR}/${MY_P}" +S=${WORKDIR}/${MY_P} src_prepare() { - epatch "${FILESDIR}/${P}-fix.diff" + epatch "${FILESDIR}"/${P}-fix.diff \ + "${FILESDIR}"/${P}-gcc45.patch } src_configure() { |