[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7defa4d42fad580952405757b886aa0970baa3da Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Dec 18 15:21:12 2014 -0500 Update mdds to 0.11.2. (cherry picked from commit b7e61384f135f9f513659bcfd2502a9d00acd2f9) Conflicts: download.lst Change-Id: I1c331863df2b1e560ba8a3d5b7dde67cce59b2df Reviewed-on: https://gerrit.libreoffice.org/13538 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/download.lst b/download.lst index c563d5a..a2a072b 100644 --- a/download.lst +++ b/download.lst @@ -95,7 +95,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2 +export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8e056817baa2d72c70f049e3765cfe2bd934aecf Author: Eike Rathke er...@redhat.com Date: Sat Dec 6 01:48:52 2014 +0100 use language-subtag-registry as of 2014-12-03 per https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry (cherry picked from commit 1914146717e75979120ca63b277078edb6ad6f6c) Conflicts: download.lst Change-Id: I6e3ca0ff7b8a4608cce3dbc0249ee9ddbf861403 Reviewed-on: https://gerrit.libreoffice.org/13327 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/download.lst b/download.lst index 4a9dc39..c563d5a 100644 --- a/download.lst +++ b/download.lst @@ -77,8 +77,8 @@ export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7 export JPEG_TARBALL := jpegsrc.v9a.tar.gz -export LANGTAGREG_MD5SUM := 49c94710f7858b1969d74ff72e6aac84 -export LANGTAGREG_TARBALL := language-subtag-registry-2014-04-10.tar.bz2 +export LANGTAGREG_MD5SUM := 0f2677ec23bb43ddc7355d1b4cc8ed45 +export LANGTAGREG_TARBALL := language-subtag-registry-2014-12-03.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33 export LCMS2_TARBALL := lcms2-2.6.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f9050536650835b776b9aa022ae1b47315cd5e14 Author: Caolán McNamara caol...@redhat.com Date: Fri Oct 17 11:32:25 2014 +0100 bump openssl to 1.0.1j Reviewed-on: https://gerrit.libreoffice.org/12004 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 39d4fe7aea6b32a6c17c325b2b1c282c2975c02c) Conflicts: download.lst Change-Id: Id2092489723b3f1f643ee0161cb0d8bcbd04a847 Reviewed-on: https://gerrit.libreoffice.org/12006 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/download.lst b/download.lst index 6f26f2e..4a9dc39 100644 --- a/download.lst +++ b/download.lst @@ -109,7 +109,8 @@ export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz -export OPENSSL_TARBALL := 8d6d684a9430d5cc98a62a5d8fbda8cf-openssl-1.0.1h.tar.gz +export OPENSSL_MD5SUM := f7175c9cd3c39bb1907ac8bba9df8ed3 +export OPENSSL_TARBALL := openssl-1.0.1j.tar.gz export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst external/nss
download.lst|2 external/nss/ExternalProject_nss.mk |2 external/nss/nss-linux-x86.patch.0 | 12 +- external/nss/nss-pem.patch | 17 +++ external/nss/nss.aix.patch | 133 ++--- external/nss/nss.patch | 160 ++-- external/nss/nss_macosx.patch | 41 - 7 files changed, 195 insertions(+), 172 deletions(-) New commits: commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1 Author: Caolán McNamara caol...@redhat.com Date: Mon Sep 29 16:58:50 2014 +0100 bump nss from 3.15.3 to 3.16.5 Reviewed-on: https://gerrit.libreoffice.org/11700 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe) Signed-off-by: Michael Stahl mst...@redhat.com Conflicts: external/nss/ExternalProject_nss.mk external/nss/nspr-build-config.patch external/nss/nss_macosx.patch Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e diff --git a/download.lst b/download.lst index 9c0de03..6f26f2e 100644 --- a/download.lst +++ b/download.lst @@ -103,7 +103,7 @@ export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz -export NSS_TARBALL := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz +export NSS_TARBALL := b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7 export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 8fd1085..d88810f 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\ $(call gb_ExternalProject_get_state_target,nss,configure): $(call gb_ExternalProject_run,configure,\ - $(if $(filter MSC,$(COM)),LIB=$(ILIB)) \ + $(if $(filter MSC,$(COM)),INCLUDE=$(COMPATH)/include LIB=$(ILIB)) \ nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \ diff --git a/external/nss/nss-linux-x86.patch.0 b/external/nss/nss-linux-x86.patch.0 index e23a786..95a489b 100644 --- a/external/nss/nss-linux-x86.patch.0 +++ b/external/nss/nss-linux-x86.patch.0 @@ -1,10 +1,10 @@ nss/lib/freebl/Makefile -+++ nss/lib/freebl/Makefile -@@ -195,6 +195,7 @@ - ifeq ($(CPU_ARCH),x86) - ASFILES = mpi_x86.s +--- nss/lib/freebl/Makefile2014-09-29 16:52:50.356265282 +0100 nss/lib/freebl/Makefile2014-09-29 16:53:01.823340024 +0100 +@@ -110,6 +110,7 @@ + ifeq (OS2,$(OS_TARGET)) + ASFILES = mpi_x86_os2.s DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE +DEFINES += -DMP_USE_UINT_DIGIT DEFINES += -DMP_ASSEMBLY_DIV_2DX1D + DEFINES += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN - # The floating point ECC code doesn't work on Linux x86 (bug 311432). diff --git a/external/nss/nss-pem.patch b/external/nss/nss-pem.patch index c2f34fe..c3f28bc 100644 --- a/external/nss/nss-pem.patch +++ b/external/nss/nss-pem.patch @@ -5230,7 +5230,7 @@ new file mode 100644 index 000..1179f2a --- /dev/null +++ b/b/nss/lib/ckfw/pem/rsawrapr.c -@@ -0,0 +1,808 @@ +@@ -0,0 +1,823 @@ +/* + * PKCS#1 encoding and decoding functions. + * This file is believed to contain no code licensed from other parties. @@ -5435,6 +5435,21 @@ index 000..1179f2a +} + +/* ++ * RSA block types ++ * ++ * The actual values are important -- they are fixed, *not* arbitrary. ++ * The explicit value assignments are not needed (because C would give ++ * us those same values anyway) but are included as a reminder... ++ */ ++typedef enum { ++RSA_BlockPrivate0 = 0, /* unused, really */ ++RSA_BlockPrivate = 1, /* pad for a private-key operation */ ++RSA_BlockPublic = 2,/* pad for a public-key operation */ ++RSA_BlockRaw = 4, /* simply justify the block appropriately */ ++RSA_BlockTotal ++} RSA_BlockType; ++ ++/* + * Format one block of data for public/private key encryption using + * the rules defined in PKCS #1. + */ diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch index c83ae57..da9aacb 100644 --- a/external/nss/nss.aix.patch +++ b/external/nss/nss.aix.patch
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ff2ec0b6859ef0a9db2809a0ea676e6e8631785b Author: Zolnai Tamás tamas.zol...@collabora.com Date: Wed Oct 1 20:48:15 2014 +0200 Upgrade libgltf to 0.0.2 News in this version: - Better positioning of the models (fdo#81181) - Increased robustness (some additional check and coverity scan) Reviewed-on: https://gerrit.libreoffice.org/11749 Reviewed-by: Zolnai Tamás tamas.zol...@collabora.com Tested-by: Zolnai Tamás tamas.zol...@collabora.com (cherry picked from commit 8ff9b1c2ca65f1e5ac41f3ccf15d9ddadda4c240) Conflicts: download.lst Change-Id: I5be6a99eb925881ed84c8791ef39390e29cbb88b Reviewed-on: https://gerrit.libreoffice.org/11757 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/download.lst b/download.lst index 5a7c385..9c0de03 100644 --- a/download.lst +++ b/download.lst @@ -87,8 +87,8 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 -export LIBGLTF_MD5SUM := 03821c9c827e647fb5fedb12496e0067 -export LIBGLTF_TARBALL := libgltf-0.0.1.tar.bz2 +export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424 +export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a859ef06fa26b4ec4f774d6a91d18d5375e00d1 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Oct 2 21:14:40 2014 -0400 Update mdds to 0.11.1. (cherry picked from commit 8030c21def37f965a35b534038659fd0b513887c) Conflicts: download.lst Change-Id: Ie1c80029a762fcf92dc20ffe74260ea54c61da28 Reviewed-on: https://gerrit.libreoffice.org/11791 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/download.lst b/download.lst index 303033d..5a7c385 100644 --- a/download.lst +++ b/download.lst @@ -95,7 +95,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2 +export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7afda0272e4fe61f24af97a5b16f74a5ef0ff198 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Sep 18 14:22:27 2014 -0400 Update mdds to 0.11.0. (cherry picked from commit 3f3b404b643f907f9feff893324174c00c3c4e4a) Conflicts: download.lst Change-Id: Ia4c413d313aafc1ba46d3d856145c0eb51a7d6ec Reviewed-on: https://gerrit.libreoffice.org/11520 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/download.lst b/download.lst index f413a57..303033d 100644 --- a/download.lst +++ b/download.lst @@ -95,7 +95,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2 +export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst external/hunspell
download.lst |2 external/hunspell/UnpackedTarball_hunspell.mk |4 external/hunspell/hunspell-1.3.2-compound.patch | 11 -- external/hunspell/hunspell-1.3.2-literal.patch|4 external/hunspell/hunspell-android.patch | 22 external/hunspell/hunspell-fdo48017-wfopen.patch | 114 +- external/hunspell/hunspell-twoaffixcompound.patch | 80 --- external/hunspell/hunspell-wundef.patch.1 | 11 -- external/hunspell/hunspell.rhbz918938.patch | 72 - 9 files changed, 12 insertions(+), 308 deletions(-) New commits: commit 671083ca561345a202383f940c0456edba03c318 Author: Caolán McNamara caol...@redhat.com Date: Wed Aug 27 12:02:32 2014 +0100 upgrade to hunspell 1.3.3 Reviewed-on: https://gerrit.libreoffice.org/11136 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 5955a98b2aff796a0c7311f6f61a13eac8754ce7) Conflicts: download.lst Change-Id: Ibf8345885e99ae8eb9dd6d64ccd9b5407d8d610e Reviewed-on: https://gerrit.libreoffice.org/11185 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/download.lst b/download.lst index a34756c..bc2b383 100644 --- a/download.lst +++ b/download.lst @@ -61,7 +61,7 @@ export GRAPHITE_TARBALL := graphite2-1.2.4.tgz export HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz +export HUNSPELL_TARBALL := 4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz export ICU_TARBALL := b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 730a6ce..96c85bb 100644 --- a/external/hunspell/UnpackedTarball_hunspell.mk +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -12,15 +12,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hunspell)) $(eval $(call gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\ - external/hunspell/hunspell-twoaffixcompound.patch \ external/hunspell/hunspell-solaris.patch \ external/hunspell/hunspell-1.3.2-overflow.patch \ external/hunspell/hunspell-android.patch \ external/hunspell/hunspell-1.3.2-nullptr.patch \ external/hunspell/hunspell-1.3.2-literal.patch \ - external/hunspell/hunspell-1.3.2-compound.patch \ - external/hunspell/hunspell.rhbz918938.patch \ - external/hunspell/hunspell-wundef.patch.1 \ external/hunspell/hunspell-fdo48017-wfopen.patch \ )) diff --git a/external/hunspell/hunspell-1.3.2-compound.patch b/external/hunspell/hunspell-1.3.2-compound.patch deleted file mode 100644 index 3629add..000 --- a/external/hunspell/hunspell-1.3.2-compound.patch +++ /dev/null @@ -1,11 +0,0 @@ misc/hunspell-1.3.2/src/hunspell/affixmgr.cxx 2010-02-27 12:59:53.0 +0100 -+++ misc/build/hunspell-1.3.2/src/hunspell/affixmgr.cxx2012-09-18 11:50:04.535803282 +0200 -@@ -2125,7 +2125,7 @@ - } - - if (!rv) { --if (onlycpdrule) break; -+if (onlycpdrule strlen(*result) MAXLNLEN/10) break; - if (compoundflag - !(rv = prefix_check(st, i, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN, compoundflag))) { - if (((rv = suffix_check(st, i, 0, NULL, NULL, 0, NULL, diff --git a/external/hunspell/hunspell-1.3.2-literal.patch b/external/hunspell/hunspell-1.3.2-literal.patch index 4cbf377..b0a8fb9 100644 --- a/external/hunspell/hunspell-1.3.2-literal.patch +++ b/external/hunspell/hunspell-1.3.2-literal.patch @@ -7,5 +7,5 @@ -#define HUNSPELL_PIPE_HEADING @(#) International Ispell Version 3.2.06 (but really Hunspell VERSION)\n +#define HUNSPELL_PIPE_HEADING @(#) International Ispell Version 3.2.06 (but really Hunspell VERSION )\n #define HUNSPELL_HEADING Hunspell - - //for debugging only + #define ODF_EXT odt|ott|odp|otp|odg|otg|ods|ots + #define ENTITY_APOS apos; diff --git a/external/hunspell/hunspell-android.patch b/external/hunspell/hunspell-android.patch index 1bfbb4b..6653d63 100644 --- a/external/hunspell/hunspell-android.patch +++ b/external/hunspell/hunspell-android.patch @@ -18,25 +18,3 @@ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* |
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst external/libgltf Makefile.fetch
Makefile.fetch |3 download.lst |2 external/libgltf/UnpackedTarball_libgltf.mk | 16 -- external/libgltf/patches/comma_at_end_of_enumerator_list.patch | 51 -- external/libgltf/patches/compiler_error_fixes.patch | 41 - external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch | 76 - external/libgltf/patches/extra_semicolon.patch | 18 -- external/libgltf/patches/fix_package_file.patch | 13 - external/libgltf/patches/init_scene_set_handle.patch | 80 -- external/libgltf/patches/libgltf_configure.patch | 61 --- external/libgltf/patches/move_fps_closer_to_the_corner.patch | 12 - external/libgltf/patches/no_animation_in_orbit_mode.patch | 43 - external/libgltf/patches/no_effect_of_set_looping.patch | 14 - external/libgltf/patches/remove_config_h_in_dependencies.patch | 12 - external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch | 12 - external/libgltf/patches/wrong_animation_state_when_set_time_to_null.patch | 12 - external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch | 13 - external/libgltf/patches/wrong_media_time_at_first_run_caused_by_uninitilized_member.patch | 11 - external/libgltf/patches/wrong_media_time_caused_by_missing_fmod.patch | 14 - 19 files changed, 3 insertions(+), 501 deletions(-) New commits: commit b3af0dbd159c251480dc761a7a00204a3ad74ecb Author: Zolnai Tamás tamas.zol...@collabora.com Date: Mon Jul 14 12:07:06 2014 +0200 Update libgltf: various fixes, memory usage optimization (second try) Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Reviewed-on: https://gerrit.libreoffice.org/10274 Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com Tested-by: Zolnai Tamás zolnaitamas2...@gmail.com (cherry picked from commit 11b328103f9184b98a822577aaac18d1cdbc5868) Signed-off-by: Michael Meeks michael.me...@collabora.com Conflicts: download.lst external/libgltf/UnpackedTarball_libgltf.mk Change-Id: Ie0f65be3312688196fcca634eb396c577f991073 diff --git a/Makefile.fetch b/Makefile.fetch index 204c8f8..ffb9d66 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -156,7 +156,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \ - $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \ $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ @@ -235,6 +234,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ ,$(call fetch_Download_item_unchecked,http://dev-www.libreoffice.org/mozilla,$(item))) + $(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ + , $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) @mkdir -p $(dir $@) touch $@ # vim: set noet sw=4 ts=4: diff --git a/download.lst b/download.lst index f4c38b5..896646e 100644 --- a/download.lst +++ b/download.lst @@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 -export LIBGLTF_TARBALL := 9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2 +export LIBGLTF_TARBALL := 3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2 export LIBLANGTAG_TARBALL :=
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst external/more_fonts
download.lst |2 +- external/more_fonts/ExternalPackage_sourcesans.mk | 12 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) New commits: commit e343f9c570a6d038019bea1377b50d5f6b081a86 Author: Andras Timar andras.ti...@collabora.com Date: Thu Jul 10 09:45:39 2014 +0200 fdo#81095 update our copy of Source Sans Pro Change-Id: Ifea8069b9d499cb7b23575786350446e85771eb6 (cherry picked from commit e842914ae3ec6109e889cfc4d0387192a68d2907) Reviewed-on: https://gerrit.libreoffice.org/10183 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/download.lst b/download.lst index cf5633f..f4c38b5 100644 --- a/download.lst +++ b/download.lst @@ -50,7 +50,7 @@ export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLiberti export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz -export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz +export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FREEHAND_MD5SUM := 5f029fef73e42a2c2ae4524a7513f97d export FREEHAND_TARBALL := libfreehand-0.1.0.tar.bz2 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk index 45f21d6..cd7ac29 100644 --- a/external/more_fonts/ExternalPackage_sourcesans.mk +++ b/external/more_fonts/ExternalPackage_sourcesans.mk @@ -10,10 +10,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - SourceSansPro-BoldItalic.ttf \ + SourceSansPro-BlackIt.ttf \ + SourceSansPro-Black.ttf \ + SourceSansPro-BoldIt.ttf \ SourceSansPro-Bold.ttf \ - SourceSansPro-Italic.ttf \ + SourceSansPro-ExtraLightIt.ttf \ + SourceSansPro-ExtraLight.ttf \ + SourceSansPro-It.ttf \ + SourceSansPro-LightIt.ttf \ + SourceSansPro-Light.ttf \ SourceSansPro-Regular.ttf \ + SourceSansPro-SemiboldIt.ttf \ + SourceSansPro-Semibold.ttf \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4ead7efb99e05181fc85fc2ab8603c70576d655e Author: David Tardon dtar...@redhat.com Date: Tue Jul 1 14:27:34 2014 +0200 upload libmspub-0.1.1 Change-Id: I57522b3fe0bff145a66a50bc944717aeaba9025b (cherry picked from commit e6486afa85f35bf8ae915b22acf9899a403f258d) Reviewed-on: https://gerrit.libreoffice.org/10016 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/download.lst b/download.lst index 2f45c35..cf5633f 100644 --- a/download.lst +++ b/download.lst @@ -95,8 +95,8 @@ export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2 -export MSPUB_MD5SUM := 7abe88964fd37fa4893792966ba1ac87 -export MSPUB_TARBALL := libmspub-0.1.0.tar.bz2 +export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11 +export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6 export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 503aaf5374039af42a9c413546816a655f26f353 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 15:25:00 2014 +0100 update to openssl 1.0.1h Change-Id: Ie20c190e36e89a1b3b2ac9a0efaa50af2df77523 (cherry picked from commit 94ec76a1061db6c2068e190e26035cf0c59e0f79) diff --git a/download.lst b/download.lst index aeda567..c4adb8e 100644 --- a/download.lst +++ b/download.lst @@ -109,7 +109,7 @@ export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz -export OPENSSL_TARBALL := de62b43dfcd858e66a74bee1c834e959-openssl-1.0.1g.tar.gz +export OPENSSL_TARBALL := 8d6d684a9430d5cc98a62a5d8fbda8cf-openssl-1.0.1h.tar.gz export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 85e07666a64165610630b71b866c5f96709d7480 Author: Eike Rathke er...@redhat.com Date: Tue May 27 17:48:45 2014 +0200 update language-subtag-registry as of 2014-04-10 Change-Id: I99deaf80f559e28de106b639663b262544cdf60c (cherry picked from commit cb0d44a05b62c8f3a27aa82fce8d558d302538d9) diff --git a/download.lst b/download.lst index 02268c2..3e2893c 100644 --- a/download.lst +++ b/download.lst @@ -78,8 +78,8 @@ export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7 export JPEG_TARBALL := jpegsrc.v9a.tar.gz -export LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 -export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 +export LANGTAGREG_MD5SUM := 49c94710f7858b1969d74ff72e6aac84 +export LANGTAGREG_TARBALL := language-subtag-registry-2014-04-10.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33 export LCMS2_TARBALL := lcms2-2.6.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits