diff options
| -rw-r--r-- | app-text/poppler/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/poppler/Manifest | 5 | ||||
| -rw-r--r-- | app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch | 43 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.12.4.ebuild | 8 |
4 files changed, 55 insertions, 8 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index 916ccc229242..2abb2d507dd5 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,6 +1,11 @@ # 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.224 2010/02/19 18:01:06 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.225 2010/02/21 16:43:56 grobian Exp $ + + 21 Feb 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.4.ebuild, + +files/poppler-0.12.4-nanosleep-rt.patch: + Drop flag-o-matic ugly hack in favour of patch by upstream to solve + Solaris -lrt problem 19 Feb 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.4.ebuild: make sure we link with -lrt on Solaris, problem reported upstream diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 366ec7ffe882..9d488eb24cda 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -5,10 +5,11 @@ AUX poppler-0.12.3-darwin-gtk-link.patch 455 RMD160 9f08076c4821a29ef8b96bc0eb32 AUX poppler-0.12.3-fix-headers-installation.patch 1110 RMD160 8e327ab79c6cc3dc149b83be8c96ceb0ecfd494d SHA1 fa9b58cc1ca6f81f5dd30a41f89b8b5c136d9fe4 SHA256 ef05df49853ecde1fa5711f799f75d2811d56481f199995d88efb198f9f5b12e AUX poppler-0.12.3-gdk.patch 633 RMD160 85f009940f64f1e4d8d3b1dff2a8ec1e09b95420 SHA1 90c650df067e5dd2558dee1c098c5655b0f5974b SHA256 c6054c500b6049ec8be492bae5d364c6fdfed23a8ffe704ad80f2677ed13ccac AUX poppler-0.12.4-config.patch 3028 RMD160 5e0d0e51621eeb272d019990c526cbcef21cec1f SHA1 1279f1c31356ccf80857999f1c3574b28a9fae7c SHA256 7c1b7765ad6a55397d16822bf89e9dcee075181bf589bbbad100854274bbe69b +AUX poppler-0.12.4-nanosleep-rt.patch 1308 RMD160 473ccf2a4fc83762f8b17ab20da89af1a9a80566 SHA1 b1103fc1d310bdbbb3cfd1b9bc29d1bfdef9076b SHA256 57d366e46cad51ead796abf2beae33103187c811c1ae9af4a2750aa29c999ae7 DIST poppler-0.12.3.tar.gz 1616883 RMD160 a8fd07ec4dc918cc17390a5236aff9a43e1f7253 SHA1 bce8b675fb7c22d507b1965efa7bd71d9ce09460 SHA256 7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b SHA1 306507e0fbf47736b456218618f043a216c263ef SHA256 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a EBUILD poppler-0.12.3-r3.ebuild 2720 RMD160 2ef7b55545520df24692896ef430b3f9a1d26231 SHA1 d3062e903b628aff17f485719dc44b5ecd35d50b SHA256 0a24a2981fb7760907a73fdbf1937d0ab831be1e65d96c399740ddec9b38dde3 EBUILD poppler-0.12.3-r5.ebuild 2788 RMD160 d767d0a8225a4b748229962aa2db8dfce5f75fcd SHA1 55aac7c1f20f9a970031293dda224c8b32be61e5 SHA256 2532880ea41930aa879019ebcd09f616020744bdfdde1c1ec2a3fa605ff8a475 -EBUILD poppler-0.12.4.ebuild 2962 RMD160 8955937f660f2c28252ee91f6325dbe31da4d07b SHA1 78c45b50dd31b0ac586ed951738184ab02221a43 SHA256 b840c5bcaaeb7c33e9fd49c860689c74f9daa29d4b0b369a33112d9674f6dd9a -MISC ChangeLog 31870 RMD160 16b7e117406e6c4616749b7f91f438b583950589 SHA1 f0add82b5545f4b88dd90c4e404a98f97e0902b9 SHA256 e6dba576d68f9de5d0d0b633498ff21723b6cdaaa99a170a535e7e2b61025f5f +EBUILD poppler-0.12.4.ebuild 2880 RMD160 480271a5aa1806479678624824a701d9c851816f SHA1 65fb798304671ad2bde3588484758d571d782eec SHA256 43fbbdc3bb8575bb15b64e948382183051dc03668c11979f4abf548bc44acb72 +MISC ChangeLog 32082 RMD160 ef751fda77469f6b90ffc502c99af10d6f400112 SHA1 b02eeccf1438e638fb120150635d17e8c07a4d10 SHA256 c3ba172cd389173bb0d9f587631086bd41d9403530ea6bd229f5c464750a368b MISC metadata.xml 565 RMD160 6a9e714721911707b23fb27535d64ab92c90a5f8 SHA1 ca7711ec7b7d2953310ae3b00ff2f447371c103f SHA256 ec946c05ddfa21325d7cb705cee3342f4a95a1d08b02f324e4bac36bfc479e0b diff --git a/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch b/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch new file mode 100644 index 000000000000..a2843bfd7f6e --- /dev/null +++ b/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch @@ -0,0 +1,43 @@ +http://bugs.freedesktop.org/show_bug.cgi?id=26650 + +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index 6049c9a..04de970 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -49,3 +49,8 @@ check_for_dir("dirent.h" HAVE_DIRENT_H) + check_for_dir("ndir.h" HAVE_NDIR_H) + check_for_dir("sys/dir.h" HAVE_SYS_DIR_H) + check_for_dir("sys/ndir.h" HAVE_SYS_NDIR_H) ++ ++check_function_exists("nanosleep" HAVE_NANOSLEEP) ++if(NOT HAVE_NANOSLEEP) ++ check_library_exists("rt" "nanosleep" "" LIB_RT_HAS_NANOSLEEP) ++endif(NOT HAVE_NANOSLEEP) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 2c6ec36..eada899 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,12 +1,17 @@ + + if (ENABLE_SPLASH) + +- set (perf_test_SRCS +- perf-test.cc +- perf-test-preview-dummy.cc +- ) +- add_executable(perf-test ${perf_test_SRCS}) +- target_link_libraries(perf-test poppler) ++ if (HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP) ++ set (perf_test_SRCS ++ perf-test.cc ++ perf-test-preview-dummy.cc ++ ) ++ add_executable(perf-test ${perf_test_SRCS}) ++ target_link_libraries(perf-test poppler) ++ if (LIB_RT_HAS_NANOSLEEP) ++ target_link_libraries(perf-test rt) ++ endif (LIB_RT_HAS_NANOSLEEP) ++ endif (HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP) + + endif (ENABLE_SPLASH) + diff --git a/app-text/poppler/poppler-0.12.4.ebuild b/app-text/poppler/poppler-0.12.4.ebuild index dacac9101e69..7f47d043521d 100644 --- a/app-text/poppler/poppler-0.12.4.ebuild +++ b/app-text/poppler/poppler-0.12.4.ebuild @@ -1,10 +1,10 @@ # 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.4.ebuild,v 1.2 2010/02/19 18:01:06 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4.ebuild,v 1.3 2010/02/21 16:43:56 grobian Exp $ EAPI="2" -inherit cmake-utils flag-o-matic +inherit cmake-utils DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE="http://poppler.freedesktop.org/" @@ -46,6 +46,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.12.3-darwin-gtk-link.patch epatch "${FILESDIR}"/${P}-config.patch #304407 epatch "${FILESDIR}"/${PN}-0.12.3-cairo-downscale.patch #303817 + epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch } src_configure() { @@ -68,9 +69,6 @@ src_configure() { $(cmake-utils_use exceptions USE_EXCEPTIONS) ) - # http://bugs.freedesktop.org/show_bug.cgi?id=26650 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lrt # for nanosleep - cmake-utils_src_configure } |