From e674614553b2a8d198fa20d9bc207e57320af774 Mon Sep 17 00:00:00 2001 From: Javier Villavicencio Date: Sun, 25 Apr 2010 17:37:04 +0000 Subject: [PATCH] Apply patch from upstream wrt bug #314925 with revbump. Package-Manager: portage-2.2_rc67/cvs/FreeBSD i386 --- app-text/poppler/ChangeLog | 9 +- app-text/poppler/Manifest | 5 +- .../files/poppler-0.12.4-strings_h.patch | 36 +++++++ .../files/poppler-0.12.4-xopen_source.patch | 31 +++++++ app-text/poppler/poppler-0.12.4-r3.ebuild | 93 +++++++++++++++++++ 5 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 app-text/poppler/files/poppler-0.12.4-strings_h.patch create mode 100644 app-text/poppler/files/poppler-0.12.4-xopen_source.patch create mode 100644 app-text/poppler/poppler-0.12.4-r3.ebuild diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index e1a44876150b..b21dccc3060b 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,6 +1,13 @@ # 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.229 2010/04/10 02:13:17 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.230 2010/04/25 17:37:03 the_paya Exp $ + +*poppler-0.12.4-r3 (25 Apr 2010) + + 25 Apr 2010; Javier Villavicencio + +poppler-0.12.4-r3.ebuild, +files/poppler-0.12.4-strings_h.patch, + +files/poppler-0.12.4-xopen_source.patch: + Apply patch from upstream wrt bug #314925 with revbump. *poppler-0.12.4-r2 (10 Apr 2010) *poppler-0.12.3-r6 (10 Apr 2010) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 4f2df05a0ddb..1644f4646907 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -7,10 +7,13 @@ AUX poppler-0.12.3-gdk.patch 633 RMD160 85f009940f64f1e4d8d3b1dff2a8ec1e09b95420 AUX poppler-0.12.3-preserve-cflags.patch 2619 RMD160 a3b208274594d37ad5b22abd4b6cf011f4971223 SHA1 029e79b2b8ab031e9412e717f9bf14fa62824d3a SHA256 6ea1e9bd11e6ac8c007d4920ed60d9c4ce893dec4c99d6c31e769e3e0d6c906e 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 +AUX poppler-0.12.4-strings_h.patch 927 RMD160 f1bbe64a295a78ba3596b1ad834cd14859c647a0 SHA1 f203cdcbc50f6e491a8db6c3f0591b3409d0393b SHA256 11a28f1aa00b2de51b49918be1b20e09e33de76b20515a1a8a9e13210bcee639 +AUX poppler-0.12.4-xopen_source.patch 1878 RMD160 13541fb85dec76297d1d35c9591c1f7b6b720a62 SHA1 b98a3a25f867000aa937e1b9e1e39cec7a7b829d SHA256 2c6877e6bf886d7fbda08cdf2f7a0716c876bb6f5406b8919986306b5e589758 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 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1 EBUILD poppler-0.12.3-r6.ebuild 2883 RMD160 d510adb2cc44a49540b61081b2cc9d3277d33d2c SHA1 fe34b44bd0a381b8f3fbefb6eacab8787946463b SHA256 009f3049f8e69b829d0a73188cde586aabf81ebb7687b8efd32a35bbc30edb36 EBUILD poppler-0.12.4-r2.ebuild 2977 RMD160 a4f91c9bb127b4bf55934f8cab6f025ce010bad8 SHA1 282a5ba408f0d0d66f810ae50c7ec773b1222976 SHA256 ad8fe82576493717addc1ac41c99ea4c17d1aa0f821fc20e645b9b8ab7838f24 -MISC ChangeLog 32874 RMD160 a7e085d31a2b1e5a03a51863a164fbcf6c3144a2 SHA1 275c6f6fe74bb52008fd72711774dc84be39ad3c SHA256 6a7b2fbbcbfa0e8d379bdadbba13b126226472898876c91ca7ed7ad3648e3357 +EBUILD poppler-0.12.4-r3.ebuild 3098 RMD160 f619d03c7d85bc25e6f37f1d1104ea653b7c0f13 SHA1 5e8b865740a5db46d26aaff96ce3e9e8f9e107a2 SHA256 d0f8b581636d5bc449315e9ef3c21e508c46166e5ba96b8323a84c9f46e2b024 +MISC ChangeLog 33137 RMD160 ba959fbf273a57760f20ad968df16ee5e8243eb6 SHA1 595e9a72b91548135209b01e6fd8ead1a7b95c63 SHA256 57866c4bc5a82103c7240e5b5a9766ee5b275b7dc49912e97671ce66d6147212 MISC metadata.xml 662 RMD160 b2bfa73aa44dfcdd9174ab7ae7e210957dd1dead SHA1 c53dbd326209bbbd743a539c08a07bb4d045507b SHA256 484bd11aa8a96c00b419805d8ca7537ac1adb99385894ff0f3d6cb7f8d1cc3ae diff --git a/app-text/poppler/files/poppler-0.12.4-strings_h.patch b/app-text/poppler/files/poppler-0.12.4-strings_h.patch new file mode 100644 index 000000000000..49dea9178ba3 --- /dev/null +++ b/app-text/poppler/files/poppler-0.12.4-strings_h.patch @@ -0,0 +1,36 @@ +From 4cce1f14e964edf1bf2d9fb8286ee002a67dc212 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 13 Apr 2010 20:57:16 +0000 +Subject: include strings.h on non windows platforms + +See also https://bugs.freedesktop.org/show_bug.cgi?id=27610 +and http://bugs.gentoo.org/show_bug.cgi?id=314925 +--- +diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc +index 09a1b20..bf79585 100644 +--- a/poppler/GlobalParams.cc ++++ b/poppler/GlobalParams.cc +@@ -68,6 +68,8 @@ + + #ifdef _WIN32 + # define strcasecmp stricmp ++#else ++# include + #endif + + #if MULTITHREADED +diff --git a/test/perf-test.cc b/test/perf-test.cc +index a11a377..6d6961e 100644 +--- a/test/perf-test.cc ++++ b/test/perf-test.cc +@@ -22,6 +22,8 @@ + + #ifdef _WIN32 + #include ++#else ++#include + #endif + + // Define COPY_FILE if you want the file to be copied to a local disk first +-- +cgit v0.8.3-6-g21f6 diff --git a/app-text/poppler/files/poppler-0.12.4-xopen_source.patch b/app-text/poppler/files/poppler-0.12.4-xopen_source.patch new file mode 100644 index 000000000000..b02400b07b64 --- /dev/null +++ b/app-text/poppler/files/poppler-0.12.4-xopen_source.patch @@ -0,0 +1,31 @@ +From a8d43ec1c7f5448a7f63d9bbd9062d56ee1c7c58 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 14 Apr 2010 18:21:33 +0000 +Subject: update XOPEN_SOURCE to 600 in non standard compile options + +it seems helps compiling on some BSD +See also https://bugs.freedesktop.org/show_bug.cgi?id=27610 +and http://bugs.gentoo.org/show_bug.cgi?id=314925 + +--- poppler-0.12.4.orig/cmake/modules/PopplerMacros.cmake ++++ poppler-0.12.4/cmake/modules/PopplerMacros.cmake +@@ -88,7 +88,7 @@ + if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_C_FLAGS "-Wall -Wno-write-strings -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "-Wall -Woverloaded-virtual -Wno-write-strings -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-check-new -fno-common ${CMAKE_CXX_FLAGS}") +- add_definitions(-D_XOPEN_SOURCE=500 -D_BSD_SOURCE) ++ add_definitions(-D_XOPEN_SOURCE=600 -D_BSD_SOURCE) + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +--- poppler-0.12.4.orig/configure.ac ++++ poppler-0.12.4/configure.ac +@@ -512,7 +512,7 @@ + no) ;; + yes) CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual $CXXFLAGS" ;; + kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi \ +- -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align \ ++ -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \ + -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith \ + -Wwrite-strings -O2 -Wformat-security \ + -Wmissing-format-attribute -fno-exceptions -fno-check-new \ diff --git a/app-text/poppler/poppler-0.12.4-r3.ebuild b/app-text/poppler/poppler-0.12.4-r3.ebuild new file mode 100644 index 000000000000..ea4bf55ddab1 --- /dev/null +++ b/app-text/poppler/poppler-0.12.4-r3.ebuild @@ -0,0 +1,93 @@ +# 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-r3.ebuild,v 1.1 2010/04/25 17:37:03 the_paya Exp $ + +EAPI="2" + +inherit cmake-utils + +DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE="http://poppler.freedesktop.org/" +SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers" + +COMMON_DEPEND=">=media-libs/fontconfig-2.6.0 + >=media-libs/freetype-2.3.9 + sys-libs/zlib + abiword? ( dev-libs/libxml2:2 ) + cairo? ( dev-libs/glib:2 + >=x11-libs/cairo-1.8.4 + >=x11-libs/gtk+-2.14.0:2 ) + jpeg? ( >=media-libs/jpeg-7:0 ) + jpeg2k? ( media-libs/openjpeg ) + lcms? ( media-libs/lcms ) + png? ( media-libs/libpng ) + qt4? ( x11-libs/qt-core:4 + x11-libs/qt-gui:4 )" +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig" +RDEPEND="${COMMON_DEPEND} + !dev-libs/poppler + !dev-libs/poppler-glib + !dev-libs/poppler-qt3 + !dev-libs/poppler-qt4 + !app-text/poppler-utils + cjk? ( >=app-text/poppler-data-0.2.1 )" + +DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.12.3-cmake-disable-tests.patch + epatch "${FILESDIR}"/${PN}-0.12.3-fix-headers-installation.patch + epatch "${FILESDIR}"/${PN}-0.12.3-gdk.patch + 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.3-preserve-cflags.patch #309297 + epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch + epatch "${FILESDIR}"/${PN}-0.12.4-strings_h.patch #314925 + epatch "${FILESDIR}"/${PN}-0.12.4-xopen_source.patch #314925 +} + +src_configure() { + mycmakeargs=( + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT4_TESTS=OFF + -DWITH_Qt3=OFF + -DENABLE_SPLASH=ON + -DENABLE_ZLIB=ON + $(cmake-utils_use_enable abiword) + $(cmake-utils_use_enable lcms) + $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) + $(cmake-utils_use_enable utils) + $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS) + $(cmake-utils_use_with cairo) + $(cmake-utils_use_with cairo GTK) + $(cmake-utils_use_with jpeg) + $(cmake-utils_use_with png) + $(cmake-utils_use_with qt4) + $(cmake-utils_use exceptions USE_EXCEPTIONS) + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + if use cairo && use doc; then + # For now install gtk-doc there + insinto /usr/share/gtk-doc/html/poppler + doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation' + fi +} + +pkg_postinst() { + ewarn 'After upgrading app-text/poppler you may need to reinstall packages' + ewarn 'depending on it. If you have gentoolkit installed, you can find those' + ewarn 'with `equery d poppler`.' +} -- 2.26.2