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 | f9bb2ca3eb96280e088fe8e6fdf052acd020b299 (patch) | |
| tree | 1b3279550e6403aee4a7ac32b2df2675668a2f3a /sci-geosciences | |
| parent | bump to rc (diff) | |
| download | historical-f9bb2ca3eb96280e088fe8e6fdf052acd020b299.tar.gz historical-f9bb2ca3eb96280e088fe8e6fdf052acd020b299.tar.bz2 historical-f9bb2ca3eb96280e088fe8e6fdf052acd020b299.zip | |
Fixing build with GCC 4.5 wrt bug 320787, adding missing dependecy wrt bug 320727, with scarabeus blessing
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/qgis/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/qgis/Manifest | 15 | ||||
| -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 |
4 files changed, 30 insertions, 14 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/Manifest b/sci-geosciences/qgis/Manifest index 1d09cd8c0858..c9f08abbbe8c 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX qgis-1.4.0-gcc45.patch 536 RMD160 78966492091d7b9a249fce13d892881d82d25d5a SHA1 6ea4ea20d346a4f4df7bb043f779afebd831a606 SHA256 909d0699d8c203ff3198261d46de770ed3b6da3b9d77be7315c895539564b922 DIST qgis_1.4.0.tar.gz 17285943 RMD160 47486732c8fe37aa6864d09c7420be22de5ea802 SHA1 105f353f36e9625d1eb15f1a315882f214dbe026 SHA256 bbe07eedec4bda95cca994002941b91fd0e50d5cdee2bf79be0c4f7b930cc7da DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a -EBUILD qgis-1.4.0.ebuild 2498 RMD160 7db68bb96ce13df2d108f7c5d0aa2e6274a033a5 SHA1 8284b2c18e935bef2d03ef87f2a78d0557946380 SHA256 927b49b0f94e5f1b0263f9bf847db67b0c91116de0b8b78dc11e250716357975 -MISC ChangeLog 1399 RMD160 8d2ffabd6bbf52f7b00ee73a49eb94ca4e4f8c82 SHA1 66cbbab72aa0fa8a54cf7d55c241088f56a92a61 SHA256 89c40208f0cc9c2ec44a5ea9470bed41ccd8ea9461b223d4c799d1201e523879 +EBUILD qgis-1.4.0.ebuild 2579 RMD160 a22fbf4aaddb2ad53cae70c7471838c09323427c SHA1 f0eca1c640346b4d6699c9ec0eb539fb98081710 SHA256 ff8b4b36959fcca4ede4faa7486c935dffcc61b3438e9c7b9aacf7d0e8146b4d +MISC ChangeLog 1632 RMD160 a840390b73dc4e2ad886f239df6796b06e8a94db SHA1 b8801a272db0e1ab46fa196e0d9dc1aa798298f5 SHA256 11033a156badd0c45d97d80d3c6dbeecee93f79f9d4c67e1ac1c844ccc934946 MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkvW2mQACgkQHB6c3gNBRYepqwCbBw9+jogt5nLbNPz0CU9yc3UE -r8wAoJaNtFJCDF9P/Oe6/u5qZuQvegdf -=ccCI ------END PGP SIGNATURE----- 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+=( |