[libreoffice] fix flags

Caolan McNamara caolanm at fedoraproject.org
Thu Jan 27 13:17:07 UTC 2011


commit c9aa049c6f7efadfbc7a9b4b38aec8ea2e1ecd7d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 13:16:56 2011 +0000

    fix flags

 0001-fexceptions-fexceptions.patch |   43 ++++++++++++++++++++++++++++++++++++
 libreoffice.spec                   |    2 +
 2 files changed, 45 insertions(+), 0 deletions(-)
---
diff --git a/0001-fexceptions-fexceptions.patch b/0001-fexceptions-fexceptions.patch
new file mode 100644
index 0000000..0619d6f
--- /dev/null
+++ b/0001-fexceptions-fexceptions.patch
@@ -0,0 +1,43 @@
+From 488a4dd14cba6231d33ed0f86e45bf68c9109a11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 27 Jan 2011 13:15:58 +0000
+Subject: [PATCH] --fexceptions -> -fexceptions
+
+---
+ stlport/STLport-4.5.patch |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
+index 27ff2ef..8476053 100644
+--- a/stlport/STLport-4.5.patch
++++ b/stlport/STLport-4.5.patch
+@@ -137,7 +137,7 @@
+ +#
+ +#
+ +LINK=ar cr
+-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
+++DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
+ +
+ +OBJEXT=o
+ +DYNEXT=so
+@@ -210,7 +210,7 @@
+ +#
+ +#
+ +LINK=ar crv
+-+DYN_LINK=$(CXX) --fexceptions -shared -o
+++DYN_LINK=$(CXX) -fexceptions -shared -o
+ +
+ +OBJEXT=o
+ +DYNEXT=dll
+@@ -449,7 +449,7 @@
+ +#
+ +#
+ +LINK=ar cr
+-+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' --fexceptions -shared -o
+++DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o
+ +
+ +OBJEXT=o
+ +DYNEXT=so
+-- 
+1.7.3.5
+
diff --git a/libreoffice.spec b/libreoffice.spec
index e56b23a..dfb0799 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -107,6 +107,7 @@ Patch19: libreoffice-fdo31271.icu.patch
 Patch20: libreoffice-gcc4.6.0.patch
 Patch21: libreoffice-fdo32561.comphelper.patch
 Patch22: 0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
+Patch23: 0001-fexceptions-fexceptions.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -732,6 +733,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch20 -p1 -b .libreoffice-gcc4.6.0.patch
 %patch21 -p1 -b .fdo32561.comphelper.patch
 %patch22 -p1 -b .rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
+%patch23 -p1 -b .fexceptions-fexceptions.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip


More information about the scm-commits mailing list