[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.in external_deps.lst LICENSE_category_b more_fonts/fonts more_fonts/prj scp2/source
Pedro Giffuni
pfg at apache.org
Tue Jan 13 10:10:01 PST 2015
LICENSE_category_b | 101 ------------------------------
configure.in | 22 ------
external_deps.lst | 10 +-
more_fonts/fonts/ttf_croscore/makefile.mk | 8 +-
more_fonts/prj/d.lst | 3
scp2/source/ooo/file_font_ooo.scp | 4 -
6 files changed, 13 insertions(+), 135 deletions(-)
New commits:
commit d8020927231297bc7faa3bab3d20ee2041eb050a
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Jan 13 16:12:12 2015 +0000
Update ChromeOS fonts to version 1.23.0
As mentioned in their corresponding web pages, the latest versions
of the ChromeOS fonts are under an Apache License V2.
"Updated in May 2013 with improved hinting and released under the Apache
2.0 license."
https://www.google.com/fonts/specimen/Arimo
https://www.google.com/fonts/specimen/Tinos
https://www.google.com/fonts/specimen/Cousine
Thanks to Google for providing this great fonts freely.
diff --git a/LICENSE_category_b b/LICENSE_category_b
index c203e9a..db11caf 100644
--- a/LICENSE_category_b
+++ b/LICENSE_category_b
@@ -1482,107 +1482,6 @@ any resulting litigation.
____
-For Google Chrome OS fonts:
-- SIL Open Font License, Version 1.1.
-
-Digitized data copyright (c) 2010 Google Corporation
-with Reserved Font Arimo, Tinos and Cousine.
-
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-
-PREAMBLE The goals of the Open Font License (OFL) are to stimulate
-worldwide development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to provide
-a free and open framework in which fonts may be shared and improved in
-partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves.
-The fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
-
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such.
-This may include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components
-as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting ? in part or in whole ?
-any of the components of the Original Version, by changing formats or
-by porting the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical writer
-or other person who contributed to the Font Software.
-
-
-PERMISSION & CONDITIONS
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,in
- Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
- redistributed and/or sold with any software, provided that each copy
- contains the above copyright notice and this license. These can be
- included either as stand-alone text files, human-readable headers or
- in the appropriate machine-readable metadata fields within text or
- binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
- Name(s) unless explicit written permission is granted by the
- corresponding Copyright Holder. This restriction only applies to the
- primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
- Software shall not be used to promote, endorse or advertise any
- Modified Version, except to acknowledge the contribution(s) of the
- Copyright Holder(s) and the Author(s) or with their explicit written
- permission.
-
-5) The Font Software, modified or unmodified, in part or in whole, must
- be distributed entirely under this license, and must not be distributed
- under any other license. The requirement for fonts to remain under
- this license does not apply to any document created using the Font
- Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
-DEALINGS IN THE FONT SOFTWARE.
-
-____
-
For Gentium Basic fonts:
- SIL Open Font License, Version 1.1.
diff --git a/external_deps.lst b/external_deps.lst
index d1d0272..8395e7c 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -239,6 +239,11 @@ if (WITH_CATA_FONTS == YES)
URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.34/dejavu-fonts-ttf-2.34.tar.bz2/download
# URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+if (WITH_CATA_FONTS==YES)
+ MD5 = cfa8bec07bf5b6856dd20f0cb28b3929
+ name = croscorefonts-1.23.0.tar.gz
+ URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+
if ( true )
MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab
name = SampleICC-1.3.2.tar.gz
@@ -280,11 +285,6 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
URL1 = http://sourceforge.net/projects/hunspell/files/Hyphen/2.7/hyphen-2.7.1.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (ENABLE_CATEGORY_B==YES && WITH_CATB_FONTS==YES)
- MD5 = 61f59e4110781cbe66b46449eadac231
- name = croscorefonts-1.21.0.tar.gz
- URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-
if (ENABLE_CATEGORY_B==YES && SYSTEM_HUNSPELL!=YES)
name = hunspell-1.3.2.tar.gz
MD5 = 3121aaf3e13e5d88dfff13fb4a5f1ab8
diff --git a/more_fonts/fonts/ttf_croscore/makefile.mk b/more_fonts/fonts/ttf_croscore/makefile.mk
index 7d1f232..5e6a86b 100644
--- a/more_fonts/fonts/ttf_croscore/makefile.mk
+++ b/more_fonts/fonts/ttf_croscore/makefile.mk
@@ -28,17 +28,17 @@ TARGET=ttf_croscore
.INCLUDE : settings.mk
-.IF "$(WITH_CATB_FONTS)" != "YES"
+.IF "$(WITH_CATA_FONTS)" != "YES"
@all:
- @echo "category B licensed CrossCore font is disabled."
+ @echo "category A licensed CrossCore font is disabled."
.ELSE
# --- Files --------------------------------------------------------
-TARFILE_NAME=croscorefonts-1.21.0
-TARFILE_MD5=61f59e4110781cbe66b46449eadac231
+TARFILE_NAME=croscorefonts-1.23.0
+TARFILE_MD5=cfa8bec07bf5b6856dd20f0cb28b3929
PATCH_FILES=
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 8145961..802156f 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -3,7 +3,6 @@ mkdir: %COMMON_DEST%\pck%_EXT%
# TODO: replace explicit versions by wildcard when the build system learns to handle them
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
-..\%__SRC%\misc\build\croscorefonts-1.21.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\croscorefonts-1.21.0\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_croscorefonts
+..\%__SRC%\misc\build\croscorefonts-1.23.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 1ef1282..d9a860c 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -67,9 +67,9 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondense
// Google ChromeOS fonts
-// Arimo
-#ifdef WITH_CATB_FONTS
+#ifdef WITH_CATA_FONTS
+// Arimo
STD_FONT_FILE( gid_File_Fnt_Arimo_Regular, Arimo-Regular.ttf, Arimo Regular)
STD_FONT_FILE( gid_File_Fnt_Arimo_Bold, Arimo-Bold.ttf, Arimo Bold)
STD_FONT_FILE( gid_File_Fnt_Arimo_Italic, Arimo-Italic.ttf, Arimo Italic)
commit cf047a30df9a85a492463b3506130b9e56421a99
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Jan 13 16:07:00 2015 +0000
Don't look for libwpd - we don't use it.
Fix typo while here.
diff --git a/configure.in b/configure.in
index 2d81551..97f4b4c 100644
--- a/configure.in
+++ b/configure.in
@@ -435,9 +435,6 @@ AC_ARG_WITH(system-jpeg,
AC_ARG_WITH(system-expat,
[ --with-system-expat Use expat already on system
],,)
-AC_ARG_WITH(system-libwpd,
-[ --with-system-libwpd Use libwpd already on system
-],,)
AC_ARG_WITH(system-libxml,
[ --with-system-libxml Use libxml already on system
],,)
@@ -1415,7 +1412,7 @@ if test "$enable_category_b" = "yes"; then
AC_MSG_RESULT([yes: allow modules nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built])
else
- # Disable libaries.
+ # Disable libraries.
enable_nss_module="no"
enable_hunspell="no"
enable_hyphen="no"
@@ -3767,23 +3764,6 @@ fi
AC_SUBST(SYSTEM_EXPAT)
dnl ===================================================================
-dnl Check for system libwpd
-dnl ===================================================================
-AC_MSG_CHECKING([which libwpd to use])
-if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
- test "$with_system_libwpd" != "no"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBWPD=YES
- PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
-else
- AC_MSG_RESULT([no])
- SYSTEM_LIBWPD=
-fi
-AC_SUBST(SYSTEM_LIBWPD)
-AC_SUBST(LIBWPD_CFLAGS)
-AC_SUBST(LIBWPD_LIBS)
-
-dnl ===================================================================
dnl Check for system cppunit
dnl ===================================================================
WITH_CPPUNIT=
More information about the Libreoffice-commits
mailing list