ooo-build r12017 - in trunk: . bin distro-configs patches/src680

[szalaik svn gnome org]

Author: szalaik
Date: Thu Mar 27 10:19:06 2008
New Revision: 12017
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12017&view=rev

Log:
2008-03-26  Kalman Szalai - KAMI <kamihir freemail hu>

	* bin/unpack
	* configure.in
	* download.in
	Update DejaVu font naming scheme to dejavu-fonts-ttf-(version).tar.bz2
	The current version is 2.24. Leave all defaults at oriinal value.
	Note: OpenOffice.org 2.4 is containing all DevaVu (2.21) and Libertation fonts.
	There is a newer version from Liberation font with correct hinting.
		



Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/distro-configs/OxygenOfficeLinux.conf.in
   trunk/distro-configs/OxygenOfficeWindows.conf.in
   trunk/download.in
   trunk/patches/src680/dejavu-fonts.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Thu Mar 27 10:19:06 2008
@@ -319,7 +319,9 @@
 
     if test "x$DEJAVU_FONTS_VER" != "x"; then
         DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
-	if [ "$DEJAVU_FONTS_VER" -gt "2.11" ]; then
+	if [ "$DEJAVU_FONTS_VER" -gt "2.21" ]; then
+		DEJAVU_FONTSSRC=dejavu-fonts-ttf-$DEJAVU_FONTS_VER.tar.bz2
+	elif [ "$DEJAVU_FONTS_VER" -gt "2.11" ]; then
 		DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.bz2
 	else
 		DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.gz

Modified: trunk/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeLinux.conf.in	Thu Mar 27 10:19:06 2008
@@ -20,6 +20,7 @@
 --enable-lockdown
 --enable-cairo
 --without-unix-wrapper
+--with-fonts
 --with-extra-gallery
 --with-extra-template
 --with-extra-sample

Modified: trunk/distro-configs/OxygenOfficeWindows.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeWindows.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeWindows.conf.in	Thu Mar 27 10:19:06 2008
@@ -8,6 +8,7 @@
 --disable-build-mozilla
 --enable-fontooo
 --enable-systray
+--with-fonts
 --with-extra-gallery
 --with-extra-template
 --with-extra-sample

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Thu Mar 27 10:19:06 2008
@@ -60,7 +60,7 @@
     'dbghinst\.EXE'			 => 'http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US',
     '5_11_98Odma20\.zip'		 => '@MIRROR@/support',
     'openclipart-.*'			 => 'http://www.openclipart.org/downloads/@OPENCLIPART_VER@',
-    'dejavu-ttf-.*'			 => 'http://kent.dl.sf.net/sourceforge/dejavu/',
+    'dejavu-.*'				 => 'http://kent.dl.sf.net/sourceforge/dejavu/',
 # Win32 ant binaries ...
     'apache-ant-.*'                      => 'http://archive.apache.org/dist/ant/binaries',
 # Mozilla source and libraries
@@ -81,7 +81,7 @@
 # cairo sources
     'cairo-.*'			         => 'http://cairographics.org/releases/',
 # OxygenOffice extras
-    'OOOP-.*\.zip'                 	 => 'http://heanet.dl.sourceforge.net/sourceforge/ooop/'
+    'OOOP-.*\.zip'                 	 => 'http://kent.dl.sf.net/sourceforge/ooop/'
 );
 
 if ( '@UPSTREAM_NAME@' ne '' ) {
@@ -220,7 +220,10 @@
 }
 
 if ('@DEJAVU_FONTS_VER@' ne '') {
-    if ('@DEJAVU_FONTS_VER@' gt '2.11') {
+
+    if ('@DEJAVU_FONTS_VER@' gt '2.21') {
+	push @files, ( 'dejavu-fonts-ttf- DEJAVU_FONTS_VER@.tar.bz2' );}
+    elsif ('@DEJAVU_FONTS_VER@' gt '2.11') {
         push @files, ( 'dejavu-ttf- DEJAVU_FONTS_VER@.tar.bz2' );
     } else {
         push @files, ( 'dejavu-ttf- DEJAVU_FONTS_VER@.tar.gz' );

Modified: trunk/patches/src680/dejavu-fonts.diff
==============================================================================
--- trunk/patches/src680/dejavu-fonts.diff	(original)
+++ trunk/patches/src680/dejavu-fonts.diff	Thu Mar 27 10:19:06 2008
@@ -125,13 +125,13 @@
 +bs	dejavu_fonts		nmake	-	all	amt_fonts NULL
 --- scp2/source/ooo/file_font_ooo.scp.OLD	2005-09-09 04:37:10.000000000 +0300
 +++ scp2/source/ooo/file_font_ooo.scp	2005-11-23 05:08:35.375000000 +0200
-@@ -151,3 +151,28 @@
+@@ -151,3 +151,50 @@
  STD_FONTWIN_FILE( gid_File_Fnt_Verasebd, VeraSeBd.ttf, Vera Serif Bold)
  #endif
  #endif
 +
-+#ifdef WNT
 +#ifdef WITH_DEJAVU_FONTS
++#ifdef WNT
 +STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansBoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
 +STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansBold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
 +STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansCondensedBoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
@@ -153,6 +153,28 @@
 +STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifOblique, DejaVuSerif-Oblique.ttf, DejaVu Serif Oblique)
 +STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifRoman, DejaVuSerif-Roman.ttf, DejaVu Serif)
 +#endif
++#ifdef UNX
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansBoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansBold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansCondensedBoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansCondensedBold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansCondensedOblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansMonoBoldOb, DejaVuSansMono-BoldOb.ttf, DejaVu Sans Mono Bold Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansMonoBold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansMonoOblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansMonoRoman, DejaVuSansMono-Roman.ttf, DejaVu Sans Mono)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSansOblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSerifBoldOblique, DejaVuSerif-BoldOblique.ttf, DejaVu Serif Bold Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSerifBold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSerifCondensedBoldOblique, DejaVuSerifCondensed-BoldOblique.ttf, DejaVu Serif Condensed Bold Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSerifCondensedBold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSerifCondensedOblique, DejaVuSerifCondensed-Oblique.ttf, DejaVu Serif Condensed Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSerifOblique, DejaVuSerif-Oblique.ttf, DejaVu Serif Oblique)
++STD_FONTUNX_FILE( gid_File_Fnt_DejaVuSerifRoman, DejaVuSerif-Roman.ttf, DejaVu Serif)
++#endif
 +#endif
 --- postprocess/prj/build.lst	2005-11-23 05:56:34.703125000 +0200
 +++ postprocess/prj/build.lst	2005-11-23 05:56:48.812500000 +0200