diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2013-03-16 11:40:21 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2013-03-16 11:40:21 +0000 |
| commit | 54c11a912909df8b7c1ec84dca39f21fa1a45a0a (patch) | |
| tree | 3877238f6da77c541b7b1adc9ce8411b16f16b98 /app-text/poppler | |
| parent | correct docs, fixes Bug #461776 (diff) | |
| download | historical-54c11a912909df8b7c1ec84dca39f21fa1a45a0a.tar.gz historical-54c11a912909df8b7c1ec84dca39f21fa1a45a0a.tar.bz2 historical-54c11a912909df8b7c1ec84dca39f21fa1a45a0a.zip | |
Detect freetype via pkg-config, needed for multilib support, bug 459394
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xB6C5F7DE
Diffstat (limited to 'app-text/poppler')
| -rw-r--r-- | app-text/poppler/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/poppler/Manifest | 30 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.22.2.ebuild | 11 |
3 files changed, 28 insertions, 18 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index 91f2ab6209df..3e177ecf1bcd 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/poppler # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.360 2013/03/13 23:48:02 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.361 2013/03/16 11:40:11 dilfridge Exp $ + + 16 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> poppler-0.22.2.ebuild: + Detect freetype via pkg-config, needed for multilib support, bug 459394 13 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> poppler-0.22.2.ebuild, +files/poppler-0.22.2-nojpeg.patch: diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index cb9c0271aa98..6a627fe858d8 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -10,23 +10,23 @@ DIST poppler-0.22.2.tar.gz 2215737 SHA256 108736ef84069317f6c5beacb5268f3b799ecf EBUILD poppler-0.20.4.ebuild 2687 SHA256 4d1a8e36a62606b2c5c1505160f88f1b366219500a39e47922c46c96f688c5de SHA512 1653cfece19011526d9388472cc7e4e00adcf14385f61348903f54e1405a1672f8dbc8229cf05d745cee7821037289f5f82dc59e618798ff5815ec7d050fd14a WHIRLPOOL 780e04e133da029d3e52c6f2a8493209fe492231a9b93f7806808b9cf5d8cf5b151d8732927bdddbe12783fa20794d3e4231ccba449cdc8e2453b1807532e2be EBUILD poppler-0.20.5.ebuild 2730 SHA256 3d109d7c45b66e0e403193bb4dd9c5275a519798d56ff8294527e916af38ab85 SHA512 ba9122db7b2d38f53d8a675ab0575137a7706189d43fabbf31dfc19471a8100204937cd2f7a6c2dfee728b37f0dc45dd96386797b2158d30e134397beaaa6958 WHIRLPOOL 81e4d3d445ec37cb733a0ff8c3ed04b87eee9c578195abe07263748aac3488c7c1f157d934744eac8dfddc1da4a194e2158cf12ad88acb7b81dffd5d740bd3c7 EBUILD poppler-0.22.1.ebuild 2635 SHA256 cce5c59153b4a5860de8ba9633020d86b7592e9331c15c3a575bdfd4a3f5ad42 SHA512 e44c2d339e7276d913d8209a1e5b388a43e5744250d3f4c382889221fc578922d8ba308d263dc0e9e98177d42773c2b5998e3924bac823050aed77c10c242a17 WHIRLPOOL 053960e29c85e0bae8a1bf080039438ece63be97ec7af261c86f808d20cf08bfb3fe623351560693bd4676e85afadf8e2b57eed9fab510f58b23c1bb8f465e19 -EBUILD poppler-0.22.2.ebuild 2770 SHA256 4b111273d09647953a0958b4c4c930b7a793ef4a78eb8ffaff2fc518f42efc75 SHA512 cac1713afaa7c371695d64bb3ba027ae081769d68cc22031c37aeaea00de7ef5f7d780bb26d62d27639c70479c818d001fd0bcf62e6c05495a3e4ca210c071ad WHIRLPOOL 5d2916dcd539e4d6555e1480ebe93e455aded99d924e7c266a1dcd5cb0589f84f12718556960fab0d98533fba3e62c5b088ad12b34b87c0944fba561046279dd -MISC ChangeLog 50826 SHA256 56162eadcedde138f61b7e570cbd5d3d5e5bfc5a1f8765d207000e54fc277025 SHA512 0a670cf957845641b231df976ab9f1e45cfe83bbbc8ad9fe1dab86d83a124213a103a604cdf9eaaf90e4119b3ec56cd9e68a3ad64197fb288755d166e00a609f WHIRLPOOL 115ce6495d192626793cc9489ad8856776beceaa1d0d723790350a459e32a42018aa1e1b27bb32c61441de27d1638fc98e08763ac3bf4a859b9cf62e2506c6c5 +EBUILD poppler-0.22.2.ebuild 3109 SHA256 563fe6cb02d770071e614d082a2105aeccbfd1da18c85c35f09ca3dff0603f6a SHA512 f89f5c7d0d519d2cbafe7eeb3d20215d83371be57e62855e2186b14b01cebe6f2f6cb9b67fbaa35f1510c290e3726a85728030630585a085d24b95274f10e8df WHIRLPOOL 095b7f6daaea1af7c03e7ad1c8996642d28986cb6561ceaed4d3353a6ba70305c95754acbb4c50dd447778b2102d36a51a71ecef020f347f4089eede47ad338b +MISC ChangeLog 50981 SHA256 7d2f209d358e83ebeb91b951e9c55ec504de4e70b4e3f212d38bac2aa48200ed SHA512 91c3a050de1364fd31c4ed8403eac3d46988539fc7ac8f8caba363896993896f5e95b8c3ef017138e763c3a229aaa07f1a2ee2c072757f5f0d1a9847d22ed525 WHIRLPOOL 2d7791a9b383a5e17200a1c0c8cf0c6e835a28af85eb9bc9e26f9071332fd0861e47dd981c173b2dc92c3cc16122288eef4e4285ff15fbeefe775a8f4042ed26 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJRQRBgAAoJENwGBM22xffeEHQP/RrwnEepuGTxKnqhXjpxTLRq -A8kIkwYuieZu6cEJX0EIQP8BxqIdI9Rr9PEPeEbdlvM/68XkIgJoeoe8oWVythtq -ewTvTFiHrw7qNsr1uBEPAo27CGOV8RsDeq0L+t00OZtOxbZHMzkwupMBXH8EQfIF -gZGhv3xK+feVeX4lL/IWjIjkqFKrznyfL/nSvx5jinCrjM5CmoSlLSOpl97m0qGs -u5YLRLmMIBVsxfBXeF+JQohiqufWxNuQo/CIZ3ZeIkxY2RqvpuRVjvCaPLkRpjM3 -rDe5ZEf0geYzmVBGRj07pIUEQy5t+Ox30j+7of/Cq+Erdhmn5V6ZUagLbCb1x9Sx -W/9Vlo9HpdwB4yO0NC4Qwvo7X8Jslm6OBRDmPDcF5nbD5ZW23cGGnAwN0w15OSa6 -6uYSlpO71nyzsMZgSrkNW885aneK5PiFlpjMLAwtqo2uB4y8zpRQA/uNmQiWn1ss -fQvm9ztZTSFDrp1MZUa4le5d18G7/Ay0fHWIhVyYtJ+CaNE2Op4E0HITOWGdYG7V -HWR7vxDeRaFIiKabv2SwyMWqu1RyEyHQA6FH4siSShJgKVuDWdf2wfvDht8SHaB6 -YpPuGVtIbOXlbJj5aJ5dm/RGbmfUPJMDfnjoT5od6Ccoc8FgazcA1gdwukeKsbu/ -m5gBRzSRMscNNFOe38Dm -=MENj +iQIcBAEBCAAGBQJRRFpNAAoJENwGBM22xffehRcP/ijrLPZEbtC9T2ydt9tP6Czs +aa25LoutR3UQdXjM0JVeyp+6A/KhAPqgObKskCgbHy/9rdd17JKBgIVNguyL7mKh +6VTuMK8Jr0I7YXhPQ/qnYLRBxM3VnEwrfGf+MeQqASEuAwfU8XVuqVZJo67qiTrb +XreBxYj8EyCi3eE0DG9DYB6SP3mSNvxm7sC+tp/+egKipnS2mZy9q6P7jL8Rk9CN +VN/ffRfKRjn2zMWrFC4draZ4JAZexE4J/33yTGrZhIhZoNtqEEersZkTUkdMTyZM +WRMTP/QZUWYB6ydzUz8tTocDS6gQCy3fbiwjENA3/Nv53x24l+b0KkD7IqbRfhIM +W4EDp8VrwdSSYqbpvt/Fw6L4ZbumGV3yXrKrQwnPEmUIuSzaltlbilCHpLlxNrCU +Ff5vg1V271nX89qJd8jeyjrJTI0gN3CxHMrDXU9Qv3894yrwyRVI1o2MZl+ZZzLY +jzgU9FbJvZEywausIqp8P4YCUGwOfLu3GXwT6wyZK3q7ln7GUO50RsY4nsbl5Rgk +kT4PJqv6oHSfaa3zsTTf/u3+02p5IC8/Y5Z3OgKzqFmb8HUAVok31AapCAAurOIU +AyfY4wgz3mLR2J/UrGxtvwho2hV6/YlvOliIqHrT4lZgIOcCD5h/i2Fh3mg+v93T +FD73TrDeRKOfFCp0MwYo +=9a1P -----END PGP SIGNATURE----- diff --git a/app-text/poppler/poppler-0.22.2.ebuild b/app-text/poppler/poppler-0.22.2.ebuild index 3a8709af9473..147161e7aed4 100644 --- a/app-text/poppler/poppler-0.22.2.ebuild +++ b/app-text/poppler/poppler-0.22.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.3 2013/03/13 23:48:02 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.4 2013/03/16 11:40:11 dilfridge Exp $ EAPI=5 -inherit cmake-utils +inherit cmake-utils toolchain-funcs DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE="http://poppler.freedesktop.org/" @@ -57,6 +57,13 @@ PATCHES=( ) src_configure() { + # this is needed for multilib, see bug 459394 + local ft_libdir ft_includedir + ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)" + ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)" + export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}" + einfo "Detected FreeType at ${FREETYPE_DIR}" + mycmakeargs=( -DBUILD_GTK_TESTS=OFF -DBUILD_QT4_TESTS=OFF |