Fix bug 309297 - preserve compiler flags

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 62 insertions, 6 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 180515212797..e1a44876150b 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,15 @@
 # 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.228 2010/03/18 14:31:21 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.229 2010/04/10 02:13:17 reavertm Exp $
+
+*poppler-0.12.4-r2 (10 Apr 2010)
+*poppler-0.12.3-r6 (10 Apr 2010)
+
+  10 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -poppler-0.12.3-r5.ebuild, +poppler-0.12.3-r6.ebuild,
+  +files/poppler-0.12.3-preserve-cflags.patch, -poppler-0.12.4-r1.ebuild,
+  +poppler-0.12.4-r2.ebuild:
+  Fix bug 309297 - preserve compiler flags
 
   18 Mar 2010; Ben de Groot <yngwin@gentoo.org> metadata.xml:
   Reassign to me instead of desktop-misc herd which I left.
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ff9c206533c4..4f2df05a0ddb 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,12 +4,13 @@ AUX poppler-0.12.3-config.patch 3468 RMD160 de39ce760cca5b811e1c21efc893731fbcfb
 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
+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
 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-r1.ebuild 2912 RMD160 181537af81cebee7634688da9c3a55ba5ac15760 SHA1 edbfddd79ef95f2db0b704db74c6c1ef146ac94d SHA256 a0f1e31f074dbf426c180926c8a20fd4d046af1f9f885aa28811d43b5234ea75
-MISC ChangeLog 32548 RMD160 9d0c283a1c1ae9326e41efaaa4cd8d63ac5d429a SHA1 ff051d8c5aa884c5222747d29f4cc90a69f0b417 SHA256 0b16ef3444b15d5b8293524c2d79a8c82e026e1579f83ea6c623f5dd503fb8dd
+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
 MISC metadata.xml 662 RMD160 b2bfa73aa44dfcdd9174ab7ae7e210957dd1dead SHA1 c53dbd326209bbbd743a539c08a07bb4d045507b SHA256 484bd11aa8a96c00b419805d8ca7537ac1adb99385894ff0f3d6cb7f8d1cc3ae
diff --git a/app-text/poppler/files/poppler-0.12.3-preserve-cflags.patch b/app-text/poppler/files/poppler-0.12.3-preserve-cflags.patch
new file mode 100644
index 000000000000..ddbf642e628e
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.12.3-preserve-cflags.patch
@@ -0,0 +1,44 @@
+diff -ru ../poppler-0.12.3/cmake/modules/PopplerMacros.cmake ./cmake/modules/PopplerMacros.cmake
+--- ../poppler-0.12.3/cmake/modules/PopplerMacros.cmake	2009-10-05 00:20:41.000000000 +0200
++++ ./cmake/modules/PopplerMacros.cmake	2010-04-10 03:57:46.763786638 +0200
+@@ -86,12 +86,9 @@
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+-  set(DEFAULT_COMPILE_WARNINGS_NO)
+-  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")
++  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)
+   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 -ru ../poppler-0.12.3/CMakeLists.txt ./CMakeLists.txt
+--- ../poppler-0.12.3/CMakeLists.txt	2009-12-24 11:50:12.000000000 +0100
++++ ./CMakeLists.txt	2010-04-10 03:29:23.799102761 +0200
+@@ -115,21 +115,6 @@
+   include_directories(${LCMS_INCLUDE_DIR})
+ endif(LCMS_FOUND)
+ 
+-if(DEFINED COMPILE_WARNINGS)
+-else(DEFINED COMPILE_WARNINGS)
+-  set(COMPILE_WARNINGS "yes")
+-endif(DEFINED COMPILE_WARNINGS)
+-string(TOLOWER "${COMPILE_WARNINGS}" _comp_warnings)
+-if(_comp_warnings STREQUAL "no")
+-  add_definitions(${DEFAULT_COMPILE_WARNINGS_NO})
+-endif(_comp_warnings STREQUAL "no")
+-if(_comp_warnings STREQUAL "yes")
+-  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}")
+-endif(_comp_warnings STREQUAL "kde")
+-
+ 
+ include(ConfigureChecks.cmake)
+ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
diff --git a/app-text/poppler/poppler-0.12.3-r5.ebuild b/app-text/poppler/poppler-0.12.3-r6.ebuild
index eec3b4a5470b..c3f13398f252 100644
--- a/app-text/poppler/poppler-0.12.3-r5.ebuild
+++ b/app-text/poppler/poppler-0.12.3-r6.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r5.ebuild,v 1.2 2010/03/11 22:07:20 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r6.ebuild,v 1.1 2010/04/10 02:13:17 reavertm Exp $
 
 EAPI="2"
 
@@ -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}"/${PN}-0.12.3-preserve-cflags.patch  #309297
 }
 
 src_configure() {
diff --git a/app-text/poppler/poppler-0.12.4-r1.ebuild b/app-text/poppler/poppler-0.12.4-r2.ebuild
index 1348a6d48e17..d5fadc6b187e 100644
--- a/app-text/poppler/poppler-0.12.4-r1.ebuild
+++ b/app-text/poppler/poppler-0.12.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2010/03/16 12:18:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r2.ebuild,v 1.1 2010/04/10 02:13:17 reavertm Exp $
 
 EAPI="2"
 
@@ -47,6 +47,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.3-preserve-cflags.patch  #309297
 	epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
 }