Fix bug 309297 - preserve compiler flags

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 58 insertions, 3 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/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
 }