[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                              |    4 ----
 patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff |   22 ----------------------
 2 files changed, 26 deletions(-)

New commits:
commit 8fa8b76032de25e3fb2424ce34e362d31c1f523f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 20:20:24 2011 +0200

    bin obsolete toolkit-layout-gcc-4.3.2-hack.diff
    
    it was most likely fixed in the finally used gcc release;
    the layout code is currently unused and need to be rewritten anyway

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7b0805c..db2df4b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1324,10 +1324,6 @@ layout-post-cws-layoutdialogs2-edit-noop-reversal.diff, n#552450
 
 layout-localize-fix-sc.diff
 
-# FIXME: hack to avoid internal copiler error with gcc (SUSE Linux) 4.3.2 20080613 (prerelease)
-#        on openSUSE-11.1-alpha0; pmladek is discussing it with the gcc team
-toolkit-layout-gcc-4.3.2-hack.diff, pmladek
-
 # Enable layout'ed dialogs.
 # FIXME: do not enable the layout dialogs by default; there are still problems with them (resizing, look, ...)
 #layout-default-enable-config_office.diff, janneke
diff --git a/patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff b/patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff
deleted file mode 100644
index bad0544..0000000
--- a/patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- toolkit/source/layout/core/makefile.mk |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git toolkit/source/layout/core/makefile.mk toolkit/source/layout/core/makefile.mk
-index 2c90921..36d7f13 100644
---- toolkit/source/layout/core/makefile.mk
-+++ toolkit/source/layout/core/makefile.mk
-@@ -40,6 +40,10 @@ ENABLE_EXCEPTIONS=true
- # FIXME: This is bad, hmkay
- CFLAGS+= -I$(PRJ)/source
- 
-+.IF "$(CCNUMVER)" >= "000400030000" && "$(CCNUMVER)" < "000400040000"
-+CFLAGS+= -O1
-+.ENDIF
-+
- SLOFILES= \
-     $(SLO)$/bin.obj \
-     $(SLO)$/box-base.obj \
--- 
-1.7.0.1
-