[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - configure.in patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Sun Jun 13 05:47:07 PDT 2010
configure.in | 2 -
patches/dev300/apply | 6 ++---
patches/dev300/scp2_accessories.diff | 41 ++++++++++++++++++++++++++++++++---
3 files changed, 42 insertions(+), 7 deletions(-)
New commits:
commit 8df1d8b171808b184f23ee496d202fda3634e8a2
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Jun 13 14:46:30 2010 +0200
Adds Magyar Linux Libertine to OxygenOffice extra packages
* configure.in:
* patches/dev300/apply:
* patches/dev300/scp2_accessories.diff:
diff --git a/configure.in b/configure.in
index 8a4319e..dd35596 100644
--- a/configure.in
+++ b/configure.in
@@ -794,7 +794,7 @@ 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.8.0.0.zip"
+ OOOP_FONTS_PACK="OOOP-fonts-pack-2.8.0.1.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.8.0.0.zip"
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6568272..9eeb20a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -146,9 +146,9 @@ GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, I
# OxygenOffice Professional
OxygenOfficeLinuxCommon : Common, EMFPlus, FontConfigTemporaryHacks, LinuxOnly, SystemBits, Lockdown, \
msaccess, OpenGLTransitions, Fpickers, Mono, AddressBooks, QuickStarter, KDE4,\
- GlobalNSPluginSupport, IntegrateExtensions, LiberationFontsOnWindows, MagyarLinuxLibertineFonts
-OxygenOfficeMacOSXCommon : Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows, MagyarLinuxLibertineFonts
-OxygenOfficeWin32Common : Common, Win32Only, NotDebian, IntegrateExtensions, LiberationFontsOnWindows, MagyarLinuxLibertineFonts
+ GlobalNSPluginSupport, IntegrateExtensions, LiberationFontsOnWindows
+OxygenOfficeMacOSXCommon : Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows
+OxygenOfficeWin32Common : Common, Win32Only, NotDebian, IntegrateExtensions, LiberationFontsOnWindows
OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeLinuxOnly, OxygenOfficeRabbit
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only, OxygenOfficeRabbit
diff --git a/patches/dev300/scp2_accessories.diff b/patches/dev300/scp2_accessories.diff
index 4a5d8a3..c86fa7d 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,889 @@
+@@ -0,0 +1,908 @@
+/*************************************************************************
+*
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -950,6 +950,25 @@ diff -Naur scp2.old/source/accessories/file_font_accessories.scp scp2/source/acc
+STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif )
+#endif
+
++#ifndef WITHOUT_EXTRA_FONT
++STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar Linux Biolinum)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar Linux Biolinum Bold)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertine, MagyarLinLibertine.ttf, Magyar Linux Libertine)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineB, MagyarLinLibertineB.ttf, Magyar Linux Libertine Bold)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineBI, MagyarLinLibertineBI.ttf, Magyar Linux Libertine Bold Italic)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineC, MagyarLinLibertineC_Re.ttf, Magyar Linux Libertine Capital)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf, Magyar Linux Libertine Graphite)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf, Magyar Linux Libertine Bold Graphite)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf, Magyar Linux Libertine Bold Italic Graphite)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf, Magyar Linux Libertine Italic Graphite)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineI, MagyarLinLibertineI.ttf, Magyar Linux Libertine Italic)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineN, MagyarLinLibertineN.ttf, Magyar Linux N Libertine)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNB, MagyarLinLibertineNB.ttf, Magyar Linux Libertine N Bold)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNBI, MagyarLinLibertineNBI.ttf, Magyar Linux Libertine N Bold Italic)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNI, MagyarLinLibertineNI.ttf, Magyar Linux Libertine N Italic)
++STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNC, MagyarLinLibertineNC_Re.ttf, Magyar Linux Libertine N Capital)
++#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
@@ -1651,7 +1670,7 @@ diff -Naur scp2.old/source/accessories/module_accessories.ulf scp2/source/access
diff -Naur scp2.old/source/accessories/module_font_accessories.scp scp2/source/accessories/module_font_accessories.scp
--- scp2.old/source/accessories/module_font_accessories.scp 1970-01-01 01:00:00.000000000 +0100
+++ scp2/source/accessories/module_font_accessories.scp 2008-12-15 10:19:16.000000000 +0100
-@@ -0,0 +1,196 @@
+@@ -0,0 +1,212 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -1841,7 +1860,23 @@ diff -Naur scp2.old/source/accessories/module_font_accessories.scp scp2/source/a
+ gid_File_Fnt_MgOpen_Canonica_Bold,
+ gid_File_Fnt_MgOpen_Canonica_Bold_Italic,
+ gid_File_Fnt_MgOpen_Canonica_Italic,
-+ gid_File_Fnt_MgOpen_Canonica_Regular );
++ gid_File_Fnt_MgOpen_Canonica_Regular,
++ gid_File_Fnt_MagyarLinBiolinum,
++ gid_File_Fnt_MagyarLinBiolinumB,
++ gid_File_Fnt_MagyarLinLibertine,
++ gid_File_Fnt_MagyarLinLibertineB,
++ gid_File_Fnt_MagyarLinLibertineBI,
++ gid_File_Fnt_MagyarLinLibertineC,
++ gid_File_Fnt_MagyarLinLibertineG,
++ gid_File_Fnt_MagyarLinLibertineGB,
++ gid_File_Fnt_MagyarLinLibertineGBI,
++ gid_File_Fnt_MagyarLinLibertineGI,
++ gid_File_Fnt_MagyarLinLibertineI,
++ gid_File_Fnt_MagyarLinLibertineN,
++ gid_File_Fnt_MagyarLinLibertineNB,
++ gid_File_Fnt_MagyarLinLibertineNBI,
++ gid_File_Fnt_MagyarLinLibertineNI,
++ gid_File_Fnt_MagyarLinLibertineNC );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
More information about the ooo-build-commit
mailing list