[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/apply                            |    9 --------
 patches/dev300/cppu-lbnames-enable-gcc-4.5.diff |   26 ------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

New commits:
commit 782ca59a6711f197e3ed394937277edaa04fd252
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 17 12:21:00 2010 +0200

    cppu-lbnames-enable-gcc-4.5.diff: Migrated to git and removed Gcc45 section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6d39b83..64219ff 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -17,7 +17,7 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 Layout, VBABits, VBAObjects, CalcErrors, GCJ, Lwp, \
 	 OOXML, OOXMLExportDevel, OOXMLExport, FrameworkFeature, UnitTesting, \
 	 PopupRemoval, FedoraCommonFixes, LayoutDialogs, Fuzz, \
-	 CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
+	 CalcRowLimit, Gcc44, BuildFix, WriterDocComparison, \
 	 MySQL, BorderTypes, WriterNavigation
 
 LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
@@ -46,8 +46,6 @@ NLPSolver : NLPSolverBits
 Piece : PieceBits
 #Localize
 Localize : LocalizeFixes
-# patches touching swext which is not in the OpenOffice2 alias yet.
-# FIXME: Get this cleaned up
 UnstableWP : UnstableLibwpd
 Gnome2-26 : GnomeSessionManagement
 
@@ -770,11 +768,6 @@ dmake-space-in-envvar-name.diff, i#101786, jholesov
 [ Gcc44 ]
 oox-tokenmap.string.h.diff, i#105219
 
-[ Gcc45 ]
-
-# enable build with gcc-4.5
-cppu-lbnames-enable-gcc-4.5.diff, i#109853, pmladek
-
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream
diff --git a/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff b/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
deleted file mode 100644
index 7331065..0000000
--- a/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
+++ /dev/null
@@ -1,26 +0,0 @@
----
- cppu/inc/uno/lbnames.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git cppu/inc/uno/lbnames.h cppu/inc/uno/lbnames.h
-index 285c43b..ec5822d 100644
---- cppu/inc/uno/lbnames.h
-+++ cppu/inc/uno/lbnames.h
-@@ -59,12 +59,12 @@ provoking error here, because PP ignores #error
- #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
- #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
- #define __CPPU_ENV gcc3
--#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
-+#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
- #define __CPPU_ENV gcc3
- #elif (__GNUC__ == 3)
- #error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
- #else
--#error "Supported gcc majors are 2 , 3 and 4 <= 4.4.  Unsupported gcc major version."
-+#error "Supported gcc majors are 2 , 3 and 4 <= 4.5.  Unsupported gcc major version."
- #endif /* defined (__GNUC__) */
- #endif /* defined (_MSC_VER) */
- 
--- 
-1.7.0.1
-