[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst more_fonts/fonts more_fonts/prj

2016-09-03 Thread Pedro Giffuni 
 external_deps.lst   |6 +++---
 more_fonts/fonts/ttf_dejavu/makefile.mk |6 +++---
 more_fonts/prj/d.lst|4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ebd68735659d7306ad8730047f0327d8266f5809
Author: Pedro Giffuni 
Date:   Sat Sep 3 22:49:25 2016 +

Update dejavu fonts to version 2.37.

Most notable feature is the addition of DejaVuMathTeXGyre.ttf.

Complete Changelog at:
http://dejavu-fonts.org/wiki/Changelog

While here also remove now obsolete version 2.35.

diff --git a/external_deps.lst b/external_deps.lst
index 876c6af..a3306fd 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -234,9 +234,9 @@ if (SYSTEM_CURL != YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATA_FONTS == YES)
-MD5 = 59eaca5acf5c7c8212e92778e3e01f32
-name = dejavu-fonts-ttf-2.35.tar.bz2
-URL1 = 
http://sourceforge.net/projects/dejavu/files/dejavu/2.35/$(name)/download
+MD5 = d0efec10b9f110a32e9b8f796e21782c
+name = dejavu-fonts-ttf-2.37.tar.bz2
+URL1 = 
http://sourceforge.net/projects/dejavu/files/dejavu/2.37/$(name)/download
 # URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATA_FONTS==YES)
diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk 
b/more_fonts/fonts/ttf_dejavu/makefile.mk
index 970b84d..7b3baca 100644
--- a/more_fonts/fonts/ttf_dejavu/makefile.mk
+++ b/more_fonts/fonts/ttf_dejavu/makefile.mk
@@ -39,9 +39,9 @@ TARGET=ttf_dejavu
 
 # --- Files 
 
-TARFILE_NAME=dejavu-fonts-ttf-2.35
-TARFILE_MD5=59eaca5acf5c7c8212e92778e3e01f32
-TARFILE_ROOTDIR=dejavu-fonts-ttf-2.35
+TARFILE_NAME=dejavu-fonts-ttf-2.37
+TARFILE_MD5=d0efec10b9f110a32e9b8f796e21782c
+TARFILE_ROOTDIR=dejavu-fonts-ttf-2.37
 
 PATCH_FILES=
 
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 0a2ba3b..6620f41 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -1,8 +1,8 @@
 mkdir: %COMMON_DEST%\pck%_EXT%
 ..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf
 # TODO: replace explicit versions by wildcard when the build system learns to 
handle them
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\ttf\*.ttf  
%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\LICENSE
%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.37\ttf\*.ttf  
%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.37\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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst more_fonts/fonts more_fonts/prj scp2/source

2015-12-26 Thread Pedro Giffuni 
 external_deps.lst  |6 ++
 more_fonts/fonts/fc_local.conf |   14 +++---
 more_fonts/fonts/ttf_crosextra/makefile.mk |   61 +
 more_fonts/prj/build.lst   |1 
 more_fonts/prj/d.lst   |1 
 scp2/source/ooo/file_font_ooo.scp  |   38 +-
 6 files changed, 97 insertions(+), 24 deletions(-)

New commits:
commit 534fa5c25363d7bf21e971a11c624ebcee0c1c2b
Author: Pedro Giffuni 
Date:   Sat Dec 26 23:49:16 2015 +

Bring new crosextra font: Caladea

Caladea is a modern Latin typeface inspired by the contrast, style and
ornaments of Khmer typefaces and writing styles. Its main objective is to
be used to write Latin texts in a Khmer context, but it is also an elegant
choice for all kinds of texts.

Designed by Carolina Giovagnoli and Andres Torresi
for Huerta Tipografica under an Apache 2.0 License.


This is specially interesting as it is metrically compatible with
MS Cambria.

While here sort out some issues:
- Sadly, we don't really carry an equivalent for "Arial Narrow".
- There is not need for Arimo in the Windows platform.

diff --git a/external_deps.lst b/external_deps.lst
index 2ed03df..9b7c873 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -245,6 +245,12 @@ if (WITH_CATA_FONTS==YES)
 URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
+if (WITH_CATA_FONTS==YES)
+MD5 = 368f114c078f94214a308a74c7e991bc
+name = crosextrafonts-20130214.tar.gz
+URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+
 if ( true )
 MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab
 name = SampleICC-1.3.2.tar.gz
diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf
index f4dfc87..07b39c8 100644
--- a/more_fonts/fonts/fc_local.conf
+++ b/more_fonts/fonts/fc_local.conf
@@ -25,19 +25,21 @@

 

- Arimo
- 
- Arial Narrow
- 
+ Caladea
+ 
+ Cambria
+ 

 
 
+

- Arial Narrow
+ Cambria
  
- Arimo
+ Caladea
  

+
 
 
 
diff --git a/more_fonts/fonts/ttf_crosextra/makefile.mk 
b/more_fonts/fonts/ttf_crosextra/makefile.mk
new file mode 100644
index 000..7de1bb8
--- /dev/null
+++ b/more_fonts/fonts/ttf_crosextra/makefile.mk
@@ -0,0 +1,61 @@
+#**
+#  
+#  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_crosextra
+
+# --- Settings -
+
+.INCLUDE : settings.mk
+
+.IF "$(WITH_CATA_FONTS)" != "YES"
+
+@all:
+@echo "category A licensed CrossCore font is disabled."
+
+.ELSE
+
+# --- Files 
+
+TARFILE_NAME=crosextrafonts-20130214
+TARFILE_MD5=368f114c078f94214a308a74c7e991bc
+
+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 ae64cf7..c001a21 100644
--- a/more_fonts/prj/build.lst
+++ b/more_fonts/prj/build.lst
@@ -1,4 +1,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_gentiumnmake   -   all gent_fonts NULL
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index d33c4b5..ccf3760 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -4,5 +4,6 @@ mkdir: %COMMON_DEST%\pck%_EXT%