[Libreoffice-commits] .: ooo.lst.in openssl/makefile.mk openssl/openssl-asm-fix.patch openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/opensslmingw.patch openssl/o
ooo.lst.in|2 +- openssl/makefile.mk | 16 openssl/openssl-asm-fix.patch |4 ++-- openssl/openssl.patch | 24 openssl/opensslios.patch |4 ++-- openssl/openssllnx.patch | 28 ++-- openssl/opensslmacosx.patch | 12 ++-- openssl/opensslmingw.patch| 16 openssl/opensslsol.patch | 28 ++-- openssl/version.mk|4 ++-- 10 files changed, 69 insertions(+), 69 deletions(-) New commits: commit 957cb927a77a1e19d2a1d4804cbbe9816150654b Author: Petr Mladek pmla...@suse.cz Date: Mon Apr 23 11:26:12 2012 +0200 update internal openssl to version 0.9.8v including important bug fixes diff --git a/ooo.lst.in b/ooo.lst.in index 1d6bfde..04dfa6b 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -1,6 +1,6 @@ http://dev-www.libreoffice.org/src 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz -63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz +51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 226e86c..04a8683 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -46,10 +46,10 @@ TARGET=openssl @echo openssl disabled .ENDIF -OPENSSL_NAME=openssl-0.9.8o +OPENSSL_NAME=openssl-0.9.8v TARFILE_NAME=$(OPENSSL_NAME) -TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 +TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce PATCH_FILES=openssl-asm-fix.patch CONFIGURE_DIR=. @@ -86,8 +86,8 @@ UNAME=$(shell uname) .IF $(OS) == LINUX || $(OS) == FREEBSD || $(OS) == ANDROID PATCH_FILES+=openssllnx.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map .IF $(CPU) == I .IF $(UNAME) == GNU/kFreeBSD CONFIGURE_ACTION=Configure debian-kfreebsd-i386 @@ -104,15 +104,15 @@ UNAME=$(shell uname) CONFIGURE_ACTION=Configure linux-generic32 .ENDIF # if you build openssl as shared library you have to patch the Makefile.Shared LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ -#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' +#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map' .ENDIF .IF $(OS) == SOLARIS PATCH_FILES+=opensslsol.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map -#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8e.map' +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map +#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8v.map' # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch index bb722be..76013eb 100644 --- a/openssl/openssl-asm-fix.patch +++ b/openssl/openssl-asm-fix.patch @@ -1,5 +1,5 @@ misc/build/openssl-0.9.8o/crypto/md32_common.h.sav 2010-03-29 13:23:11.0 +0200 -+++ misc/build/openssl-0.9.8o/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 +--- misc/build/openssl-0.9.8v/crypto/md32_common.h.sav 2010-03-29 13:23:11.0 +0200 misc/build/openssl-0.9.8v/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 @@ -165,7 +165,7 @@ asm ( \ roll %1,%0\ diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 88f7088..538b2c1 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 misc/build/openssl-0.9.8v/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.8o/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte
[Libreoffice-commits] .: ooo.lst.in
ooo.lst.in |1 - 1 file changed, 1 deletion(-) New commits: commit 433fb076ee7a81a3b92fb545ec7243bc99a0768e Author: Andras Timar ati...@suse.com Date: Tue Jan 17 16:07:46 2012 +0100 remove older zlib from download list diff --git a/ooo.lst.in b/ooo.lst.in index 1d40fcb..af2f02e 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -78,7 +78,6 @@ c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz 314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2 -debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in
ooo.lst.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2c05867b7dc8d78618668ab5e0e5e1139895b875 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 16 12:37:05 2011 +0100 Oops, forgot to add the cairo tarball to ooo.lst.in diff --git a/ooo.lst.in b/ooo.lst.in index 184edd2..938b54f 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -23,7 +23,7 @@ e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz -4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz +f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in
ooo.lst.in |1 + 1 file changed, 1 insertion(+) New commits: commit 1ed632b4cd37f6a590af947a9d76e698cbc78cab Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Dec 8 14:30:57 2011 +0100 Don't forget to download the libcdr diff --git a/ooo.lst.in b/ooo.lst.in index c7b9b6e..eb0a751 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -91,6 +91,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz +cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in translate_toolkit/makefile.mk translate_toolkit/prj translate_toolkit/translate-toolkit-1.8.1-skipsource.patch
ooo.lst.in |1 translate_toolkit/makefile.mk | 80 -- translate_toolkit/prj/build.lst|3 translate_toolkit/prj/d.lst| 35 translate_toolkit/translate-toolkit-1.8.1-skipsource.patch | 99 - 5 files changed, 218 deletions(-) New commits: commit 3433ac9b0f350d5cfa86d92239cd41e6c75dbeb1 Author: Tomas Chvatal tchva...@suse.cz Date: Thu Nov 3 16:32:53 2011 +0100 Drop translate_toolkit folder and its internal download. Signed-off-by: Tomas Chvatal tchva...@suse.cz diff --git a/ooo.lst.in b/ooo.lst.in index 223ec9b..5a45936 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -94,7 +94,6 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll -b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://ooo.itc.hu/oxygenoffice/download/libreoffice/ @OOOP_GALLERY_PACK@ @OOOP_TEMPLATES_PACK@ diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk deleted file mode 100644 index b311001..000 --- a/translate_toolkit/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#* -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Petr Mladek pmla...@suse.cz -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# Ted t...@bear.com -# Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the GPLv3+), or -# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# -#* - -PRJ=. - -PRJNAME=trt -TARGET=trt - -# --- Settings - - -.INCLUDE : settings.mk - -.IF $(SYSTEM_TRANSLATE_TOOLKIT) == YES -@all: - @echo Using system translate toolkit... -.ENDIF - -# --- Python paths -- - -.IF $(SYSTEM_PYTHON) == YES -PY_CMD=$(PYTHON) -.ELSE # $(SYSTEM_PYTHON) == YES -.IF $(OS)==MACOSX -# the framework only gets delivered as zip, so call it from python's output-dir -PY_CMD=$(SRC_ROOT)/python/$(INPATH)/misc/build/python-inst/OOoPython.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/OOoPython -.ELSE -PY_CMD=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python -# watch for the path delimiter -.IF $(GUI)==WNT -PYTHONPATH:=$(SOLARLIBDIR);$(SOLARLIBDIR)/python;$(SOLARLIBDIR)/python/lib-dynload -.ELSE # $(GUI)==WNT -PYTHONPATH:=$(SOLARLIBDIR):$(SOLARLIBDIR)/python:$(SOLARLIBDIR)/python/lib-dynload -.ENDIF # $(GUI)==WNT -.EXPORT: PYTHONPATH -.ENDIF # $(OS)==MACOSX -.ENDIF # $(SYSTEM_PYTHON) == YES - -# --- Files - -TARFILE_NAME=translate-toolkit-1.8.1 -TARFILE_MD5=b4cae0700aa1c2aef7eb7f345365e6f1 -PATCH_FILES=translate-toolkit-1.8.1-skipsource.patch -BUILD_ACTION=$(PY_CMD) setup.py build -BUILD_DIR= - -# --- Targets -- - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk diff --git a/translate_toolkit/prj/build.lst b/translate_toolkit/prj/build.lst deleted file mode 100644 index f87945c..000 --- a/translate_toolkit/prj/build.lst +++ /dev/null @@ -1,3 +0,0 @@ -trt translate_toolkit : solenv PYTHON:python NULL -trt translate_toolkit usr1- all trt_mkout NULL -trt translate_toolkit nmake - all translate_toolkit NULL diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst deleted file mode 100644 index 31d61b0..000 --- a/translate_toolkit/prj/d.lst +++ /dev/null @@ -1,35 +0,0 @@ -mkdir: %_DEST%\bin\translate -mkdir: %_DEST%\bin\translate\convert -mkdir: %_DEST%\bin\translate\filters -mkdir:
[Libreoffice-commits] .: ooo.lst.in
ooo.lst.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 46f1caf94dece0cfd0b222bc5118f944920f72a6 Author: Rene Engelhard r...@debian.org Date: Tue Oct 4 22:14:45 2011 +0200 update ooo.lst.in for new libexttextcat diff --git a/ooo.lst.in b/ooo.lst.in index 4ba17d2..5eea4b4 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -3,7 +3,7 @@ http://dev-www.libreoffice.org/src 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt -8dc93ffd48cb80b738075ce37df8f915-libexttextcat-3.1.0.tar.bz2 +33f01c57f92eb6f940b59015c35a4eea-libexttextcat-3.1.1.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
