You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ks...@apache.org on 2015/01/07 23:48:39 UTC
svn commit: r1650187 - /openoffice/trunk/main/external_deps.lst
Author: kschenk
Date: Wed Jan 7 22:48:39 2015
New Revision: 1650187
URL: http://svn.apache.org/r1650187
Log:
#i125922#
Patch by: Michal Hriň
Update dejauvu fonts to 2.34
Modified:
openoffice/trunk/main/external_deps.lst
Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1650187&r1=1650186&r2=1650187&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Wed Jan 7 22:48:39 2015
@@ -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
Re: svn commit: r1650187 - /openoffice/trunk/main/external_deps.lst
Posted by Kay Schenk <ka...@gmail.com>.
On Thu, Jan 8, 2015 at 8:58 AM, Andrea Pescetti <pe...@apache.org> wrote:
> On 07/01/2015 kschenk@apache.org wrote:
>
>> URL: http://svn.apache.org/r1650187
>> Modified: openoffice/trunk/main/external_deps.lst ...
>> # 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/
>>
>
> This part needs consensus. This replaces Apache Extras with a SourceForge
> space that I had understood to be temporary, pending evaluation by the
> Apache Board. Maybe Roberto can tell us more about the status of this
> "oooextras.mirror" project, and especially if the URL is to be considered
> final or not. If it isn't, I recommend that we use the final one instead
> (more below).
>
> 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)
>>
>
> This (the missing URL2) violates an assumption that we could do so far,
> i.e., that the OpenOffice build process requires only two sites to be
> available, Apache Extras (for libraries, fonts...) and the Extensions site
> (for bundled dictionaries). So, as soon as we know more about the "new"
> OpenOffice Extras at SourceForge, someone from the project should be given
> write access to it so that we can upload the package there and populate
> URL2 correctly.
>
> The commit should not be reverted: I'm simply suggesting actions that are
> need to make this change stable. So far I wouldn't be happy to have this in
> a release.
>
> Regards,
> Andrea.
>
OK. I didn't realize all this before.
--
-------------------------------------------------------------------------------------------------
MzK
"There's a bit of magic in everything,
and some loss to even things out."
-- Lou Reed
Re: svn commit: r1650187 - /openoffice/trunk/main/external_deps.lst
Posted by Andrea Pescetti <pe...@apache.org>.
On 07/01/2015 kschenk@apache.org wrote:
> URL: http://svn.apache.org/r1650187
> Modified: openoffice/trunk/main/external_deps.lst ...
> # 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/
This part needs consensus. This replaces Apache Extras with a
SourceForge space that I had understood to be temporary, pending
evaluation by the Apache Board. Maybe Roberto can tell us more about the
status of this "oooextras.mirror" project, and especially if the URL is
to be considered final or not. If it isn't, I recommend that we use the
final one instead (more below).
> 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)
This (the missing URL2) violates an assumption that we could do so far,
i.e., that the OpenOffice build process requires only two sites to be
available, Apache Extras (for libraries, fonts...) and the Extensions
site (for bundled dictionaries). So, as soon as we know more about the
"new" OpenOffice Extras at SourceForge, someone from the project should
be given write access to it so that we can upload the package there and
populate URL2 correctly.
The commit should not be reverted: I'm simply suggesting actions that
are need to make this change stable. So far I wouldn't be happy to have
this in a release.
Regards,
Andrea.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org