[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                            |    4 ----
 patches/dev300/svx-customshapes-NOOPTFILES.diff |   22 ----------------------
 2 files changed, 26 deletions(-)

New commits:
commit 55b15c214272b6dae9eea564cef5e53579e4501e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 15:21:14 2011 +0300

    Drop svx-customshapes-NOOPTFILES.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 949582e..3151702 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -485,10 +485,6 @@ SectionOwner => arekm
 # fix for macro browser crash
 sfx2-badscript.diff, i#67976
 
-[ BuildBits ]
-# work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
-svx-customshapes-NOOPTFILES.diff, martink
-
 [ LinuxOnly ]
 
 system-python-ure-bootstrap.diff, deb#501028, i#90701
diff --git a/patches/dev300/svx-customshapes-NOOPTFILES.diff b/patches/dev300/svx-customshapes-NOOPTFILES.diff
deleted file mode 100644
index d023021..0000000
--- a/patches/dev300/svx-customshapes-NOOPTFILES.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- svx/source/customshapes/makefile.mk |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git svx/source/customshapes/makefile.mk svx/source/customshapes/makefile.mk
-index 3feca8f..ece0edb 100644
---- svx/source/customshapes/makefile.mk
-+++ svx/source/customshapes/makefile.mk
-@@ -44,6 +44,10 @@ ENABLE_EXCEPTIONS=TRUE
- .IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") 
- NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
- .ENDIF
-+# http://gcc.gnu.org/PR22392
-+.IF "$(OS)"=="LINUX" && ("$(CPU)"=="P" || "$(CPU)"=="X")
-+NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
-+.ENDIF
- 
- ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
- 
--- 
-1.7.0.1
-