From e8b1061171e9d62f432ec767a64a1967a120b5dd Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Thu, 20 Oct 2011 18:59:03 +0000 Subject: [PATCH] Make it build against newer poppler, bug 356027. Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64 --- dev-ruby/ruby-poppler/ChangeLog | 6 +++- dev-ruby/ruby-poppler/Manifest | 13 ++++---- .../ruby-poppler-0.19.4-new-poppler.patch | 32 +++++++++++++++++++ .../ruby-poppler/ruby-poppler-0.19.4.ebuild | 10 ++++-- 4 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 dev-ruby/ruby-poppler/files/ruby-poppler-0.19.4-new-poppler.patch 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 + +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/Manifest b/dev-ruby/ruby-poppler/Manifest index b17e45e6b772..16c402d236dd 100644 --- a/dev-ruby/ruby-poppler/Manifest +++ b/dev-ruby/ruby-poppler/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX ruby-poppler-0.19.4-new-poppler.patch 955 RMD160 34de9c935723456f8032adaf23abd72d3d24abc2 SHA1 2ef68a47727cdc6bbd129ddfc32175605771df54 SHA256 d5d0ff2ff05a0d1320ce739371978a80ecc5b25adb322a3e1eedcf58f1e4da8f DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6d794cfb7d9 SHA1 6fbaf51cced8cc15158144e15898244f2ebf6870 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5 -EBUILD ruby-poppler-0.19.4.ebuild 556 RMD160 1aa7cae567cb291ee148d012a2e22fae7fbf610c SHA1 034a03f365462a65ebc94adcde82a11a23f5e0cb SHA256 82f40ec6e61b62230033333bd7487ddab295a1f8daaa1b53f470bbdce07df6fb +EBUILD ruby-poppler-0.19.4.ebuild 613 RMD160 fc820349655cc31053118a8573e98c6b3b50e2d7 SHA1 6dc0f7f1d5fd9b21baf115d41f166774acc40e0f SHA256 341f2988c1ee78a7376c8d16b9df5691b4216067efb73b891ad526bd05192fd3 EBUILD ruby-poppler-0.90.8.ebuild 574 RMD160 899b2e95737a0c59cd0e2f8107f18eaf31ef6676 SHA1 4225f515ed3f16b1917ed65d6373c9d9e76b314b SHA256 20ceefcd6c27e24e89826bf9cb87b4e27e3c631415cc12a7702fb7e5f837019e EBUILD ruby-poppler-0.90.9.ebuild 574 RMD160 318f0df5a061a21b0110f76d1f2fb255194a4fe2 SHA1 6df5886974085a1fe263a7b8f99988cb20afa863 SHA256 23cf80942ca58f4dccb31a4a7ed04b8c890605496fc06b3ddf6015ba4e4282fd EBUILD ruby-poppler-1.0.0.ebuild 573 RMD160 44c0c0fff7b587ca722f06db7da39a906b78155f SHA1 fb4132710d0b29ce01b5eb507e060ded9c4f94ae SHA256 41bfefaa18fbcbaa6e0ddf77dffaf6518bd10ed4d52e7e70efd37594904c8d41 -MISC ChangeLog 3818 RMD160 71f80a0f77f0cf4804cc3f83d8cb04b85b2af3a3 SHA1 194aebfe106b49cd1ff1d6d3d39fe9a334799968 SHA256 a77e068dd0019e9e46d317059543c455e1c15d7442e2f9cb41d2d7f1f9f5c343 +MISC ChangeLog 4003 RMD160 1f46a1d34b009baf9e299997e621ce6d7155e590 SHA1 bf610f8b4a90ec1efd9ed50cd3701e0e6c98480f SHA256 b8d53c1835e45b122897c37bc34bef5165f9eac95a38676974a7f663b26ada49 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk52meoACgkQGpDnPLSHuMAkZgCgw9JwJBoEv0X1cRP2qYTi6XCE -6HsAn3sMV912+TKQEvCZTFz0/PECkf5w -=zAMO +iEYEARECAAYFAk6gb3wACgkQFuHa/bHpVdtMTgCfaCzsm+/iAIClqKAXP0mmW0B1 +/KYAmwdCgymZ2JHn0DgMpbQXSLKjZCOo +=k7am -----END PGP SIGNATURE----- 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" +} -- 2.26.2