diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2011-09-28 14:39:18 +0000 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2011-09-28 14:39:18 +0000 |
| commit | 4b42520c996aea6e67da42d7301c0173304e0d44 (patch) | |
| tree | 56df95fade196e53867638fb3dc8afc8e2c94014 /sci-geosciences/opencpn | |
| parent | dev-vcs/gitg: Bump to 0.2.5 (bug #383527) (diff) | |
| download | historical-4b42520c996aea6e67da42d7301c0173304e0d44.tar.gz historical-4b42520c996aea6e67da42d7301c0173304e0d44.tar.bz2 historical-4b42520c996aea6e67da42d7301c0173304e0d44.zip | |
Add patch to fix linking against tinyxml[stl]. Fixes #384781
Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences/opencpn')
| -rw-r--r-- | sci-geosciences/opencpn/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/opencpn/Manifest | 13 | ||||
| -rw-r--r-- | sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch | 16 | ||||
| -rw-r--r-- | sci-geosciences/opencpn/opencpn-2.5.0.ebuild | 3 |
4 files changed, 30 insertions, 8 deletions
diff --git a/sci-geosciences/opencpn/ChangeLog b/sci-geosciences/opencpn/ChangeLog index 3dc8b8d846f9..1c73dfb2fa96 100644 --- a/sci-geosciences/opencpn/ChangeLog +++ b/sci-geosciences/opencpn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/opencpn # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.4 2011/07/31 14:25:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.5 2011/09/28 14:39:18 mschiff Exp $ + + 28 Sep 2011; Marc Schiffbauer <mschiff@gentoo.org> opencpn-2.5.0.ebuild, + +files/opencpn-2.5.0_tinyxml_stl.patch: + Add patch to fix linking against tinyxml[stl]. Fixes #384781 *opencpn-2.5.0 (31 Jul 2011) diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest index 76af215db4f7..f8d70757d4e8 100644 --- a/sci-geosciences/opencpn/Manifest +++ b/sci-geosciences/opencpn/Manifest @@ -2,14 +2,15 @@ Hash: SHA1 AUX opencpn-2.5.0-multilib-strict.patch 573 RMD160 2487dabe962039bbc6b1e7556bab5420c963dde2 SHA1 553953ce46a2a4c3db2a12c749c09cb8ed31b747 SHA256 d4ad6bbd2989e865dc7b5aee76dec370d76028519bc34c5e4bf94643b88bddc7 +AUX opencpn-2.5.0_tinyxml_stl.patch 503 RMD160 7929cf54048919a6ce3672e90424af83418c0cae SHA1 09c8c13a5e742cfd45e25ca36041ee013ef0c63a SHA256 cb82924e3073f6a274ce512a7c58d1f188d2e5fdbc6c661b02cdeb9d781c1a88 DIST OpenCPN-2.5.0-Source.tar.gz 109134818 RMD160 6b4f7bb8e904e678c1fe901f14800fd4cc5d4f4a SHA1 afc30c0d383813d15f815c2b20583447c728c0ec SHA256 2496d43efb9140ec4ca6511fd37e198b88152b685a830bb408f3e4dc641dbb05 -EBUILD opencpn-2.5.0.ebuild 991 RMD160 a1b2a1714166e1d657817f575b0cd433f1d75dd1 SHA1 4818fad476b274c3c4a87d38744233170fdd1e1e SHA256 d74732e91d76c203167bf1ba7fe85426f337613ecb6b432a5e09a818b49d56b2 -MISC ChangeLog 998 RMD160 b2c5899207f480442b2ee236633b2236c359e446 SHA1 5c9f7e7968093c0adc187d1b7474e08628f9d371 SHA256 8b894a03336ed3a36dc9948945941f0d64bb112a93b99cf62a60c9e26ba4f236 +EBUILD opencpn-2.5.0.ebuild 1027 RMD160 160264f2bb0dd851cf6c1c16cb74aab1cb1a15ed SHA1 df1f1ba1008467feed24e0dde546dd0664794009 SHA256 dbd8f5edddccfe89b618c7009e90705dfa27036e6c6d76cd45577e13a26f6a58 +MISC ChangeLog 1177 RMD160 fd188d30fdd1f21a5e991d1c1b2f77c13b387035 SHA1 014d78c545194a6377f7c93303b43b65e402b3b5 SHA256 de4bfd46d704892e868a5f822bacbfe41fe372073e37ccf4b03c127e1c2e375e MISC metadata.xml 337 RMD160 fb6e38e51bc117236717d93aa74e8e25db035a26 SHA1 625261a58d4723baf66003dcd930d7d1a1bc62f6 SHA256 d79f8ef3be20a8db292f07b5d59b705cb584d6860b2ef8fbaba69e29986c6463 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk41ZdMACgkQHB6c3gNBRYeiIACdH2lZ2CY+iICX9ecw6uRhG6CS -zFYAoIrIDSNOvFkWo9tCPJC/CfbD/Gpe -=B+bz +iD8DBQFOgzGfKWxsyjWmQTQRAorcAJ42kI/+5gE6Pf/TKBDQ/A9mwG8BuACfZOfK +h2n4e9vNxiZRUYzKjdDX6qI= +=SgE6 -----END PGP SIGNATURE----- diff --git a/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch b/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch new file mode 100644 index 000000000000..cf3980e4e8c7 --- /dev/null +++ b/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch @@ -0,0 +1,16 @@ +--- OpenCPN-2.5.0-Source/CMakeLists.txt 2011-07-26 16:51:59.000000000 +0200 ++++ opencpn/CMakeLists.txt 2011-09-28 16:28:35.181651034 +0200 +@@ -325,9 +325,12 @@ + ) + + IF(TINYXML_FOUND) ++ message (STATUS "Building with tinyxml includes") + INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR}) ++ ADD_DEFINITIONS(-DTIXML_USE_STL) + ELSE(TINYXML_FOUND) +- SET(SRCS ${SRCS} ${SRC_TINYXML}) ++ message (STATUS "tinyxml library not found") ++ SET(SRCS ${SRCS} ${SRC_TINYXML}) + ENDIF(TINYXML_FOUND) + + diff --git a/sci-geosciences/opencpn/opencpn-2.5.0.ebuild b/sci-geosciences/opencpn/opencpn-2.5.0.ebuild index 76074522f567..0f474befd6cb 100644 --- a/sci-geosciences/opencpn/opencpn-2.5.0.ebuild +++ b/sci-geosciences/opencpn/opencpn-2.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-2.5.0.ebuild,v 1.1 2011/07/31 14:25:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-2.5.0.ebuild,v 1.2 2011/09/28 14:39:18 mschiff Exp $ EAPI=4 @@ -34,6 +34,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${P}-multilib-strict.patch" + "${FILESDIR}/${P}_tinyxml_stl.patch" ) src_configure() { |