[ooo-build-commit] Branch 'ooo-build-3-2' - configure.in patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Sat Jan 23 08:41:41 PST 2010
configure.in | 8 +-
patches/dev300/scp2_accessories.diff | 122 ++++++++++++++++++++++++++++++++++-
2 files changed, 125 insertions(+), 5 deletions(-)
New commits:
commit 324119e52a982da70bb4477a47cc2aa1e7c192c4
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Jan 23 17:40:19 2010 +0100
Updated accessories for OxygenOffice Professional
* configure.in:
* patches/dev300/scp2_accessories.diff:
diff --git a/configure.in b/configure.in
index 398bae0..3ca65e2 100644
--- a/configure.in
+++ b/configure.in
@@ -777,10 +777,10 @@ OOOP_SAMPLES_PACK=
OOOP_TEMPLATES_PACK=
if test "z$with_distro" = "zOxygenOfficeLinux" -o \
"z$with_distro" = "zOxygenOfficeWindows" ; then
- OOOP_FONTS_PACK="OOOP-fonts-pack-2.4.0.4.zip"
- OOOP_GALLERY_PACK="OOOP-gallery-pack-2.7.0.0.zip"
+ OOOP_FONTS_PACK="OOOP-fonts-pack-2.8.0.0.zip"
+ OOOP_GALLERY_PACK="OOOP-gallery-pack-2.8.0.0.zip"
OOOP_SAMPLES_PACK="OOOP-samples-pack-2.7.0.0.zip"
- OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.7.0.0.zip"
+ OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.8.0.0.zip"
fi
AC_SUBST(OOOP_FONTS_PACK)
AC_SUBST(OOOP_GALLERY_PACK)
@@ -860,7 +860,7 @@ AC_SUBST(CAIRO_CONFIGURE_FLAG)
PREBUILT_WRITINGAIDS_TIMESTAMP=20091204
AC_SUBST(PREBUILT_WRITINGAIDS_TIMESTAMP)
-PREBUILT_EXTENSIONAIDS_TIMESTAMP=20090523
+PREBUILT_EXTENSIONAIDS_TIMESTAMP=20100122
AC_SUBST(PREBUILT_EXTENSIONAIDS_TIMESTAMP)
BUILD_MOZILLA_SOURCE='seamonkey-1.1.14.source.tar.gz'
diff --git a/patches/dev300/scp2_accessories.diff b/patches/dev300/scp2_accessories.diff
index a2ce7b0..4a5d8a3 100644
--- a/patches/dev300/scp2_accessories.diff
+++ b/patches/dev300/scp2_accessories.diff
@@ -60,7 +60,7 @@ diff -Naur scp2.old/source/accessories/file_accessories.scp scp2/source/accessor
diff -Naur scp2.old/source/accessories/file_font_accessories.scp scp2/source/accessories/file_font_accessories.scp
--- scp2.old/source/accessories/file_font_accessories.scp 1970-01-01 01:00:00.000000000 +0100
+++ scp2/source/accessories/file_font_accessories.scp 2008-12-15 10:19:15.000000000 +0100
-@@ -0,0 +1,769 @@
+@@ -0,0 +1,889 @@
+/*************************************************************************
+*
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -830,6 +830,126 @@ diff -Naur scp2.old/source/accessories/file_font_accessories.scp scp2/source/acc
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
+#endif
+
++/* Chopin Script */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Chopin_Script, CHOPS___.TTF, Chopin Script )
++#endif
++
++/* DTP Dingbats */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_DTPDingbats, DTPDingbats.ttf, DTP Dingbats )
++#endif
++
++/* Justus Bold */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Justus-Bold, Justus-Bold.ttf, Justus Bold )
++#endif
++
++/* Justus Italic Oldstyle */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Justus-ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle )
++#endif
++
++/* Justus Italic */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Justus-Italic, Justus-Italic.ttf, Justus Italic )
++#endif
++
++/* Justus Oldstyle */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Justus-Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle )
++#endif
++
++/* Justus Roman */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Justus-Roman, Justus-Roman.ttf, Justus Roman )
++#endif
++
++/* Justus Versalitas */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Justus-Versalitas, Justus-Versalitas.ttf, Justus Versalitas )
++#endif
++
++/* Let's trace basic */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Lets_trace_basic, letstracebasic.ttf, Lets trace basic )
++#endif
++
++/* Let's trace ruled */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Lets_trace_ruled, letstraceruled.ttf, Lets trace ruled )
++#endif
++
++/* Tuffy Bold Italic */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic.ttf, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic )
++#endif
++
++/* Tuffy Bold */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold, Tuffy_Bold.ttf, Tuffy Bold )
++#endif
++
++/* Tuffy Italic */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Tuffy_Italic, Tuffy_Italic.ttf, Tuffy Italic )
++#endif
++
++/* Tuffy */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Tuffy, Tuffy.ttf, Tuffy )
++#endif
++
++/* Verina Sans Bold Oblique */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold_Oblique, Verina_Sans_Bold_Oblique.otf, Verina Sans Bold Oblique )
++#endif
++
++/* Verina Sans Bold */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold, Verina_Sans_Bold.otf, Verina Sans Bold )
++#endif
++
++/* Verina Sans Mono Bold Oblique */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold_Oblique, Verina_Sans_Mono_Bold_Oblique.otf, Verina Sans Mono Bold Oblique )
++#endif
++
++/* Verina Sans Mono Bold */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold, Verina_Sans_Mono_Bold.otf, Verina Sans Mono Bold )
++#endif
++
++/* Verina Sans Mono Oblique */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Oblique, Verina_Sans_Mono_Oblique.otf, Verina Sans Mono Oblique )
++#endif
++
++/* Verina Sans Mono */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono, Verina_Sans_Mono.otf, Verina Sans Mono )
++#endif
++
++/* Verina Sans Oblique */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Oblique, Verina_Sans_Oblique.otf, Verina Sans Oblique )
++#endif
++
++/* Verina Sans Roman */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Roman, Verina_Sans_Roman.otf, Verina Sans Roman )
++#endif
++
++/* Verina Serif Bold */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Serif Bold )
++#endif
++
++/* Verina Serif */
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif )
++#endif
++
diff -Naur scp2.old/source/accessories/file_gallery_accessories.scp scp2/source/accessories/file_gallery_accessories.scp
--- scp2.old/source/accessories/file_gallery_accessories.scp 1970-01-01 01:00:00.000000000 +0100
+++ scp2/source/accessories/file_gallery_accessories.scp 2008-12-15 10:19:15.000000000 +0100
More information about the ooo-build-commit
mailing list