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

[Kay Schenk]

 external_deps.lst                       |   12 +++++++-----
 more_fonts/fonts/ttf_dejavu/makefile.mk |    6 +++---
 more_fonts/prj/d.lst                    |    4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit ee8796b44908bc35ca1dd0e367b2f15cc9d80e91
Author: Kay Schenk <kschenk at apache.org>
Date:   Wed Jan 7 23:42:09 2015 +0000

    #i125922#
    
    Patch by: Michal Hriň
    Dejavu font update.

diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk
index b23462b..1b8f596 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.33
-TARFILE_MD5=f872f4ac066433d8ff92f5e316b36ff9
-TARFILE_ROOTDIR=dejavu-fonts-ttf-2.33
+TARFILE_NAME=dejavu-fonts-ttf-2.34
+TARFILE_MD5=161462de16e2ca79873bc2b0d2e6c74c
+TARFILE_ROOTDIR=dejavu-fonts-ttf-2.34
 
 PATCH_FILES=
 
commit a7eba49f6f3ae816a03086298a5869c871362660
Author: Kay Schenk <kschenk at apache.org>
Date:   Wed Jan 7 23:39:25 2015 +0000

    #i125922#
    
    Patch by: Michal Hriň
    dejavu font update.

diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 1bb19c9..8145961 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.33\ttf\*.ttf	%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE		%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__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\gentiumbasic-fonts-1.10\*.ttf		%COMMON_DEST%\pck%_EXT%\*.ttf
commit 6f31a5f6f752a9724acd270b0eb806bcb21c2db1
Author: Kay Schenk <kschenk at apache.org>
Date:   Wed Jan 7 22:48:39 2015 +0000

    #i125922#
    
    Patch by: Michal Hriň
    Update dejauvu fonts to 2.34

diff --git a/external_deps.lst b/external_deps.lst
index 1f6b6c4..c32029c 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -25,7 +25,9 @@
 # fallback server is used.
 
 # The primary fallback site.
-OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
+# OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
+
+OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
 
 # Must not fallback to svn
 # SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
@@ -232,10 +234,10 @@ if (SYSTEM_CURL != YES)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATA_FONTS == YES)
-    MD5 = f872f4ac066433d8ff92f5e316b36ff9
-    name = dejavu-fonts-ttf-2.33.zip
-    URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.33/dejavu-fonts-ttf-2.33.zip/download
-    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+    MD5 = 161462de16e2ca79873bc2b0d2e6c74c
+    name = dejavu-fonts-ttf-2.34.tar.bz2
+    URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.34/dejavu-fonts-ttf-2.34.tar.bz2/download
+    # URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
     MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab