ooo-build r13377 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jul 24 10:44:20 2008
New Revision: 13377
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13377&view=rev

Log:
2008-07-24  Petr Mladek  <pmladek suse cz>

	* patches/dev300/codec-patch-without-crs.diff: 
	* patches/dev300/codec-patch-with-crs.diff:
	  renamed to
	* patches/dev300/build-java-target-codec-patch-without-crs.diff:
	* patches/dev300/build-java-target-codec-patch-with-crs.diff:

	* patches/dev300/apply, configure.in: apply the above patches only when
	  the swext sources are used



Added:
   trunk/patches/dev300/build-java-target-codec-patch-with-crs.diff   (props changed)
      - copied unchanged from r13374, /trunk/patches/dev300/codec-patch-with-crs.diff
   trunk/patches/dev300/build-java-target-codec-patch-without-crs.diff   (props changed)
      - copied unchanged from r13374, /trunk/patches/dev300/codec-patch-without-crs.diff
Removed:
   trunk/patches/dev300/codec-patch-with-crs.diff
   trunk/patches/dev300/codec-patch-without-crs.diff
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/dev300/apply

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jul 24 10:44:20 2008
@@ -1046,6 +1046,20 @@
 fi
 AC_SUBST(ENABLE_MEDIAWIKI)
 
+# FIXME: ugly hack to apply a Linux and Win32 specific variants of a patch for swext sources
+if test "$ENABLE_MEDIAWIKI" = "YES" ; then
+    if test "$BUILD_WIN32" = "yes" ; then
+	ext_section=Win32OnlySwextFixes
+    else
+	ext_section=Linux32OnlySwextFixes
+    fi
+    if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
+	OOO_ADDITIONAL_SECTIONS="$ext_section"
+    else
+	OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,$ext_section"
+    fi
+fi
+
 # FIXME: ugly hack to apply a Novell specific patch for swext sources
 if test "$VENDORNAME" = "Novell" -a "$ENABLE_MEDIAWIKI" = "YES" ; then
     if test -z "$OOO_ADDITIONAL_SECTIONS" ; then

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 24 10:44:20 2008
@@ -33,7 +33,7 @@
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
 	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, KDE4
 # Optional sections
-Optional : DejaVuFonts, NovellOnlySwextFixes
+Optional : DejaVuFonts, NovellOnlySwextFixes, Win32OnlySwextFixes, Linux32OnlySwextFixes
 # Binfilter patches: a special distro; applied only when building with binfilter
 Binfilter : BFBuildBits, BFFixes, BFShrink
 # System patches: a special distro; applied only when building with the system tarball unpacked
@@ -422,6 +422,16 @@
 [ swextFixes > dev300-m25 < beb300-m0 ]
 build-java-target-swext.diff
 
+[ Linux32OnlySwextFixes >= dev300-m22 < beb300-m0 ]
+# originally part of build-java-target.diff, but had to split out
+# because of CR problems
+build-java-target-codec-patch-with-crs.diff, pmladek
+
+[ Win32OnlySwextFixes >= dev300-m22 < beb300-m0 ]
+# originally part of build-java-target.diff, but had to split out
+# because of CR problems
+build-java-target-codec-patch-without-crs.diff, pmladek
+
 [ NovellOnlySwextFixes ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
@@ -1046,16 +1056,6 @@
 # even when it is built with JDK 1.5
 build-java-target.diff, pmladek
 
-[ LinuxOnly >= dev300-m22 < beb300-m0 ]
-# originally part of build-java-target.diff, but had to split out
-# because of CR problems
-##codec-patch-with-crs.diff, pmladek
-
-[ Win32Only >= dev300-m22 < beb300-m0 ]
-# originally part of build-java-target.diff, but had to split out
-# because of CR problems
-codec-patch-without-crs.diff, pmladek
-
 [ BuildBits ]
 # fix the --enable-reportdesign configure check to work
 buildfix-enable-reportdesign-check.diff, i#87518, pmladek