diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2011-10-20 18:59:03 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2011-10-20 18:59:03 +0000 |
| commit | 6ec190d4aec5f7922a60f4a8d73eab1f4477b444 (patch) | |
| tree | 5fff8237577fcf8c79e4a0fe2d4585a4d6f590c9 /dev-ruby | |
| parent | Stable on amd64 wrt bug #387875 (diff) | |
| download | gentoo-2-6ec190d4aec5f7922a60f4a8d73eab1f4477b444.tar.gz gentoo-2-6ec190d4aec5f7922a60f4a8d73eab1f4477b444.tar.bz2 gentoo-2-6ec190d4aec5f7922a60f4a8d73eab1f4477b444.zip | |
Make it build against newer poppler, bug 356027.
(Portage version: 2.2.0_alpha69/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/ruby-poppler/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/ruby-poppler/files/ruby-poppler-0.19.4-new-poppler.patch | 32 | ||||
| -rw-r--r-- | dev-ruby/ruby-poppler/ruby-poppler-0.19.4.ebuild | 10 |
3 files changed, 44 insertions, 4 deletions
diff --git a/dev-ruby/ruby-poppler/ChangeLog b/dev-ruby/ruby-poppler/ChangeLog index d2e7d24c06ba..6f2774c4ceb0 100644 --- a/dev-ruby/ruby-poppler/ChangeLog +++ b/dev-ruby/ruby-poppler/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/ruby-poppler # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-poppler/ChangeLog,v 1.25 2011/09/19 01:24:46 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-poppler/ChangeLog,v 1.26 2011/10/20 18:59:03 reavertm Exp $ + + 20 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org> + +files/ruby-poppler-0.19.4-new-poppler.patch, ruby-poppler-0.19.4.ebuild: + Make it build against newer poppler, bug 356027. *ruby-poppler-1.0.0 (19 Sep 2011) diff --git a/dev-ruby/ruby-poppler/files/ruby-poppler-0.19.4-new-poppler.patch b/dev-ruby/ruby-poppler/files/ruby-poppler-0.19.4-new-poppler.patch new file mode 100644 index 000000000000..74886f829dd4 --- /dev/null +++ b/dev-ruby/ruby-poppler/files/ruby-poppler-0.19.4-new-poppler.patch @@ -0,0 +1,32 @@ +--- a/poppler/src/rbpoppler-page.c 2010/09/22 14:30:22 3809 ++++ b/poppler/src/rbpoppler-page.c 2010/10/03 12:30:52 3942 +@@ -332,6 +332,9 @@ + } + + if (NIL_P(rb_rect)) { ++#if POPPLER_CHECK_VERSION(0, 15, 0) ++ text = poppler_page_get_text(page); ++#else + PopplerRectangle rect; + double width, height; + +@@ -343,10 +346,16 @@ + text = poppler_page_get_text(page, + style, + &rect); ++#endif + } else { +- text = poppler_page_get_text(page, +- style, +- RVAL2POPPLER_RECT(rb_rect)); ++ PopplerRectangle *rect; ++ ++ rect = RVAL2POPPLER_RECT(rb_rect); ++#if POPPLER_CHECK_VERSION(0, 15, 0) ++ text = poppler_page_get_selected_text(page, style, rect); ++#else ++ text = poppler_page_get_text(page, style, rect); ++#endif + } + + rb_text = CSTR2RVAL(text); diff --git a/dev-ruby/ruby-poppler/ruby-poppler-0.19.4.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-0.19.4.ebuild index cbefac7adda4..c62b9aa78788 100644 --- a/dev-ruby/ruby-poppler/ruby-poppler-0.19.4.ebuild +++ b/dev-ruby/ruby-poppler/ruby-poppler-0.19.4.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/dev-ruby/ruby-poppler/ruby-poppler-0.19.4.ebuild,v 1.5 2011/03/13 15:40:40 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-poppler/ruby-poppler-0.19.4.ebuild,v 1.6 2011/10/20 18:59:03 reavertm Exp $ EAPI="2" USE_RUBY="ruby18" @@ -12,10 +12,14 @@ KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND="${RDEPEND} - =app-text/poppler-0.14*[cairo]" + app-text/poppler[cairo]" DEPEND="${DEPEND} - =app-text/poppler-0.14*[cairo] + app-text/poppler[cairo] dev-util/pkgconfig" ruby_add_rdepend "dev-ruby/ruby-gdkpixbuf2 >=dev-ruby/ruby-glib2-${PV}" + +all_ruby_prepare() { + epatch "${FILESDIR}/${P}-new-poppler.patch" +} |