[Libreoffice-commits] .: poppler/poppler-apple-clang.patch poppler/UnpackedTarball_poppler.mk

[Libreoffice Gerrit user]

 poppler/UnpackedTarball_poppler.mk |    1 +
 poppler/poppler-apple-clang.patch  |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 39f9eb0d856293a974e2f024b29dca20068af073
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Nov 13 09:59:10 2012 +0200

    No -fno-check-new in Apple's Clang at least
    
    Change-Id: I535fe7660460b7ceb66c4fb3f21449e2cceea7e1

diff --git a/poppler/UnpackedTarball_poppler.mk b/poppler/UnpackedTarball_poppler.mk
index 65b5b5c..aa5583e 100644
--- a/poppler/UnpackedTarball_poppler.mk
+++ b/poppler/UnpackedTarball_poppler.mk
@@ -18,6 +18,7 @@ endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
 	poppler/poppler-ooopwd.patch \
+	$(if $(filter MACOSXxTRUE,$(OS)x$(COM_GCC_IS_CLANG)),poppler/poppler-apple-clang.patch) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/poppler/poppler-apple-clang.patch b/poppler/poppler-apple-clang.patch
new file mode 100644
index 0000000..6ae7a6c
--- /dev/null
+++ b/poppler/poppler-apple-clang.patch
@@ -0,0 +1,12 @@
+--- misc/poppler/configure
++++ misc/build/poppler/configure
+@@ -21162,7 +21162,7 @@
+ fi
+ case "$enable_compile_warnings" in
+   no)	;;
+-  yes)	CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS" ;;
++  yes)	CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-common $CXXFLAGS" ;;
+   kde)	CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
+ 		-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
+ 		-Wconversion -Wall -W -Wpointer-arith \
+