diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2012-11-04 17:30:58 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2012-11-04 17:30:58 +0000 |
| commit | bae7c63b545582cd1ce753e7c2001908476d4e8e (patch) | |
| tree | 1fcb4a2768b230dce318a0b11fb9ec92a64c5334 /app-misc | |
| parent | set my name right on ChangeLog (diff) | |
| download | gentoo-2-bae7c63b545582cd1ce753e7c2001908476d4e8e.tar.gz gentoo-2-bae7c63b545582cd1ce753e7c2001908476d4e8e.tar.bz2 gentoo-2-bae7c63b545582cd1ce753e7c2001908476d4e8e.zip | |
fix mapnik build (bug #417773)
(Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key C2000586)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/gpsdrive/ChangeLog | 6 | ||||
| -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 |
3 files changed, 29 insertions, 3 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/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() { |