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

[pmladek svn gnome org]

Author: pmladek
Date: Fri May  2 20:57:09 2008
New Revision: 12444
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12444&view=rev

Log:
2008-05-02  Petr Mladek  <pmladek suse cz>

	* patches/src680/apply: move dejavu_liberation_making_fix.diff and
	  dejavu_liberation_packaging_fix.diff to the optional DejaVuFonts
	  section
	* configure.in: revert the last KAMI's change; download the
	  DejaVu fonts and apply the DejaVuFonts patches only when
	  --with-dejavu-fonts option is used



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/dev300/apply

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May  2 20:57:09 2008
@@ -367,6 +367,10 @@
 BASEDIR=`pwd`
 TOOLSDIR=$BASEDIR
 
+# it will be modified by the --with-additional-sections but it might 
+# modified also by other options
+OOO_ADDITIONAL_SECTIONS=
+
 AC_PATH_PROG(PERL, perl)
 if test -z "PERL"; then
    AC_MSG_ERROR([perl not found; required for ooo-build])
@@ -840,9 +844,12 @@
     else
 	AC_MSG_ERROR([--with-dejavu-fonts requires either yes, no, or a version number])
     fi
-else
-    DEJAVU_FONTS_VER=2.24
-    DEJAVU_FONTS_PACK_NAME=dejavu-fonts-ttf-$DEJAVU_FONTS_VER
+    # also apply some extra patches
+    if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
+	OOO_ADDITIONAL_SECTIONS="DejaVuFonts"
+    else
+	OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,DejaVuFonts"
+    fi
 fi
 AC_MSG_RESULT([${DEJAVU_FONTS_VER:-no}])
 AC_SUBST(DEJAVU_FONTS_VER)
@@ -1006,22 +1013,6 @@
 AC_MSG_RESULT([$OOO_POOR_HELP_LOCALIZATIONS])
 AC_SUBST(OOO_POOR_HELP_LOCALIZATIONS)
 
-AC_MSG_CHECKING([for additional sections])
-OOO_ADDITIONAL_SECTIONS=
-if test -n "$with_additional_sections" -a \
-	"$with_additional_sections" != "no" -a \
-	"$with_additional_sections" != "yes" ; then
-    # change the delimiter from the space to the comma
-    for section in $with_additional_sections ; do
-	if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
-	    OOO_ADDITIONAL_SECTIONS="$section"
-	else
-	    OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,$section"
-	fi
-    done
-fi
-AC_MSG_RESULT([$OOO_ADDITIONAL_SECTIONS])
-AC_SUBST(OOO_ADDITIONAL_SECTIONS)
 
 AC_MSG_CHECKING([whether to enable Mono bindings])
 if test -n "$enable_mono" ; then
@@ -1167,6 +1158,25 @@
 fi
 AC_SUBST(MIRROR)
 
+# IMPORTANT: keep this on the end of configure because other configure options might 
+# add some own OOO_ADDITIONAL_SECTIONS
+AC_MSG_CHECKING([for additional sections])
+if test -n "$with_additional_sections" -a \
+	"$with_additional_sections" != "no" -a \
+	"$with_additional_sections" != "yes" ; then
+    # change the delimiter from the space to the comma
+    for section in $with_additional_sections ; do
+	if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
+	    OOO_ADDITIONAL_SECTIONS="$section"
+	else
+	    OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,$section"
+	fi
+    done
+fi
+AC_MSG_RESULT([$OOO_ADDITIONAL_SECTIONS])
+AC_SUBST(OOO_ADDITIONAL_SECTIONS)
+
+
 AC_CONFIG_FILES([download], [chmod +x download])
 AC_CONFIG_FILES([scratch/place], [chmod +x scratch/place])
 AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update], [chmod +x intltool*])

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri May  2 20:57:09 2008
@@ -30,6 +30,8 @@
 	      UnUsedButNotYetRemovedFromSVN, \
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
 	      UnitBootstrap, RadioButtons, UnstableLibwpd
+# Optional sections
+Optional : DejaVuFonts
 # 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
@@ -1113,6 +1115,8 @@
 # Mozilla build-bits to not break on Solaris 11
 moz-solaris11-makefiles.diff, fridrich
 
+[ DejaVuFonts ]
+
 # Following the changed names of DejaVu fonts
 # Add Liberation fonts for all platforms
 dejavu_liberation_packaging_fix.diff, kami