external_deps.lst | 12 ++++- more_fonts/fonts/fc_local.conf | 12 +++++ more_fonts/fonts/ttf_carlito/makefile.mk | 64 +++++++++++++++++++++++++++++++ more_fonts/prj/build.lst | 1 more_fonts/prj/d.lst | 1 openssl/makefile.mk | 14 +++--- openssl/openssl-0.9.8zg-clang.patch | 11 ----- openssl/openssl-0.9.8zh-clang.patch | 11 +++++ openssl/openssl.patch | 20 ++++----- openssl/openssllnx.patch | 28 ++++++------- openssl/opensslmacosx.patch | 12 ++--- openssl/opensslmingw.patch | 16 +++---- openssl/opensslsol.patch | 28 ++++++------- openssl/version.mk | 4 - scp2/source/ooo/file_font_ooo.scp | 30 ++++++++------ 15 files changed, 177 insertions(+), 87 deletions(-)
New commits: commit 17d97611ae7115f4e21f81904aae40f27155489c Author: Pedro Giffuni <p...@apache.org> Date: Tue Dec 29 21:47:35 2015 +0000 Update OpenSSL to version 0.9.8zh Missing changes -- slight mess here :-/. diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 0b0278c..d67449e 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -63,8 +63,8 @@ UNAME=$(shell uname) .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ - libcrypto_OOo_0_9_8zg.map \ - libssl_OOo_0_9_8zg.map + libcrypto_OOo_0_9_8zh.map \ + libssl_OOo_0_9_8zh.map .IF "$(CPU)" == "I" .IF "$(UNAME)" == "GNU/kFreeBSD" CONFIGURE_ACTION=Configure debian-kfreebsd-i386 @@ -87,8 +87,8 @@ UNAME=$(shell uname) .IF "$(OS)" == "SOLARIS" PATCH_FILES=opensslsol.patch ADDITIONAL_FILES:= \ - libcrypto_OOo_0_9_8zg.map \ - libssl_OOo_0_9_8zg.map + libcrypto_OOo_0_9_8zh.map \ + libssl_OOo_0_9_8zh.map #BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map' # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index 3cacbe2..a7cee29 100644 --- a/openssl/openssllnx.patch +++ b/openssl/openssllnx.patch @@ -66,11 +66,11 @@ fi GCCVER=${GCCVER:-0} if [ "$SYSTEM" = "HP-UX" ];then ---- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2010-03-26 15:26:55.958495757 +0100 -+++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2010-03-26 15:31:38.019501422 +0100 +--- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2010-03-26 15:26:55.958495757 +0100 ++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2010-03-26 15:31:38.019501422 +0100 @@ -1 +1,3295 @@ -dummy -+libcrypto_OOo_0_9_8zg { ++libcrypto_OOo_0_9_8zh { + global: +ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_it; @@ -1389,7 +1389,7 @@ +KRB5_TKTBODY_free; +KRB5_TKTBODY_it; +KRB5_TKTBODY_new; -+libcrypto_OOo_0_9_8zg; ++libcrypto_OOo_0_9_8zh; +LONG_it; +MD2; +MD2_Final; @@ -3365,11 +3365,11 @@ + local: + *; +}; ---- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 2010-03-26 15:26:55.966057991 +0100 -+++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 2010-03-26 15:31:58.552966503 +0100 +--- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 2010-03-26 15:26:55.966057991 +0100 ++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 2010-03-26 15:31:58.552966503 +0100 @@ -1 +1,445 @@ -dummy -+LIBSSL_OOO_0_9_8zg { ++LIBSSL_OOO_0_9_8zh { + global: +BIO_f_ssl; +BIO_new_buffer_ssl_connect; @@ -3382,7 +3382,7 @@ +DTLSv1_method; +DTLSv1_server_method; +ERR_load_SSL_strings; -+LIBSSL_OOO_0_9_8zg; ++LIBSSL_OOO_0_9_8zh; +SSL_CIPHER_description; +SSL_CIPHER_get_bits; +SSL_CIPHER_get_name; diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch index 5e23d36..e65df9a 100644 --- a/openssl/opensslmacosx.patch +++ b/openssl/opensslmacosx.patch @@ -1,7 +1,7 @@ ---- misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 1970-01-01 01:00:00.000000000 +0100 -+++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2007-10-16 15:44:13.000000000 +0200 +--- misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2007-10-16 15:44:13.000000000 +0200 @@ -0,1 +1,3304 @@ -+LIBCRYPTO_OOO_0_9_8zg{ ++LIBCRYPTO_OOO_0_9_8zh{ + global: +ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_it; @@ -3304,10 +3304,10 @@ + local: + *; +}; ---- misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 1970-01-01 01:00:00.000000000 +0100 -+++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 2007-10-16 15:44:13.000000000 +0200 +--- misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 2007-10-16 15:44:13.000000000 +0200 @@ -0,0 +1,442 @@ -+LIBSSL_OOO_0_9_8zg{ ++LIBSSL_OOO_0_9_8zh{ + global: +BIO_f_ssl; +BIO_new_buffer_ssl_connect; commit 431d695380f6a33a6bc0190d653c59be08a2360e Author: Pedro Giffuni <p...@apache.org> Date: Tue Dec 29 21:37:03 2015 +0000 Update OpenSSL to version 0.9.8zh Missing changes. diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch index bfc0fb0..cd9648a 100644 --- a/openssl/opensslsol.patch +++ b/openssl/opensslsol.patch @@ -79,11 +79,11 @@ GCCVER=${GCCVER:-0} if [ "$SYSTEM" = "HP-UX" ];then # By default gcc is a ILP32 compiler (with long long == 64). ---- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010 -+++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:10:09 2010 +--- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map Fri Mar 26 16:13:54 2010 ++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map Fri Mar 26 16:10:09 2010 @@ -1,1 +1,3296 @@ -dummy -+LIBCRYPTO_OOO_0_9_8zg { ++LIBCRYPTO_OOO_0_9_8zh { + global: +ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_it; @@ -1402,7 +1402,7 @@ +KRB5_TKTBODY_free; +KRB5_TKTBODY_it; +KRB5_TKTBODY_new; -+LIBCRYPTO_OOO_0_9_8zg; ++LIBCRYPTO_OOO_0_9_8zh; +LONG_it; +MD2; +MD2_Final; @@ -3379,11 +3379,11 @@ + *; +}; + ---- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010 -+++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map Fri Mar 26 16:11:27 2010 +--- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map Fri Mar 26 16:13:54 2010 ++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map Fri Mar 26 16:11:27 2010 @@ -1,1 +1,446 @@ -dummy -+LIBSSL_OOO_0_9_8zg { ++LIBSSL_OOO_0_9_8zh { + global: +BIO_f_ssl; +BIO_new_buffer_ssl_connect; @@ -3396,7 +3396,7 @@ +DTLSv1_method; +DTLSv1_server_method; +ERR_load_SSL_strings; -+LIBSSL_OOO_0_9_8zg; ++LIBSSL_OOO_0_9_8zh; +SSL_CIPHER_description; +SSL_CIPHER_get_bits; +SSL_CIPHER_get_name; commit d93d490d1c04be116548aed140df9eda9987d592 Author: Pedro Giffuni <p...@apache.org> Date: Tue Dec 29 19:07:20 2015 +0000 Update OpenSSL to version 0.9.8zh Changes ar really small but this may be the last version in the 0.9.8 series. Newer versions are bigger and consequently have a bad security record. We should probably consider alternatives for future updates. diff --git a/external_deps.lst b/external_deps.lst index dbc8dc6..5131500 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -156,9 +156,9 @@ if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE) - MD5 = 0a912b6623ac95a8627ea2bd0e0abf1b - name = openssl-0.9.8zg.tar.gz - URL1 = http://www.openssl.org/source/openssl-0.9.8zg.tar.gz + MD5 = c813c065dd53d7bd0a560a870ddd0af5 + name = openssl-0.9.8zh.tar.gz + URL1 = http://www.openssl.org/source/openssl-0.9.8zh.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 6189307..0b0278c 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -42,10 +42,10 @@ TARGET=openssl @echo "openssl disabled...." .ENDIF -OPENSSL_NAME=openssl-0.9.8zg +OPENSSL_NAME=openssl-0.9.8zh TARFILE_NAME=$(OPENSSL_NAME) -TARFILE_MD5=0a912b6623ac95a8627ea2bd0e0abf1b +TARFILE_MD5=c813c065dd53d7bd0a560a870ddd0af5 CONFIGURE_DIR=. CONFIGURE_ACTION=config @@ -159,7 +159,7 @@ OUT2BIN += out/libeay32.dll .ENDIF .ENDIF -PATCH_FILES += openssl-0.9.8zg-clang.patch +PATCH_FILES += openssl-0.9.8zh-clang.patch #set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin && diff --git a/openssl/openssl-0.9.8zg-clang.patch b/openssl/openssl-0.9.8zh-clang.patch similarity index 80% rename from openssl/openssl-0.9.8zg-clang.patch rename to openssl/openssl-0.9.8zh-clang.patch index e711a68..269779a 100644 --- a/openssl/openssl-0.9.8zg-clang.patch +++ b/openssl/openssl-0.9.8zh-clang.patch @@ -1,5 +1,5 @@ ---- misc/openssl-0.9.8zg/crypto/md32_common.h 2015-09-20 11:10:48.263008317 -0500 -+++ misc/build/openssl-0.9.8zg/crypto/md32_common.h 2015-09-20 11:11:50.047002757 -0500 +--- misc/openssl-0.9.8zh/crypto/md32_common.h 2015-09-20 11:10:48.263008317 -0500 ++++ misc/build/openssl-0.9.8zh/crypto/md32_common.h 2015-09-20 11:11:50.047002757 -0500 @@ -165,7 +165,7 @@ asm ( \ "roll %1,%0" \ diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 1061ca5..3b67fb4 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ ---- misc/openssl-0.9.8zg/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100 -+++ misc/build/openssl-0.9.8zg/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8zh/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -9,8 +9,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * ---- misc/openssl-0.9.8zg/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100 -+++ misc/build/openssl-0.9.8zg/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8zh/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 @@ -3,7 +3,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -20,8 +20,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * ---- misc/openssl-0.9.8zg/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200 -+++ misc/build/openssl-0.9.8zg/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 +--- misc/openssl-0.9.8zh/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200 ++++ misc/build/openssl-0.9.8zh/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 @@ -1,11 +1,11 @@ -perl util\mkfiles.pl >MINFO @@ -41,8 +41,8 @@ -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def +%1 util\mkdef.pl 32 libeay > ms\libeay32.def +%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def ---- misc/openssl-0.9.8zg/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200 -+++ misc/build/openssl-0.9.8zg/util/mk1mf.pl 2010-03-26 12:04:20.977172300 +0100 +--- misc/openssl-0.9.8zh/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200 ++++ misc/build/openssl-0.9.8zh/util/mk1mf.pl 2010-03-26 12:04:20.977172300 +0100 @@ -128,7 +128,7 @@ $inc_def="outinc"; $tmp_def="tmp"; @@ -73,8 +73,8 @@ #define PLATFORM "$platform" EOF printf OUT " #define DATE \"%s\"\n", scalar gmtime(); ---- misc/openssl-0.9.8zg/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000 +0100 -+++ misc/build/openssl-0.9.8zg/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100 +--- misc/openssl-0.9.8zh/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100 @@ -32,7 +32,7 @@ $l_flags =~ s/-L(\S+)/\/libpath:$1/g; diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index 2b25c98..3cacbe2 100644 --- a/openssl/openssllnx.patch +++ b/openssl/openssllnx.patch @@ -1,5 +1,5 @@ ---- misc/build/openssl-0.9.8zg/Configure-old 2010-04-17 13:51:42.000000000 +0200 -+++ misc/build/openssl-0.9.8zg/Configure 2010-04-17 13:52:03.000000000 +0200 +--- misc/build/openssl-0.9.8zh/Configure-old 2010-04-17 13:51:42.000000000 +0200 ++++ misc/build/openssl-0.9.8zh/Configure 2010-04-17 13:52:03.000000000 +0200 @@ -392,6 +392,9 @@ "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -10,8 +10,8 @@ "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", ---- misc/build/openssl-0.9.8zg/Makefile.org 2010-01-27 17:06:36.000000000 +0100 -+++ misc/build/openssl-0.9.8zg/Makefile.org 2010-09-20 09:24:00.000000000 +0100 +--- misc/build/openssl-0.9.8zh/Makefile.org 2010-01-27 17:06:36.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/Makefile.org 2010-09-20 09:24:00.000000000 +0100 @@ -199,7 +199,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ @@ -21,8 +21,8 @@ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \ INSTALL_PREFIX='${INSTALL_PREFIX}' \ ---- misc/openssl-0.9.8zg/config 2009-02-16 09:43:41.000000000 +0100 -+++ misc/build/openssl-0.9.8zg/config 2009-03-30 08:59:09.588448000 +0200 +--- misc/openssl-0.9.8zh/config 2009-02-16 09:43:41.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/config 2009-03-30 08:59:09.588448000 +0200 @@ -399,27 +399,21 @@ # this is where the translation occurs into SSLeay terms # --------------------------------------------------------------------------- @@ -66,8 +66,8 @@ fi GCCVER=${GCCVER:-0} if [ "$SYSTEM" = "HP-UX" ];then ---- misc/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2010-03-26 15:26:55.958495757 +0100 -+++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2010-03-26 15:31:38.019501422 +0100 +--- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2010-03-26 15:26:55.958495757 +0100 ++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2010-03-26 15:31:38.019501422 +0100 @@ -1 +1,3295 @@ -dummy +libcrypto_OOo_0_9_8zg { @@ -3365,8 +3365,8 @@ + local: + *; +}; ---- misc/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2010-03-26 15:26:55.966057991 +0100 -+++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2010-03-26 15:31:58.552966503 +0100 +--- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 2010-03-26 15:26:55.966057991 +0100 ++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 2010-03-26 15:31:58.552966503 +0100 @@ -1 +1,445 @@ -dummy +LIBSSL_OOO_0_9_8zg { diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch index 828f38c..5e23d36 100644 --- a/openssl/opensslmacosx.patch +++ b/openssl/opensslmacosx.patch @@ -1,5 +1,5 @@ ---- misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 1970-01-01 01:00:00.000000000 +0100 -+++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2007-10-16 15:44:13.000000000 +0200 +--- misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2007-10-16 15:44:13.000000000 +0200 @@ -0,1 +1,3304 @@ +LIBCRYPTO_OOO_0_9_8zg{ + global: @@ -3304,8 +3304,8 @@ + local: + *; +}; ---- misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 1970-01-01 01:00:00.000000000 +0100 -+++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2007-10-16 15:44:13.000000000 +0200 +--- misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 2007-10-16 15:44:13.000000000 +0200 @@ -0,0 +1,442 @@ +LIBSSL_OOO_0_9_8zg{ + global: diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch index ea89185..bb41efc 100644 --- a/openssl/opensslmingw.patch +++ b/openssl/opensslmingw.patch @@ -1,5 +1,5 @@ ---- misc/openssl-0.9.8zg/Makefile.shared 2008-09-17 17:56:40.000000000 +0200 -+++ misc/build/openssl-0.9.8zg/Makefile.shared 2009-03-30 11:52:53.684538000 +0200 +--- misc/openssl-0.9.8zh/Makefile.shared 2008-09-17 17:56:40.000000000 +0200 ++++ misc/build/openssl-0.9.8zh/Makefile.shared 2009-03-30 11:52:53.684538000 +0200 @@ -254,13 +254,17 @@ base=-Wl,--enable-auto-image-base; \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \ @@ -21,8 +21,8 @@ [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \ [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \ $(LINK_SO_A) || exit 1; \ ---- misc/openssl-0.9.8zg/e_os2.h 2005-12-19 03:57:07.000000000 +0900 -+++ misc/build/openssl-0.9.8zg/e_os2.h 2009-04-04 23:07:15.324250000 +0900 +--- misc/openssl-0.9.8zh/e_os2.h 2005-12-19 03:57:07.000000000 +0900 ++++ misc/build/openssl-0.9.8zh/e_os2.h 2009-04-04 23:07:15.324250000 +0900 @@ -264,7 +264,7 @@ # define OPENSSL_IMPLEMENT_GLOBAL(type,name) \ extern type _hide_##name; \ @@ -32,8 +32,8 @@ # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void) # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name())) #else ---- misc/openssl-0.9.8zg/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200 -+++ misc/build/openssl-0.9.8zg/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200 +--- misc/openssl-0.9.8zh/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200 ++++ misc/build/openssl-0.9.8zh/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200 @@ -79,15 +79,41 @@ rem copy ms\tlhelp32.h outinc @@ -79,8 +79,8 @@ echo Done compiling OpenSSL :end ---- misc/openssl-0.9.8zg/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200 -+++ misc/build/openssl-0.9.8zg/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200 +--- misc/openssl-0.9.8zh/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200 ++++ misc/build/openssl-0.9.8zh/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200 @@ -6,11 +6,11 @@ $o='/'; $cp='cp'; diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch index 8bd2558..bfc0fb0 100644 --- a/openssl/opensslsol.patch +++ b/openssl/opensslsol.patch @@ -1,5 +1,5 @@ ---- misc/openssl-0.9.8zg/Configure Mon Nov 9 15:14:26 2009 -+++ misc/build/openssl-0.9.8zg/Configure Fri Mar 26 16:01:32 2010 +--- misc/openssl-0.9.8zh/Configure Mon Nov 9 15:14:26 2009 ++++ misc/build/openssl-0.9.8zh/Configure Fri Mar 26 16:01:32 2010 @@ -213,8 +213,8 @@ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -11,8 +11,8 @@ #### SPARC Solaris with GNU C setups "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ---- misc/openssl-0.9.8zg/Makefile.shared Wed Sep 17 17:56:40 2008 -+++ misc/build/openssl-0.9.8zg/Makefile.shared Fri Mar 26 16:04:41 2010 +--- misc/openssl-0.9.8zh/Makefile.shared Wed Sep 17 17:56:40 2008 ++++ misc/build/openssl-0.9.8zh/Makefile.shared Fri Mar 26 16:04:41 2010 @@ -93,7 +93,7 @@ LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ @@ -31,8 +31,8 @@ $${SHAREDCMD} $${SHAREDFLAGS} \ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ ---- misc/openssl-0.9.8zg/config Tue Mar 9 18:08:24 2010 -+++ misc/build/openssl-0.9.8zg/config Fri Mar 26 16:07:55 2010 +--- misc/openssl-0.9.8zh/config Tue Mar 9 18:08:24 2010 ++++ misc/build/openssl-0.9.8zh/config Fri Mar 26 16:07:55 2010 @@ -399,28 +399,25 @@ # this is where the translation occurs into SSLeay terms # --------------------------------------------------------------------------- @@ -79,8 +79,8 @@ GCCVER=${GCCVER:-0} if [ "$SYSTEM" = "HP-UX" ];then # By default gcc is a ILP32 compiler (with long long == 64). ---- misc/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010 -+++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:10:09 2010 +--- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010 ++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:10:09 2010 @@ -1,1 +1,3296 @@ -dummy +LIBCRYPTO_OOO_0_9_8zg { @@ -3379,8 +3379,8 @@ + *; +}; + ---- misc/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010 -+++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map Fri Mar 26 16:11:27 2010 +--- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010 ++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map Fri Mar 26 16:11:27 2010 @@ -1,1 +1,446 @@ -dummy +LIBSSL_OOO_0_9_8zg { diff --git a/openssl/version.mk b/openssl/version.mk index 86c5bbd..044f2040 100644 --- a/openssl/version.mk +++ b/openssl/version.mk @@ -22,8 +22,8 @@ -OPENSSL_VERSION=0.9.8zg +OPENSSL_VERSION=0.9.8zh .IF "$(OS)" == "SOLARIS" -OPENSSL_NAME=openssl-0.9.8zg +OPENSSL_NAME=openssl-0.9.8zh .ENDIF commit 7436d7726b0142a253c63de64e532ae426f8d30b Author: Pedro Giffuni <p...@apache.org> Date: Tue Dec 29 18:13:44 2015 +0000 Optionally bring new crosextra font: Carlito Carlito is a modern, friendly sans-serif font, metric-compatible with Microsoft's Calibri font. Carlito comes in regular, bold, italic, and bold italic. The family covers Latin-Greek-Cyrillic (not a complete set, though) with about 2,000 glyphs. Designed by Lukasz Dziedzic available under Open Font License. ____ In general it's a bad practice to bring new features/fonts under a Category B license: in this case we do it purely for compatibility with other office suites and we apply the regular rules for Category B. diff --git a/external_deps.lst b/external_deps.lst index 9b7c873..dbc8dc6 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -279,6 +279,12 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_COINMP!=YES) # URL1 = $(OOO_EXTRAS)$(MD5)-$(name) URL1 = http://www.coin-or.org/download/source/CoinMP/$(name) +if (WITH_CATB_FONTS==YES) + MD5 = c74b7223abe75949b4af367942d96c7a + name = crosextrafonts-carlito-20130920.tar.gz + URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) + URL2 = $(OOO_EXTRAS)$(MD5)-$(name) + if (WITH_CATB_FONTS == YES) MD5 = 35efabc239af896dfb79be7ebdd6e6b9 name = gentiumbasic-fonts-1.10.zip diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf index 07b39c8..0afb480 100644 --- a/more_fonts/fonts/fc_local.conf +++ b/more_fonts/fonts/fc_local.conf @@ -30,6 +30,12 @@ <family>Cambria</family> </accept> </alias> + <alias binding="same"> + <family>Carlito</family> + <accept> + <family>Colibri</family> + </accept> + </alias> <!-- --> @@ -39,6 +45,12 @@ <family>Caladea</family> </accept> </alias> + <alias binding="same"> + <family>Colibri</family> + <accept> + <family>Carlito</family> + </accept> + </alias> <!-- --> diff --git a/more_fonts/fonts/ttf_carlito/makefile.mk b/more_fonts/fonts/ttf_carlito/makefile.mk new file mode 100644 index 0000000..8012cfb --- /dev/null +++ b/more_fonts/fonts/ttf_carlito/makefile.mk @@ -0,0 +1,64 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +PRJ=..$/.. + +PRJNAME=more_fonts +TARGET=ttf_carlito + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(WITH_CATB_FONTS)" != "YES" + +@all: + @echo "category B licensed Carlito font is disabled." + +.ELSE + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=crosextrafonts-carlito-20130920 +TARFILE_MD5=c74b7223abe75949b4af367942d96c7a + +PATCH_FILES= + + +CONFIGURE_DIR= +CONFIGURE_ACTION= + +BUILD_DIR= +BUILD_ACTION= +BUILD_FLAGS= + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk + +.IF "$(WITH_FONTS)"!="NO" +.INCLUDE : tg_ext.mk +.ENDIF + +.ENDIF diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst index c001a21..067c821 100644 --- a/more_fonts/prj/build.lst +++ b/more_fonts/prj/build.lst @@ -2,4 +2,5 @@ bs more_fonts : solenv NULL bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL bs more_fonts\fonts\ttf_croscore nmake - all cros_fonts NULL bs more_fonts\fonts\ttf_crosextra nmake - all xtra_fonts NULL +bs more_fonts\fonts\ttf_carlito nmake - all carl_fonts NULL bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index ccf3760..1bb7e3d 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -5,5 +5,6 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu ..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\crosextrafonts-20130214\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\crosextrafonts-carlito-20130920\*.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 9dc81bfb..87a819b 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -97,21 +97,17 @@ STD_FONT_FILE( gid_File_Fnt_Caladea_BoldItalic, Caladea-BoldItalic.ttf, Caladea #endif // WITH_CATA_FONTS -// fontconfig updates to allow proper use of local fonts +#ifdef WITH_CATB_FONTS -#ifdef UNX -File gid_File_FcLocal_Conf - Dir = gid_Dir_Fonts_Truetype; - USER_FILE_BODY; -// Styles = (); - Name = "fc_local.conf"; -End -#endif +// Carlito fonts +STD_FONT_FILE( gid_File_Fnt_Carlito_Regular, Carlito-Regular.ttf, Carlito Regular) +STD_FONT_FILE( gid_File_Fnt_Carlito_Bold, Carlito-Bold.ttf, Carlito Bold) +STD_FONT_FILE( gid_File_Fnt_Carlito_Italic, Carlito-Italic.ttf, Carlito Italic) +STD_FONT_FILE( gid_File_Fnt_Carlito_BoldItalic, Carlito-BoldItalic.ttf, Carlito Bold Italic) -// Gentium fonts -#ifdef WITH_CATB_FONTS +// Gentium fonts STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic) STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold) @@ -123,5 +119,15 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book Ba STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book Basic Bold) STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic) -#endif +#endif // WITH_CATB_FONTS + +// fontconfig updates to allow proper use of local fonts +#ifdef UNX +File gid_File_FcLocal_Conf + Dir = gid_Dir_Fonts_Truetype; + USER_FILE_BODY; +// Styles = (); + Name = "fc_local.conf"; +End +#endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits