[Libreoffice-commits] .: Branch 'libreoffice-3-4' - bin/unpack patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Apr 6 05:58:06 PDT 2011
bin/unpack | 11 -
patches/dev300/apply | 3
patches/dev300/novell-win32-agfa-monotype-fonts.diff | 171 -------------------
3 files changed, 3 insertions(+), 182 deletions(-)
New commits:
commit b7d22b8006cd9839b3080efb1397e5c453b2fa2d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Apr 6 15:16:58 2011 +0300
Integrate novell-win32-agfa-monotype-fonts.diff
diff --git a/bin/unpack b/bin/unpack
index 9ec756f..deb7c63 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -510,13 +510,8 @@ if test "z$BUILD_WIN32" != "z"; then
NovellWin32*)
if test -f $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE; then
agfa_md5=`md5sum $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE | cut -d' ' -f1`
- if test -f $OOBUILDDIR/agfa_monotype_fonts/download/${agfa_md5}-agfa-monotype-fonts.tar.gz; then
- echo "Already have the Agfa Monotype fonts"
- else
- $echo_n "Installing Agfa Monotype fonts $echo_c"
- mkdir -p $OOBUILDDIR/agfa_monotype_fonts/download
- cp -f $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE $OOBUILDDIR/agfa_monotype_fonts/download/${agfa_md5}-agfa-monotype-fonts.tar.gz || exit 1
- echo "done"
+ if test ! -f $SRCDIR/{agfa_md5}-agfa-monotype-fonts.tar.gz; then
+ cp -f $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE $SRCDIR/${agfa_md5}-agfa-monotype-fonts.tar.gz
fi
if grep 'Agfa Monotype' $OOBUILDDIR/readlicense_oo/html/THIRDPARTYLICENSEREADME.html; then
echo "THIRDPARTYLICENSEREADME.html already contains Agfa Monotype EULA"
@@ -527,7 +522,7 @@ if test "z$BUILD_WIN32" != "z"; then
fi
else
echo Missing $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE
- echo which should always be included when building $DISTRO
+ echo which should always be there when building $DISTRO
exit 1
fi
;;
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c9b0c18..72401d2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1470,9 +1470,6 @@ SectionOwner => jholesov
# fix mysqlc to use the SONAME instead of the .so symlink...
mysqlcppconn-mysqlclient-SONAME.diff
-[ BuildBits ]
-novell-win32-agfa-monotype-fonts.diff, tml
-
[ Fixes ]
# FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
diff --git a/patches/dev300/novell-win32-agfa-monotype-fonts.diff b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
deleted file mode 100644
index 1ccda80..0000000
--- a/patches/dev300/novell-win32-agfa-monotype-fonts.diff
+++ /dev/null
@@ -1,171 +0,0 @@
---- /dev/null
-+++ agfa_monotype_fonts/makefile.mk
-@@ -0,0 +1,81 @@
-+#*************************************************************************
-+#
-+# 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=agfa_monotype_fonts
-+TARGET=agfa_monotype_fonts
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+TARFILE_NAME=agfa-monotype-fonts
-+TARFILE_MD5=9bad41ce5c3fd069b87f28aeac70314d
-+TARFILE_LOCATION=../../../download
-+TARFILE_ROOTDIR=agfa-monotype-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_AGFA_MONOTYPE_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)
-+ pwd
-+ $(REMOVE_PACKAGE_COMMAND)
-+ +$(TOUCH) $(MISC)$/remove_build.flag
---- /dev/null
-+++ agfa_monotype_fonts/prj/build.lst
-@@ -0,0 +1,3 @@
-+bs agfa_monotype_fonts : solenv NULL
-+bs agfa_monotype_fonts usr1 - all amt_mkout NULL
-+bs agfa_monotype_fonts nmake - all amt_fonts NULL
---- /dev/null
-+++ agfa_monotype_fonts/prj/d.lst
-@@ -0,0 +1,2 @@
-+mkdir: %_DEST%\pck%_EXT%
-+..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %_DEST%\pck%_EXT%\*.ttf
---- configure.in
-+++ configure.in
-@@ -100,6 +100,12 @@ AC_ARG_WITH(afms,
- are known to be available.
- ],,)
-
-+AC_ARG_WITH(agfa-monotype-fonts,
-+[ --without-agfa-monotype-fonts Remove proprietary Agfa Monotype fonts
-+ (even if present) in the openoffice.org installation
-+ set.
-+],,with_agfa_monotype_fonts="yes")
-+
- AC_ARG_WITH(epm,
- [ --with-epm Decides which epm to use. Default is to use
- the one from the system if one is built. When
-@@ -6766,6 +6771,18 @@ else
- fi
- AC_SUBST(WITH_FONTS)
-
-+AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
-+if test "$with_agfa_monotype_fonts" != "no" -a -e agfa_monotype_fonts/download/agfa-monotype-fonts.tar.gz; then
-+ AC_MSG_RESULT([yes])
-+ WITH_AGFA_MONOTYPE_FONTS=YES
-+ SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
-+ BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
-+else
-+ AC_MSG_RESULT([no])
-+ WITH_AGFA_MONOTYPE_FONTS=NO
-+fi
-+AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
-+
- dnl ===================================================================
- dnl Test whether to include ppds
- dnl ===================================================================
---- postprocess/prj/build.lst
-+++ postprocess/prj/build.lst
-@@ -1,4 +1,4 @@
--po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
-+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver 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
-
---- scp2/source/ooo/file_font_ooo.scp
-+++ scp2/source/ooo/file_font_ooo.scp
-@@ -148,3 +148,30 @@ End
- #endif
- #endif
-
-+#ifdef WNT
-+#ifdef WITH_AGFA_MONOTYPE_FONTS
-+STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
-+STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
-+STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_____.ttf, Andale Sans)
-+STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb____.ttf, Andale Sans Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi____.ttf, Andale Sans Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_bl, bl______.ttf, BellMT)
-+STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_____.ttf, BellMT Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi____.ttf, BellMT Bold Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_____.ttf, BellMT Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
-+STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
-+STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
-+STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
-+STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
-+#endif
-+#endif
More information about the Libreoffice-commits
mailing list