# HG changeset patch # User Nathan Phillip Brink # Date 2010-03-13 17:15:07 # Node ID ba070f7b11144be986dc003ef7891c1f247d67ce # Parent c7093cff834f2ca1d06e795fe5ea645757256faf app-text/poppler: Add patch to make sure that poppler respects CXXFLAGS. bug 309297. diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.226 2010/03/11 22:07:20 yngwin Exp $ + 13 Mar 2010; Nathan Phillip Brink (ohnobinki) + poppler-0.12.3-r3.ebuild, + poppler-0.12.3-r5.ebuild, +files/poppler-0.12.3-cxxflags.patch, + poppler-0.12.4.ebuild: + Add patch to make sure that poppler respects CXXFLAGS. bug 309297. + 11 Mar 2010; Ben de Groot poppler-0.12.3-r3.ebuild, poppler-0.12.3-r5.ebuild, poppler-0.12.4.ebuild: Add missing lcms dep, bug #309005 diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,6 +1,7 @@ AUX poppler-0.12.3-cairo-downscale.patch 17313 RMD160 6c2068605e195c2ec27636634613482a181195a9 SHA1 1df4c48520c53ef289d92b2208a5b55140443204 SHA256 643ab8d6d747a9e1484d132be43ee674e5ccae38c79792a8be01ed2df82e8067 AUX poppler-0.12.3-cmake-disable-tests.patch 2121 RMD160 3edded24926076c9c0ef42d0f1f295a8d46cafdb SHA1 fd22bdf1d887bcedd83673992fd182bfdb3bfcb0 SHA256 182489ee0d76a38c6d2570721a6777d78077ace4249bbeac7dad8d29b075c01b AUX poppler-0.12.3-config.patch 3468 RMD160 de39ce760cca5b811e1c21efc893731fbcfbc22b SHA1 e7dd1b86d2d5312c5610b02101d5551bece21b10 SHA256 909a1626b8800b3e796c24e3c2a5b6140cd626a28b6c627bd212d6a4a9a12aef +AUX poppler-0.12.3-cxxflags.patch 1427 RMD160 d268e2b8c745108d19142d91b4a1bd57fa8d84bc SHA1 7a9b1f6a8649c38a9e21d847076808625b25c046 SHA256 7f0e5a4048964c6374925cd0a885b777097002e9ab6165f188539f0db2e28f1b AUX poppler-0.12.3-darwin-gtk-link.patch 455 RMD160 9f08076c4821a29ef8b96bc0eb32b0b1d93b0285 SHA1 297d84fff5ee4f9fd05ceaf34228df5e21baff90 SHA256 1d58beb5d476857e60cdf16bc4c458b8c48e59f2b9a26715f485003da18f9814 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 @@ -8,8 +9,8 @@ AUX poppler-0.12.4-config.patch 3028 RMD 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 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1 -EBUILD poppler-0.12.3-r5.ebuild 2815 RMD160 0dc2b96b76c0c8d7b185fa59ada614254649a552 SHA1 e4ee76a084f328419f97db733d0f58cf5b99c9e8 SHA256 045fdbbe3bbf799203a33a4ae9aefad5c5732a3adaae4e6394462514476b7578 -EBUILD poppler-0.12.4.ebuild 2906 RMD160 f9cac45cdce3a8aa65c7134bdcb6f12ec0555bc7 SHA1 529f124b595837d8204a5ec4afa5c8acfae328ea SHA256 40ce999a0bade7662d0829a54a141a4471eeb8f06f2dfca76f3ffdf1384808cc +EBUILD poppler-0.12.3-r3.ebuild 2797 RMD160 a2d74a28b838620c667e35c6c49647e2245a6a23 SHA1 fc866bc9cc6a7b78a3314d7956acf2e5dce426dd SHA256 3c0a35d3227e7f15d64216e2056f06f6b3ceae90e82ca2b5d80e71e936e1705a +EBUILD poppler-0.12.3-r5.ebuild 2865 RMD160 f5cb89b8846b9e37ca7f3d1cfb5f4c71109bdaa4 SHA1 5fd7f52576161e8cbce48b7cf3803b3bc9e219a9 SHA256 b228a0750eee1ab4f8a911bb36c63a0cc869d682c1b2fdb4f6dadd18a9e50c48 +EBUILD poppler-0.12.4.ebuild 2964 RMD160 024a0031ff0a9c5e4ed1bee308ff025d856da1b9 SHA1 545f0180d88ed84da34875c35cc37f41a7f3c645 SHA256 f7597e76343796a06cc33e54892a86efa6a5a7d267218c2fb55e05ee9e88c2e3 MISC ChangeLog 32243 RMD160 570e8c519a99dc67e908e20ad16a406a19cf3919 SHA1 905f485845adfe645fdcf162da938398c68e2cc7 SHA256 06560a434e43d14e61ac1a4c94c4d42b1f22e05918a2377a58c37060fa966183 MISC metadata.xml 565 RMD160 6a9e714721911707b23fb27535d64ab92c90a5f8 SHA1 ca7711ec7b7d2953310ae3b00ff2f447371c103f SHA256 ec946c05ddfa21325d7cb705cee3342f4a95a1d08b02f324e4bac36bfc479e0b diff --git a/app-text/poppler/files/poppler-0.12.3-cxxflags.patch b/app-text/poppler/files/poppler-0.12.3-cxxflags.patch new file mode 100644 --- /dev/null +++ b/app-text/poppler/files/poppler-0.12.3-cxxflags.patch @@ -0,0 +1,25 @@ +Author: Nathan Phillip Brink +Purpose: Ensure that the CXXFLAGS environmental variable are properly communicated to cmake's unix driver. + +--- a/CMakeLists.txt 2010-03-13 16:29:25.000000000 -0500 ++++ b/CMakeLists.txt 2010-03-13 16:32:04.000000000 -0500 +@@ -127,7 +127,7 @@ + add_definitions(${DEFAULT_COMPILE_WARNINGS_YES}) + endif(_comp_warnings STREQUAL "yes") + if(_comp_warnings STREQUAL "kde") +- set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_KDE} ${CMAKE_CXX_FLAGS}") ++ add_definitions(${DEFAULT_COMPILE_WARNINGS_KDE}) + endif(_comp_warnings STREQUAL "kde") + + +--- a/cmake/modules/PopplerMacros.cmake Sat Mar 13 16:50:27 2010 -0500 ++++ b/cmake/modules/PopplerMacros.cmake Sat Mar 13 16:52:58 2010 -0500 +@@ -91,7 +91,7 @@ + set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wno-write-strings") + set(DEFAULT_COMPILE_WARNINGS_KDE "-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -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 -fno-common") + +- set(CMAKE_CXX_FLAGS "-Woverloaded-virtual") ++ add_definitions(-Woverloaded-virtual) + 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") diff --git a/app-text/poppler/poppler-0.12.3-r3.ebuild b/app-text/poppler/poppler-0.12.3-r3.ebuild --- a/app-text/poppler/poppler-0.12.3-r3.ebuild +++ b/app-text/poppler/poppler-0.12.3-r3.ebuild @@ -46,6 +46,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-gdk.patch epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch epatch "${FILESDIR}"/${P}-config.patch #304407 + epatch "${FILESDIR}"/${P}-cxxflags.patch #309297 } src_configure() { diff --git a/app-text/poppler/poppler-0.12.3-r5.ebuild b/app-text/poppler/poppler-0.12.3-r5.ebuild --- a/app-text/poppler/poppler-0.12.3-r5.ebuild +++ b/app-text/poppler/poppler-0.12.3-r5.ebuild @@ -47,6 +47,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch epatch "${FILESDIR}"/${P}-config.patch #304407 epatch "${FILESDIR}"/${P}-cairo-downscale.patch #303817 + epatch "${FILESDIR}"/${P}-cxxflags.patch #309297 } src_configure() { diff --git a/app-text/poppler/poppler-0.12.4.ebuild b/app-text/poppler/poppler-0.12.4.ebuild --- a/app-text/poppler/poppler-0.12.4.ebuild +++ b/app-text/poppler/poppler-0.12.4.ebuild @@ -48,6 +48,7 @@ src_prepare() { 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 + epatch "${FILESDIR}"/${PN}-0.12.3-cxxflags.patch #309297 } src_configure() {