diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-02-05 12:15:55 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-02-05 12:15:55 +0000 |
| commit | 8d391a4c4dc4e76f8dd8b6747926a040f471678f (patch) | |
| tree | dccbd292e0813172b13fb5147a21fe1d400d1c06 /app-text/poppler | |
| parent | Add missing dependency on dev-perl/mime-construct. (diff) | |
| download | gentoo-2-8d391a4c4dc4e76f8dd8b6747926a040f471678f.tar.gz gentoo-2-8d391a4c4dc4e76f8dd8b6747926a040f471678f.tar.bz2 gentoo-2-8d391a4c4dc4e76f8dd8b6747926a040f471678f.zip | |
Add patch to fix linking on Darwin, reported upstream
(Portage version: 2.2.00.15320-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'app-text/poppler')
| -rw-r--r-- | app-text/poppler/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/poppler/files/poppler-0.12.3-darwin-gtk-link.patch | 14 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.12.3-r3.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index a4a584b47680..863ef91939eb 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/poppler # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.213 2010/02/04 21:33:41 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.214 2010/02/05 12:15:54 grobian Exp $ + + 05 Feb 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.3-r3.ebuild, + +files/poppler-0.12.3-darwin-gtk-link.patch: + Add patch to fix linking on Darwin, reported upstream 04 Feb 2010; Markus Meier <maekke@gentoo.org> poppler-0.12.3-r3.ebuild: arm stable, bug #290464 diff --git a/app-text/poppler/files/poppler-0.12.3-darwin-gtk-link.patch b/app-text/poppler/files/poppler-0.12.3-darwin-gtk-link.patch new file mode 100644 index 000000000000..4c67db049de7 --- /dev/null +++ b/app-text/poppler/files/poppler-0.12.3-darwin-gtk-link.patch @@ -0,0 +1,14 @@ +https://bugs.freedesktop.org/show_bug.cgi?id=26442 + +--- glib/CMakeLists.txt ++++ glib/CMakeLists.txt +@@ -100,6 +100,9 @@ + if (CAIRO_FOUND) + target_link_libraries(poppler-glib ${CAIRO_LIBRARIES}) + endif (CAIRO_FOUND) ++if (GTK_FOUND) ++ target_link_libraries(poppler-glib ${GTK2_LIBRARIES}) ++endif (GTK_FOUND) + install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) + + install(FILES diff --git a/app-text/poppler/poppler-0.12.3-r3.ebuild b/app-text/poppler/poppler-0.12.3-r3.ebuild index 0ab70438dec2..d83d768e4d46 100644 --- a/app-text/poppler/poppler-0.12.3-r3.ebuild +++ b/app-text/poppler/poppler-0.12.3-r3.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/app-text/poppler/poppler-0.12.3-r3.ebuild,v 1.6 2010/02/04 21:33:41 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r3.ebuild,v 1.7 2010/02/05 12:15:54 grobian Exp $ EAPI="2" @@ -41,6 +41,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-cmake-disable-tests.patch" epatch "${FILESDIR}/${P}-fix-headers-installation.patch" epatch "${FILESDIR}/${P}-gdk.patch" + epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch } src_configure() { |