diff options
author | Christoph Junghans <ottxor@gentoo.org> | 2012-11-04 17:31:06 +0000 |
---|---|---|
committer | Christoph Junghans <ottxor@gentoo.org> | 2012-11-04 17:31:06 +0000 |
commit | 1ce3fc22fdfc4e736ae3a352a264e481ec1537fa (patch) | |
tree | d12ceda1b43113b1851c7ffc7db92e955ccfca6a /app-misc | |
parent | set my name right on ChangeLog (diff) | |
download | historical-1ce3fc22fdfc4e736ae3a352a264e481ec1537fa.tar.gz historical-1ce3fc22fdfc4e736ae3a352a264e481ec1537fa.tar.bz2 historical-1ce3fc22fdfc4e736ae3a352a264e481ec1537fa.zip |
fix mapnik build (bug #417773)
Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686
Manifest-Sign-Key: 0xC2000586
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/gpsdrive/ChangeLog | 6 | ||||
-rw-r--r-- | app-misc/gpsdrive/Manifest | 15 | ||||
-rw-r--r-- | app-misc/gpsdrive/files/gpsdrive-2.11-as-needed.patch | 21 | ||||
-rw-r--r-- | app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild | 5 |
4 files changed, 39 insertions, 8 deletions
diff --git a/app-misc/gpsdrive/ChangeLog b/app-misc/gpsdrive/ChangeLog index 603cb42ff37a..06fe94462571 100644 --- a/app-misc/gpsdrive/ChangeLog +++ b/app-misc/gpsdrive/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/gpsdrive # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.53 2012/10/07 08:56:15 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.54 2012/11/04 17:30:58 ottxor Exp $ + + 04 Nov 2012; Christoph Junghans <ottxor@gentoo.org> + +files/gpsdrive-2.11-as-needed.patch, gpsdrive-2.11-r3.ebuild: + fix mapnik build (bug #417773) 07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, #24135. diff --git a/app-misc/gpsdrive/Manifest b/app-misc/gpsdrive/Manifest index 800a12d1a36b..7010da7aa805 100644 --- a/app-misc/gpsdrive/Manifest +++ b/app-misc/gpsdrive/Manifest @@ -2,17 +2,22 @@ Hash: SHA256 AUX gpsdrive-2.11-add-gdk-pixbuf2.patch 1420 SHA256 b5fe834f172052765e20e232d9b37e44694f833e808a3493873201d274dc5b80 SHA512 2a0dee3ded3279e9a8bd94539da50b2a4a25ee58eb6c85ca8e50e5cd40a3b772134b2cec920b8750b3ef72e838e99825e5de5beb12cab892751e2834fbd8a673 WHIRLPOOL 2f039d77e7799d041359dcf7571b33546eebe5cbe385d62f8c8ac95a6b0f1696e8b2c2974a7ea30aac338b0e298d57571213e02bc4de8d620f588ba383c0f0d8 +AUX gpsdrive-2.11-as-needed.patch 769 SHA256 76618e4b5e6dc5a47876ba13997f9eb79f06caeb46182e4d5c98bdda49452004 SHA512 80def1ee7ede2f84710d4b69d7a3fd4be8bd639e368e14275ec8a5685e3bdf2dd1e03e3aff74e790cc4b4a9d6bc91280e7c0b726894746c092b1bb29ee7c866a WHIRLPOOL c27c911722ed06617591883cf73603b04a1e53a1ce7ba72adc50819c1fb32b45f1de216d1830b1097706741bc65d8c4cf6c9009843247a18f5b84922d76bbe0f AUX gpsdrive-2.11-gpsd-2.96.patch 1317 SHA256 436eeb21a309c986dc35ea5e3ea23c349e92b104c41ffa69005dd3b5ff69df31 SHA512 19c051e7d7fd9f8291e5146e238ea2e942f79a6db7132edd6aa18c7ca2ef0981ed27c2de5ce3852208d9d63a01b22b7b970b13acba6ecfb07e19857a605224f3 WHIRLPOOL 6a108d8b8d8f141f55070805aeb3401bfb182f4a4aad48c47ec35faf46d62277c0fdf8549b070938e453db3d4942216d6b1f9efb8e5505b9bacc0eaea0597f0f AUX gpsdrive-2.11-mapnik-2.0api.patch 3128 SHA256 5c820be5c1227292da1e4c01a192f0ab48f148fda64142c6ec70383d3fad4b34 SHA512 df06f20c537d0e076536f68a63acdc2886c1d9a593234016ac8e2d1d436275251d6cb47c50b66d4b12ce2f5985839f8133543a00305922a867488568341f553b WHIRLPOOL 6fee869082ba2a30fb40040647569dfe8a042ae2b3d5ffb9e500057df0a984175a2f7b14372fd2846aa2048b4aaeb2f59ceefe226e9ac59f2035a29eb5f8624d AUX gpsdrive-2.11_DefineOptions_gpsd.patch 430 SHA256 4fc8e95d383eb9040e6301235226911c5aa4f735a715757aaf4ec900198f00d9 SHA512 540709c667d449fd2656d6bd37dfadbbf14d87b39e7655177d31c6a1c5bfc12ed95f58e2ad7cf62a1ff294df85a4dd950bff3bf39b26b68266a02b3215f044c4 WHIRLPOOL a07ffb53c677344eb75309ce4f8b1a6e36a95e9db01535deffa4b822f10a79b43c6319e76ce1f2234887da89e6068586ebbfe6ab9924275cfc22793e5f4d70dd DIST gpsdrive-2.11.tar.gz 5709822 SHA256 57bb96f1c037c6a28dc3834777a4ec73fb35c03115d85d465d13a1ec1b35ae56 SHA512 d3595bc45dd6a2f2bcd9f301a73408de860a525eb2b49a241ead9b9288d326f5fb19e8ccf08b66a7ba6cee99a4180556c9b7cb667ca122d825367c8361ea8db6 WHIRLPOOL eaac2ca73484a6a9cfd83eebe8c56f5bd695d4e5eae638c89d3d864186e3d9e33c68e56ff45e8f4fd4908ca8d844edb3bb1250449e3bd9bc46e6a55cbc1e3d06 -EBUILD gpsdrive-2.11-r3.ebuild 4501 SHA256 f84582792d85e6201d39b7266ea855b8610e2cd84d76cc4fa521857250a1096e SHA512 160cad39cee22767637f45bccd8baf0313b05ecf0d15ad0f9bc76baa04f18ab2ddca2bc46313bc17a71ed1a87fd45a5c7c25dc7399b8f7d6b1aa7ea4d7639ec0 WHIRLPOOL 1ade34f8e160ec9e667d8cb24f29eb870bd61b51d6b6354d28b1ec9cb7513548b25ae218204dcb0a1a6097596d33ad16e8b965bed434b33e92719e17d3d878c3 -MISC ChangeLog 8776 SHA256 bddaf65c1393d0725289204f67b82cd00e4aedc13baafa8c905002f342e09a17 SHA512 0bed5d57c0f6060ac16a41a139116f83e14dee7b26d6bbf8f0f1f04709a9f6a6dfe7083b82faa6b7aaceaebfbb8a1542309d1587f94d190d3bc6cf6e4f1580c8 WHIRLPOOL ee9bdc2dc39701bc34c97975527bc020778d39d95ab8c315f64f04e85d6f4e60debd5f678ef51bf6f867c7f54e2288bb59d2698fb9f9022c98d79e17c937f345 +EBUILD gpsdrive-2.11-r3.ebuild 4537 SHA256 ee14ab9d6cd6b6566b27ffa680e7cee01c17f29551bcf347660c23d47670b6e6 SHA512 b06ad1c3d6b323be19dca883e4339585589f4bbd6b89e911aa7c7230d7c1893f47a8fc919a4698c1defb4d1433cb1ea41c5b4e8928be9391921e56206e2b435f WHIRLPOOL f8c16700edc0a21dbdac4ba79fe5e6ab2c337b0bdede815f183fad8452a3996a39883dc3a4ff6fe0f5f06edc2e1b964b9370c7ffe5f006f324a73bc77f46176c +MISC ChangeLog 8930 SHA256 19adef5d1b5b3e18fef0c1893bcae7c3584edf61eec74f1e0196272c147ed436 SHA512 b796c358b4e1a4edfd3ce6d00ce14330f0d4d3f01798cd99ea9a3ac70db74e457dc979cf453459bba13bdf4be4e30f8c2d6dbe8c56600b7b8cbb1578dca33c76 WHIRLPOOL b0983960f6e1c520ecf56ab3f457497abc8350c61367a89fff97f45741601281add8f1fc2dc0942cd47d8a4fdea02026349ff70937cfcf217ea58bada51c6ea5 MISC metadata.xml 529 SHA256 b3fdade0fbedc3d38f9076505e48c6f77d24dfb9ecdcbc3b9c6788b2854e0935 SHA512 3d2ef256ddc449c3ef229525b1d5ffb517dc0d69f9eb45ab29faeafd5a58734272b871de69c4da96e344ac49ba1b1a0bdc5ff454acbc098c7a73bce3171a2ec1 WHIRLPOOL 415c9137c9ce920d0a1d08e9ae7d46e8de5ad96a2972596cfe69998221739264a895d8252d60a147b7039e5f7fea53004b98b45c2aaacdfa8e8110f297408398 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlBxQ7AACgkQCaWpQKGI+9R1ZgCfWGHgnV27mIrnVuYaCTgXSAzx -CVcAn2PRS/wtsxhoqyRnw2mHNrSazqau -=vmdG +iQEcBAEBCAAGBQJQlrRlAAoJEOeBhlrCAAWGjPwIAIFXIXB73jdJJeFXDwMrJRtw +N4q7KOZcdYBWhrhNCpvpueKiBrCZQNlEasAbX3N3HMr8j0+2H5ouJ/VORL304lTz +MdXFpn7lxsPXW7fqSsMoG9OIpkF4LnaRHCxuaFmk0ejv1ZbR/nD8F23rvKung/8F +i2YpUcQkzErHwrDukMHIPuj9xtCuR6AahqsKjib9lWo6G2oaDkkB+diG8g2nYMBj +3unTL2daCnRruevE9EH0eB7CMZjlT6ESqD1BLZdhqEoiOfbtXBI7LQBJDcvY19FK +2O1tcqUHVm14p6hAbJgs0sBfQHv7Y0CI88R9Q+NkyMytx9/v2FeplpErndVm1c4= +=vIBp -----END PGP SIGNATURE----- diff --git a/app-misc/gpsdrive/files/gpsdrive-2.11-as-needed.patch b/app-misc/gpsdrive/files/gpsdrive-2.11-as-needed.patch new file mode 100644 index 000000000000..b19951206bb5 --- /dev/null +++ b/app-misc/gpsdrive/files/gpsdrive-2.11-as-needed.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/show_bug.cgi?id=417773 +diff -rupN gpsdrive-2.11.org//src/CMakeLists.txt gpsdrive-2.11/src/CMakeLists.txt +--- gpsdrive-2.11.org//src/CMakeLists.txt 2012-06-19 20:02:50.960300653 +0200 ++++ gpsdrive-2.11/src/CMakeLists.txt 2012-06-19 20:03:03.263146846 +0200 +@@ -28,7 +28,7 @@ if (WITH_POSTGIS) + endif (WITH_POSTGIS) + + if (WITH_MAPNIK) +- find_package(Boost COMPONENTS filesystem REQUIRED) ++ find_package(Boost COMPONENTS filesystem thread REQUIRED) + find_package(Mapnik REQUIRED) + add_definitions(-DMAPNIK) + endif (WITH_MAPNIK) +@@ -177,6 +177,7 @@ if (WITH_MAPNIK) + set(GPSDRIVE_LINK_LIBRARIES + ${GPSDRIVE_LINK_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_THREAD_LIBRARY} + ${MAPNIK_LIBRARIES} + ) + endif (WITH_MAPNIK) diff --git a/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild b/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild index bc25b57c5e4e..31573fa72184 100644 --- a/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild +++ b/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild,v 1.4 2012/05/26 08:37:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild,v 1.5 2012/11/04 17:30:58 ottxor Exp $ EAPI=4 @@ -76,7 +76,8 @@ src_prepare() { "${FILESDIR}"/${P}_DefineOptions_gpsd.patch \ "${FILESDIR}"/${P}-add-gdk-pixbuf2.patch \ "${FILESDIR}"/${P}-gpsd-2.96.patch \ - "${FILESDIR}"/${P}-mapnik-2.0api.patch + "${FILESDIR}"/${P}-mapnik-2.0api.patch \ + "${FILESDIR}"/${P}-as-needed.patch } src_configure() { |