diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-05-25 12:29:36 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-05-25 12:29:36 +0000 |
| commit | 3f0e23bdea7f10f658ebf31f09930c879971f590 (patch) | |
| tree | d8d3400d34a50bfbed184382f17575f23f96336d /sci-geosciences/qgis | |
| parent | bump to rc (diff) | |
| download | gentoo-2-3f0e23bdea7f10f658ebf31f09930c879971f590.tar.gz gentoo-2-3f0e23bdea7f10f658ebf31f09930c879971f590.tar.bz2 gentoo-2-3f0e23bdea7f10f658ebf31f09930c879971f590.zip | |
Fixing build with GCC 4.5 wrt bug 320787, adding missing dependecy wrt bug 320727, with scarabeus blessing
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/qgis')
| -rw-r--r-- | sci-geosciences/qgis/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-1.4.0-gcc45.patch | 15 | ||||
| -rw-r--r-- | sci-geosciences/qgis/qgis-1.4.0.ebuild | 7 |
3 files changed, 27 insertions, 2 deletions
diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog index 5798410ce535..4556706aa1ee 100644 --- a/sci-geosciences/qgis/ChangeLog +++ b/sci-geosciences/qgis/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-geosciences/qgis # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.7 2010/04/27 12:37:17 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.8 2010/05/25 12:29:35 xarthisius Exp $ + + 25 May 2010; Kacper Kowalik <xarthisius@gentoo.org> qgis-1.4.0.ebuild, + +files/qgis-1.4.0-gcc45.patch: + Fixing build with GCC 4.5 wrt bug 320787, adding missing dependecy wrt bug + 320727. Thanks Diego and Paweł for reporting 27 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> qgis-1.4.0.ebuild: Update manpage placement. Per bug #314959. diff --git a/sci-geosciences/qgis/files/qgis-1.4.0-gcc45.patch b/sci-geosciences/qgis/files/qgis-1.4.0-gcc45.patch new file mode 100644 index 000000000000..2195a2a90834 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-1.4.0-gcc45.patch @@ -0,0 +1,15 @@ +Fixing gcc-4.5 compilation failure + +http://bugs.gentoo.org/show_bug.cgi?id=320787 + +--- src/app/composer/qgscomposer.cpp ++++ src/app/composer/qgscomposer.cpp +@@ -1030,7 +1030,7 @@ + QSettings settings; + restoreGeometry( settings.value( "/Composer/geometry" ).toByteArray() ); + QVariant splitterState = settings.value( "/Composer/splitterState" ); +- if ( splitterState != QVariant::QVariant() ) ++ if ( splitterState != QVariant() ) + { + //mSplitter->restoreState(settings.value("/Composer/splitterState").toByteArray()); + } diff --git a/sci-geosciences/qgis/qgis-1.4.0.ebuild b/sci-geosciences/qgis/qgis-1.4.0.ebuild index 709ee9441136..07249cff89ca 100644 --- a/sci-geosciences/qgis/qgis-1.4.0.ebuild +++ b/sci-geosciences/qgis/qgis-1.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild,v 1.4 2010/04/27 12:37:17 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild,v 1.5 2010/05/25 12:29:35 xarthisius Exp $ EAPI="2" @@ -24,6 +24,7 @@ RDEPEND=">=sci-libs/gdal-1.6.1 x11-libs/qt-gui:4 x11-libs/qt-svg:4 x11-libs/qt-sql:4 + x11-libs/qt-webkit:4 sci-libs/geos sci-libs/proj gps? ( @@ -48,6 +49,10 @@ pkg_setup() { python_pkg_setup } +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc45.patch +} + src_configure() { local mycmakeargs mycmakeargs+=( |