[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Petr Mladek]

 patches/dev300/apply |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit bfb600de353ff88f4101753d1e2533935eed0459
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Thu Jun 10 14:45:14 2010 +0200

    Disable gcj only on SUSE-based distros
    
    * patches/dev300/apply: move jvmfwk-disable-gcj.diff to DisableGCJ section;
      use DisableGCJ section only for SUSE* distros

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c451198..302cdc1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -67,17 +67,17 @@ Gnome2-26 : GnomeSessionManagement
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Split, Shrink, \
 	     CustomUserConfig
-SUSE-9.1  : NovellBase
-SUSE-9.2  : NovellBase
-SUSE-9.3  : NovellBase
-SUSE-10.0 : NovellBase
-SUSE-10.1 : NovellBase, BerkeleyDB43, EMFPlus, Java14, BrokenSystemNSS, GTK28, SUSE101
-SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
-SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14, GCC41
-SUSE-11.0 : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, PostgreSQL
-SUSE-11.1 : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL
-SUSE-11.2 : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, OptionalIconThemes, SUSE112
-SUSE      : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, OptionalIconThemes, SUSE112
+SUSE-9.1  : NovellBase, DisableGCJ
+SUSE-9.2  : NovellBase, DisableGCJ
+SUSE-9.3  : NovellBase, DisableGCJ
+SUSE-10.0 : NovellBase, DisableGCJ
+SUSE-10.1 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, Java14, BrokenSystemNSS, GTK28, SUSE101
+SUSE-10.2 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
+SUSE-10.3 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, Java14, GCC41
+SUSE-11.0 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, CairoFonts, PostgreSQL
+SUSE-11.1 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL
+SUSE-11.2 : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, OptionalIconThemes, SUSE112
+SUSE      : NovellBase, DisableGCJ, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, OptionalIconThemes, SUSE112
 # Slackware
 Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess, CairoFonts
 # Debian
@@ -1190,6 +1190,8 @@ mysqlcppconn-static-mysql-binding.diff, pmladek
 # Push fonts into the ps stream always
 pushfont-psstream.diff, i#84481, michael
 
+[ DisableGCJ ]
+
 # ignore gcj; OOo newer worked well with it
 jvmfwk-disable-gcj.diff