[libreoffice] hoist on my own petard

Caolan McNamara caolanm at fedoraproject.org
Thu Jan 27 13:46:00 UTC 2011


commit d4c8ee5d75b896806d4dec457c9f4801a07c97d4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 13:45:49 2011 +0000

    hoist on my own petard

 0001-fexceptions-fexceptions.patch |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/0001-fexceptions-fexceptions.patch b/0001-fexceptions-fexceptions.patch
index 0619d6f..efe1af0 100644
--- a/0001-fexceptions-fexceptions.patch
+++ b/0001-fexceptions-fexceptions.patch
@@ -1,12 +1,3 @@
-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
@@ -38,6 +29,15 @@ index 27ff2ef..8476053 100644
  +
  +OBJEXT=o
  +DYNEXT=so
--- 
-1.7.3.5
-
+diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
+index d0ee030..5ff8668 100644
+--- a/stlport/systemstlguards/preextstl.h
++++ b/stlport/systemstlguards/preextstl.h
+@@ -48,7 +48,6 @@
+ #       if defined(_GNUC__)
+ #           pragma GCC visibility push(default)
+ #       endif
+-#       include _STLP_NATIVE_HEADER(exception_defines.h)
+ #       include _STLP_NATIVE_HEADER(limits)
+ #       if !defined(__GXX_EXPERIMENTAL_CXX0X__)
+ #           include _STLP_NATIVE_HEADER(memory)


More information about the scm-commits mailing list