[ooo-build-commit] 4 commits - bin/unpack configure.in patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Oct 8 03:39:10 PDT 2009
bin/unpack | 2
configure.in | 42 ++--
patches/dev300/apply | 32 +--
patches/dev300/dejavu-fonts.diff | 186 --------------------
patches/dev300/dejavu_liberation_making_fix.diff | 11 -
patches/dev300/dejavu_liberation_packaging_fix.diff | 81 --------
patches/dev300/liberation_making_fix.diff | 11 +
patches/dev300/liberation_packaging_fix.diff | 81 ++++++++
8 files changed, 125 insertions(+), 321 deletions(-)
New commits:
commit c9a0ec26a2e57c53cd9b22815772a2666225bc1d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Oct 8 13:30:41 2009 +0300
Clean up DejaVu font mess
Upstream now includes DejaVu fonts version 2.30. Clean up the
ooo-build infrastructure related to using different DejaVu
versions.
For now we presumably no longer need to specify a different DejaVu
version as the upstream one is quite recent.
Require the --with-dejavu-fonts option, if used, to specify a version
number larger than the upstream one.
Don't couple the use of Liberation fonts to the --with-dejavu-fonts
option.
Rename the DejaVuFonts patch set to LiberationFontsOnWindows, which
says what it actually does.
diff --git a/bin/unpack b/bin/unpack
index 64edda2..6077216 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -776,7 +776,7 @@ if test "x$DEJAVU_FONTS_VER" != "x"; then
mv $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk.ver $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
echo "done"
echo "Correcting the delivery file of DejaVu Font packages"
- sed -e "s|dejavu-ttf-2.21|$DEJAVU_FONTS_PACK_NAME|" $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst > $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst.ver
+ sed -e "s|dejavu-fonts-ttf-.*|$DEJAVU_FONTS_PACK_NAME|" $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst > $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst.ver
mv $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst.ver $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst
echo "done"
diff --git a/configure.in b/configure.in
index f6be679..60d13af 100644
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,10 @@ DEFAULT_TAG=dev300-m60
# This option has been supported since automake 1.8b
AM_INIT_AUTOMAKE([1.8b tar-ustar])
+# The version of DejaVu fonts from upstream.
+DEJAVU_FONTS_UPSTREAM_MAJOR_VER=2
+DEJAVU_FONTS_UPSTREAM_MINOR_VER=30
+
OOO_BUILDVERSION=AC_PACKAGE_VERSION
AC_SUBST(OOO_BUILDVERSION)
@@ -343,13 +347,13 @@ AC_ARG_WITH(sun-templates,
AC_ARG_WITH(dejavu-fonts,
[
- --with-dejavu-fonts Download and install updated DejaVu Fonts. The parameter is
+ --with-dejavu-fonts Download and install updated DejaVu fonts. The parameter is
a version number.
- Example: --with-dejavu-fonts=2.24
+ Example: --with-dejavu-fonts=2.32
- DejaVu Fonts already part of OpenOffice.org so you should
- add this parameter if you want newer version.],
+ You should use this only if you want a newer version than
+ that which upstream has.],
,)
AC_ARG_WITH(liberation-fonts,
@@ -471,10 +475,9 @@ PKG_CHECK_MODULES( FOO_COMMON,
# it's a really bad idea to do conditional tests for things.
#
if test "z`uname -s`" != "zSunOS" -a "z$with_win32" = "z" -a \( "z`uname -o 2>/dev/null`" = "zCygwin" -o "z`uname -s`" = "zInterix" \) ; then
- AC_MSG_WARN([Automatically using --with-win32 --enable-binfilter --with-dejavu-fonts --disable-build-mozilla --disable-nss-module])
+ AC_MSG_WARN([Automatically using --with-win32 --enable-binfilter --disable-build-mozilla --disable-nss-module])
with_win32="yes"
enable_binfilter="yes"
- with_dejavu_fonts=yes
PROPAGATED_ARGS="$PROPAGATED_ARGS --enable-binfilter=yes --disable-build-mozilla --disable-nss-module"
fi
if test "z$with_win32" = "z"; then
@@ -933,29 +936,26 @@ AC_SUBST(OPENCLIPART_VER)
AC_SUBST(OPENCLIPART_DIR)
-AC_MSG_CHECKING([for DejaVu Fonts])
+AC_MSG_CHECKING([whether to use newer DejaVu fonts])
DEJAVU_FONTS_VER=
DEJAVU_FONTS_PACK_NAME=
if test "z$with_dejavu_fonts" != "z" -a "z$with_dejavu_fonts" != "zno" ; then
- if test "z$with_dejavu_fonts" = "zyes" ; then
- # the fonts from the source zip by default
- DEJAVU_FONTS_VER=2.24
- DEJAVU_FONTS_PACK_NAME=dejavu-fonts-ttf-$DEJAVU_FONTS_VER
- elif (echo "$with_dejavu_fonts" | $GREP "^[[0-9\.]]*$") ; then
+ if (echo "$with_dejavu_fonts" | $GREP "^[[0-9]]*\.[[0-9]]*$" >/dev/null) ; then
# it's a version number
DEJAVU_FONTS_VER=$with_dejavu_fonts
DEJAVU_FONTS_PACK_NAME=dejavu-fonts-ttf-$with_dejavu_fonts
+ DEJAVU_FONTS_MAJOR_VER=${DEJAVU_FONTS_VER%.*}
+ DEJAVU_FONTS_MINOR_VER=${DEJAVU_FONTS_VER#*.}
+ if test $DEJAVU_FONTS_MAJOR_VER -lt $DEJAVU_FONTS_UPSTREAM_MAJOR_VER -o \
+ \( $DEJAVU_FONTS_MAJOR_VER -eq $DEJAVU_FONTS_UPSTREAM_MAJOR_VER -a \
+ $DEJAVU_FONTS_MINOR_VER -le $DEJAVU_FONTS_UPSTREAM_MINOR_VER \) ; then
+ AC_MSG_ERROR([requested DejaVu font version should be newer than what upstream has])
+ fi
else
- AC_MSG_ERROR([--with-dejavu-fonts requires either yes, no, or a version number])
- fi
- # also apply some extra patches
- if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
- OOO_ADDITIONAL_SECTIONS="DejaVuFonts"
- else
- OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,DejaVuFonts"
+ AC_MSG_ERROR([--with-dejavu-fonts requires a version number])
fi
fi
-AC_MSG_RESULT([${DEJAVU_FONTS_VER:-no}])
+AC_MSG_RESULT([${DEJAVU_FONTS_VER:-no, use those in upstream}])
AC_SUBST(DEJAVU_FONTS_VER)
AC_SUBST(DEJAVU_FONTS_PACK_NAME)
@@ -973,7 +973,7 @@ if test "z$with_liberation_fonts" != "z" -a "z$with_liberation_fonts" != "zno" ;
AC_MSG_ERROR([--with-liberation-fonts requires either yes, no, or a version number])
fi
fi
-AC_MSG_RESULT([${LIBERATION_FONTS_VER:-no}])
+AC_MSG_RESULT([${LIBERATION_FONTS_VER:-as upstream}])
AC_SUBST(LIBERATION_FONTS_VER)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f3a6582..3b6bf34 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -37,7 +37,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
WriterNavigation, WriterDocComparison
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
-Optional : DejaVuFonts, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
+Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
# 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
@@ -115,7 +115,7 @@ Win32 : Win32Common
translate-org-za-linux: translate-org-za-common, LinuxCommon, Common, Lockdown
translate-org-za-win32: translate-org-za-common, Win32Common, Common
NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, Lockdown, Fpickers, \
- CustomUserConfig, DejaVuFonts, IntegrateExtensions
+ CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
# Novell
NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only
NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only
@@ -135,15 +135,15 @@ GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, I
OxygenOfficeLinuxCommon : Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, \
- Fpickers, Mono, AddressBooks, QuickStarter, IntegrateExtensions, DejaVuFonts
-OxygenOfficeMacOSXCommon : Common, SystemBits, IntegrateExtensions, DejaVuFonts, OOXMLExport
-OxygenOfficeWin32Common : Common, Win32Only, NotDebian, IntegrateExtensions, DejaVuFonts
+ Fpickers, Mono, AddressBooks, QuickStarter, IntegrateExtensions, LiberationFontsOnWindows
+OxygenOfficeMacOSXCommon : Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows, OOXMLExport
+OxygenOfficeWin32Common : Common, Win32Only, NotDebian, IntegrateExtensions, LiberationFontsOnWindows
OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
# FSFhu
-FSFhuWindows : Win32Common, NovellOnly, Lockdown, Fpickers, CustomUserConfig, DejaVuFonts, IntegrateExtensions
-FSFhuLinux : NovellBase, EMFPlus, CairoFonts, DejaVuFonts, IntegrateExtensions
+FSFhuWindows : Win32Common, NovellOnly, Lockdown, Fpickers, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
+FSFhuLinux : NovellBase, EMFPlus, CairoFonts, LiberationFontsOnWindows, IntegrateExtensions
FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions
# Plain build; just with base build fixes
PlainLinux: PlainBuildFixes
@@ -1378,7 +1378,7 @@ system-python-ure-bootstrap.diff, deb#501028, i#90701
pyuno-ooodir.diff, i#90701
system-python-uno-path.diff, i#97629
-[ DejaVuFonts ]
+[ LiberationFontsOnWindows ]
# Use Liberation fonts on Windows, too
liberation_packaging_fix.diff, kami
commit e2b796cb0657c7891c201c32c89f961dc98067c6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Oct 8 12:54:49 2009 +0300
Rename the Liberation font patches to match what they do
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 67a655f..f3a6582 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1381,8 +1381,8 @@ system-python-uno-path.diff, i#97629
[ DejaVuFonts ]
# Use Liberation fonts on Windows, too
-dejavu_liberation_packaging_fix.diff, kami
-dejavu_liberation_making_fix.diff, kami
+liberation_packaging_fix.diff, kami
+liberation_making_fix.diff, kami
[ VCL ]
diff --git a/patches/dev300/dejavu_liberation_making_fix.diff b/patches/dev300/dejavu_liberation_making_fix.diff
deleted file mode 100644
index 1a6bae0..0000000
--- a/patches/dev300/dejavu_liberation_making_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk.orig 2008-01-08 16:11:54.000000000 +0100
-+++ bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk 2008-04-12 14:56:05.694604800 +0200
-@@ -63,8 +63,6 @@
- .INCLUDE : target.mk
-
- .IF "$(WITH_FONTS)"!="NO"
--.IF "$(GUI)" != "WNT"
- .INCLUDE : tg_ext.mk
- .ENDIF
--.ENDIF
-
diff --git a/patches/dev300/dejavu_liberation_packaging_fix.diff b/patches/dev300/dejavu_liberation_packaging_fix.diff
deleted file mode 100644
index 01b67d5..0000000
--- a/patches/dev300/dejavu_liberation_packaging_fix.diff
+++ /dev/null
@@ -1,81 +0,0 @@
---- scp2/source/ooo/file_font_ooo.scp.orig 2008-01-08 16:14:16.000000000 +0100
-+++ scp2/source/ooo/file_font_ooo.scp 2008-04-05 09:44:51.000000000 +0200
-@@ -134,78 +134,54 @@
-
- // Liberation Mono
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
- #endif
--#endif
-
- // Liberation Sans
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
- #endif
--#endif
-
- // Liberation Serif
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
- #endif
--#endif
-
- #ifndef WITHOUT_FONTS
--#ifndef WNT
- STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
- #endif
--#endif
-
- // Gentium fonts
-
diff --git a/patches/dev300/liberation_making_fix.diff b/patches/dev300/liberation_making_fix.diff
new file mode 100644
index 0000000..1a6bae0
--- /dev/null
+++ b/patches/dev300/liberation_making_fix.diff
@@ -0,0 +1,11 @@
+--- bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk.orig 2008-01-08 16:11:54.000000000 +0100
++++ bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk 2008-04-12 14:56:05.694604800 +0200
+@@ -63,8 +63,6 @@
+ .INCLUDE : target.mk
+
+ .IF "$(WITH_FONTS)"!="NO"
+-.IF "$(GUI)" != "WNT"
+ .INCLUDE : tg_ext.mk
+ .ENDIF
+-.ENDIF
+
diff --git a/patches/dev300/liberation_packaging_fix.diff b/patches/dev300/liberation_packaging_fix.diff
new file mode 100644
index 0000000..01b67d5
--- /dev/null
+++ b/patches/dev300/liberation_packaging_fix.diff
@@ -0,0 +1,81 @@
+--- scp2/source/ooo/file_font_ooo.scp.orig 2008-01-08 16:14:16.000000000 +0100
++++ scp2/source/ooo/file_font_ooo.scp 2008-04-05 09:44:51.000000000 +0200
+@@ -134,78 +134,54 @@
+
+ // Liberation Mono
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
+ #endif
+-#endif
+
+ // Liberation Sans
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
+ #endif
+-#endif
+
+ // Liberation Serif
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
+ #endif
+-#endif
+
+ // Gentium fonts
+
commit 18d963bd5fb813233fd5dc76a132223aabeaa779
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Oct 8 12:50:40 2009 +0300
Drop unused dejavu-fonts.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 97adfe8..67a655f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1190,13 +1190,6 @@ win32-prebuilt-writingaids-zip-scp2.diff
# drop stuff that is needed only on Win9x
novell-win32-drop-win9x.diff
-[ translate-org-za-common ]
-SectionOwner => davidf
-
-# use the dejavu fonts - commented out as different patches in the works
-# dejavu-fonts.diff, i#59853
-
-
[ FrugalwareOnly ]
diff --git a/patches/dev300/dejavu-fonts.diff b/patches/dev300/dejavu-fonts.diff
deleted file mode 100644
index 38d53f0..0000000
--- a/patches/dev300/dejavu-fonts.diff
+++ /dev/null
@@ -1,186 +0,0 @@
---- configure.in.OLD 2005-11-21 02:16:33.437250000 +0200
-+++ configure.in 2005-11-23 05:12:58.296875000 +0200
-@@ -52,6 +52,11 @@
- for specific distributions where the fonts are known
- to be already available
- ],,)
-+AC_ARG_WITH(dejavu-fonts,
-+[ --without-dejavu-fonts Remove DejaVu fonts
-+ (even if present) in the openoffice.org installation
-+ set.
-+],,with_dejavu_fonts="yes")
- AC_ARG_ENABLE(epm,
- [ --disable-epm OO.o includes self-packaging code, that requires
- epm, however epm is useless for large scale
-@@ -4094,6 +4099,18 @@
- fi
- AC_SUBST(WITH_FONTS)
-
-+AC_MSG_CHECKING([whether to include DejaVu fonts])
-+if test "$with_dejavu_fonts" != "no" -a -e ../dejavu_fonts/download/dejavu-ttf-20050914.tar.gz; then
-+ AC_MSG_RESULT([yes])
-+ WITH_DEJAVU_FONTS=YES
-+ SCPDEFS="$SCPDEFS -DWITH_DEJAVU_FONTS"
-+ BUILD_TYPE="$BUILD_TYPE DEJAVU_FONTS"
-+else
-+ AC_MSG_RESULT([no])
-+ WITH_DEJAVU_FONTS=NO
-+fi
-+AC_SUBST(WITH_DEJAVU_FONTS)
-+
- AC_SUBST(SCPDEFS)
-
- AC_MSG_CHECKING([whether and how to use Xinerama])
---- dejavu_fonts/makefile.mk.OLD 1970-01-01 02:00:00.000000000 +0200
-+++ dejavu_fonts/makefile.mk 2005-11-23 05:07:41.015625000 +0200
-@@ -0,0 +1,78 @@
-+#*************************************************************************
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
-+#
-+# last change: $Author$ $Date$
-+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
-+#
-+#*************************************************************************
-+
-+PRJ=.
-+
-+PRJNAME=dejavu_fonts
-+TARGET=dejavu_fonts
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+TARFILE_NAME=dejavu-fonts
-+TARFILE_ROOTDIR=dejavu-fonts
-+
-+PATCH_FILE_NAME=
-+
-+
-+CONFIGURE_DIR=
-+CONFIGURE_ACTION=
-+
-+BUILD_DIR=
-+BUILD_ACTION=
-+BUILD_FLAGS=
-+
-+# --- Targets ------------------------------------------------------
-+
-+all: \
-+ $(MISC)$/remove_build.flag \
-+ ALLTAR
-+
-+.INCLUDE : set_ext.mk
-+.INCLUDE : target.mk
-+
-+.IF "$(WITH_DEJAVU_FONTS)"!="NO"
-+.INCLUDE : tg_ext.mk
-+.ENDIF
-+
-+# Since you never know what will be in a patch (for example, it may already
-+# patch at configure level), we remove the entire package directory if a patch
-+# is newer.
-+$(MISC)$/remove_build.flag : $(PATCH_FILE_NAME)
-+ $(REMOVE_PACKAGE_COMMAND)
-+ +$(TOUCH) $(MISC)$/remove_build.flag
---- dejavu_fonts/prj/d.lst.OLD 1970-01-01 02:00:00.000000000 +0200
-+++ dejavu_fonts/prj/d.lst 2005-11-23 04:52:41.531250000 +0200
-@@ -0,0 +1,2 @@
-+mkdir: %_DEST%\pck%_EXT%
-+..\%__SRC%\misc\build\dejavu-fonts\*.ttf %_DEST%\pck%_EXT%\*.ttf
---- dejavu_fonts/prj/build.lst.OLD 1970-01-01 02:00:00.000000000 +0200
-+++ dejavu_fonts/prj/build.lst 2005-11-22 12:05:42.843750000 +0200
-@@ -0,0 +1,3 @@
-+bs dejavu_fonts : solenv NULL
-+bs dejavu_fonts usr1 - all amt_mkout NULL
-+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,50 @@
- STD_FONTWIN_FILE( gid_File_Fnt_Verasebd, VeraSeBd.ttf, Vera Serif Bold)
- #endif
- #endif
-+
-+#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)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansCondensedBold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansCondensedOblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansMonoBoldOb, DejaVuSansMono-BoldOb.ttf, DejaVu Sans Mono Bold Oblique)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansMonoBold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansMonoOblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansMonoRoman, DejaVuSansMono-Roman.ttf, DejaVu Sans Mono)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansOblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifBoldOblique, DejaVuSerif-BoldOblique.ttf, DejaVu Serif Bold Oblique)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifBold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifCondensedBoldOblique, DejaVuSerifCondensed-BoldOblique.ttf, DejaVu Serif Condensed Bold Oblique)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifCondensedBold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifCondensedOblique, DejaVuSerifCondensed-Oblique.ttf, DejaVu Serif Condensed Oblique)
-+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed)
-+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
-@@ -1,4 +1,4 @@
--po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd sdk_oo setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL
-+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd sdk_oo setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DEJAVU_FONTS:dejavu_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL
- po postprocess usr1 - all po_mkout NULL
- po postprocess\checkxml nmake - all po_checkxml NULL
- po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
commit c69b3180298417fa2613574c9684b6ff20a638e2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Oct 8 12:45:28 2009 +0300
Make comment about Liberation fonts match what the patches actually do
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0876941..97adfe8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1387,11 +1387,8 @@ system-python-uno-path.diff, i#97629
[ DejaVuFonts ]
-# Add Liberation fonts for all platforms
+# Use Liberation fonts on Windows, too
dejavu_liberation_packaging_fix.diff, kami
-
-# Following the changed names of DejaVu fonts
-# Add Liberation fonts for all platforms
dejavu_liberation_making_fix.diff, kami
[ VCL ]
More information about the ooo-build-commit
mailing list