summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)AuthorFilesLines
2016-05-05nss: win vs2013 build fixcp-4.4-13distro/collabora/cp-4.4Andras Timar1-2/+1
Change-Id: Iecdd4adb05b6f6f6217d964e43a3286315302fdc
2016-03-17curl: upgrade to release 7.43.0Michael Stahl2-8/+5
(cherry picked from commit 65327d615b64f487842e4c5d0ee7290f9c823a0f) Reviewed-on: https://gerrit.libreoffice.org/16726 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Change-Id: Ic16111f21625fc510e79bba8122eaa60662f7a59
2016-03-17upgrade openssl to 1.0.2gCaolán McNamara7-76/+91
We can't "break symlinks after extracting tarball" because they populate that dir during the build now. So instead cripple mklink.pl to copy instead of link. (Configure no-symlinks simply skips the symlink step instead of copying, so that appears useless) Reviewed-on: https://gerrit.libreoffice.org/21880 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 01798050c13fdfc51aff95967f6b0177d5d7f5bd) Change-Id: Ib30b2c1b8b3de72511d09c478297a7a5a4bc691e Reviewed-on: https://gerrit.libreoffice.org/23002 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 1acbba539c0736a3c2fa54195c75f60c2752fac3)
2016-03-17fix nss build when targeting windows XP (using 7.1A SDK)Christian Lohmaier2-0/+11
otherwise build fails because of macro redefinitions warnings (that are now fatal because of warnings=errors) (cherry picked from commit 09e201fcf2813152335d50588dae0c38adc88d51) Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7 Reviewed-on: https://gerrit.libreoffice.org/23272 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 74c4ae75c06068f8c208973636825603ca49a00e)
2016-03-14tdf#98416 fix curl's configure check for nss (missing -lnssutil3)Christian Lohmaier2-0/+18
without -lnssutil3, the configure check for nss fails when using internal nss: configure:24028: checking for SSL_VersionRangeSet in -lnss3 […] …/UnpackedTarball/nss/dist/out/lib/libnss3.so: undefined reference to `NSSUTIL_ArgParseModuleSpecEx@NSSUTIL_3.21' causing curl to build without ssl support: SSL support: no (--with-{ssl,gnutls,nss,polarssl,cyassl,axtls,winssl,darwinssl} ) This makes gdrive and other remote file methods fail Change-Id: I098feb10a760c2f80a474d9205d6f1e403477efd (cherry picked from commit 98d48dad9e807a4a40f4c3d1b5280d9e5156cb18) Reviewed-on: https://gerrit.libreoffice.org/23189 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-03-10nss: Fix pointer truncation from 'char *' to 'long'David Ostrovsky1-0/+11
Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005 Reviewed-on: https://gerrit.libreoffice.org/22916 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b) Reviewed-on: https://gerrit.libreoffice.org/23103 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5e4f1ab7c0450000f46d2c21639e69b96c38b1f0)
2016-03-10Bump nss to 3.22.1 and nspr to 4.12David Ostrovsky5-24/+52
It seems like nss has activated -Werror, even though the code is not warning free: [1]. This applies also to the additional patches that would need to be patched to be a warning free patch, endless recursion. To avoid messing around with something like that: [2], we disable -Werror option for now. Also note, that [2] doesn't fix all warnings, but only part of them so that we let with unsolved non-trivially to fix warnings on different supported compilers if we would choose the warning-free-compilation-path. [1] https://groups.google.com/d/topic/mozilla.dev.tech.crypto/TgnF3tIMxJ0/discussion [2] https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=ec2b9a90623b1ec5adb6ebe8d6651b35854786ec Reviewed-on: https://gerrit.libreoffice.org/22650 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> (cherry picked from commit 486c91147c587febdacf3fa95d56633dbd703d5f) Reviewed-on: https://gerrit.libreoffice.org/23102 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8e6ee22f2bffecff9d85058c6c21312585c6f1cc) Change-Id: I762c03acede6c4eac715d3b0589061eeabbcc7c2
2016-03-10upgrade neon to 0.30.1Caolán McNamara2-47/+6
Reviewed-on: https://gerrit.libreoffice.org/22977 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 1827987fd11cd726005977e49d001283033f0419) Change-Id: If84ce83cdbde530f7a6743c93ae210b030a41c30 Reviewed-on: https://gerrit.libreoffice.org/23001 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e6a8fb33a948adf367baca31d54e1eb2f3ff0dc4)
2015-12-10libxslt: add patch for CVE-2015-7995Michael Stahl2-0/+30
(cherry picked from commit 45d1abeff9d4041b3e174f0eddd10bfd6ab8a360) Change-Id: I733cd21f6d8c7ea1e01f594d1483ad9c2043c188 Reviewed-on: https://gerrit.libreoffice.org/20097 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 17c513b7fca9304b635a57d11de77d7eccf7188a)
2015-12-10libxml2: upgrade to version 2.9.3Michael Stahl5-18/+4
- drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same) - drop libxml2-vc15.patch (fixed upstream) Reviewed-on: https://gerrit.libreoffice.org/20084 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 391bcf348d585b5e246ec808833af522edd371f2) Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116 Reviewed-on: https://gerrit.libreoffice.org/20096 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit d960a8b17b74417aa61ce226fced5b0fa185acf5)
2015-11-28bump png to 1.5.24 CVE-2015-7981 + CVE-2015-8126Caolán McNamara1-8/+8
Change-Id: Ice54f6c89eb2a2492d2b55a3f4edb13df4192446 Reviewed-on: https://gerrit.libreoffice.org/19987 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 11e837d9376c4fc13ab103180fa723d84f2f5834)
2015-11-12Fix nss on MSVC 14.0David Ostrovsky2-1/+14
Change-Id: I8c2f18a509ae6686af4ede5b0daa8291d164c9fd Reviewed-on: https://gerrit.libreoffice.org/18211 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-11-12nss: upgrade to release 3.19.2Michael Stahl5-2589/+4
- drop nss-linux-x86-patch.0: this was actually patching OS/2-specific code so is evidently obsolete - drop nspr-build-config.patch: there does not appear to be any justification why this huge patch exists at all, so the only reasonable thing to do is to drop it - nss_macosx.patch: drop several hunks relevant only to unuspported MacOSX/PPC platform Conflicts: download.lst Change-Id: Id55fcb8eaa637c10a42203f1897480df8a6ec0fa
2015-11-12external/nss: -fsanitize=nonnull-attributeStephan Bergmann1-0/+11
Change-Id: Ic3a20f56250d99a347df5deaf785800a2f96e470
2015-10-02accept OS X 10.11 in configure, and fix firebird build against itTor Lillqvist1-0/+9
Accept also OS X 10.11 Change-Id: Ieedf4810f1e726bf11f0d0b1a203e560a0b16550 (cherry picked from commit bcd52844597640504d3a7caf5441f9f6181497c5) Fix Firebird build against OS X SDK 10.11 Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc (cherry picked from commit a799d7c9a66464f33bd8ee42d535e29a976d64ae) Reviewed-on: https://gerrit.libreoffice.org/18718 Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-09-17Resolves: rhbz#1261421 crash on mashing hangul korean keyboardCaolán McNamara2-0/+192
(cherry picked from commit 064fd8342111bc62ba646e439c235bd495587a4a) Change-Id: Ie066c7f83ad15bec198f2091a3b084468c502766 Reviewed-on: https://gerrit.libreoffice.org/18500 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04New version of ConvertTextToNumber extension (1.5)Andras Timar1-1/+1
Change-Id: I6211465920caf1b498a0ba818686014352a4846d
2015-08-03tdf#92693: ReportBuilder: MINUTES() rounded to nearest for fractional minutesJulien Nabet2-0/+18
... instead of the correct truncation. Thanks to Lionel for the idea of the fix and his patience for newbies like me! Change-Id: I9864aeb08de2c054ee47aa6b04a31bdb4e20dc8c Reviewed-on: https://gerrit.libreoffice.org/17050 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Eike Rathke <erack@redhat.com>
2015-06-03curl: disable rtmp supportMichael Stahl1-1/+4
configure will add a dependency on librtmp.so.0 if the development package happens to be installed. (cherry picked from commit f4844a9abebcb0451161625c42a1e2b48796102d) curl: sigh... *actually* disable rtmp support (cherry picked from commit 805f12dd51ea72deda8f5be5839a205640ba968d) curl: disable loads more random stuff we don't need (cherry picked from commit 0b8b96ed515eec0a560812be73d4c9742f26e23b) Change-Id: I0f4bcd73f9e0e7307ca0556a5f6990631eb9f2c5 (cherry picked from commit df2e19ffa8840bc2fef5d56de5d6058f2b3c5ffb) Reviewed-on: https://gerrit.libreoffice.org/16036 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-05-11tdf#82968: python3: fix stdio detection on WNT harderMichael Stahl1-52/+35
Upgrade to the latest patch from http://bugs.python.org/issue17797 which appears to work even if you invoke from cmd.exe Change-Id: I85f1cc5ad7d8c059d972ae2a6fd2be1bb5604c2c (cherry picked from commit be3e1d65f50fe8b4ce5e4a87a82ff231c00aae79) Reviewed-on: https://gerrit.libreoffice.org/15688 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-16upgrade to openssl-1.0.2aCaolán McNamara7-130/+134
and de-ifdef-per-platform the patch makefile so an upgrade attempt on one platform tests the patchs applying on all platforms ubsan.patch.0 was effectively applied upstream while need to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build under windows Reviewed-on: https://gerrit.libreoffice.org/15183 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 04a98015101b8fea3b200e0bf3a2469d8c75fdf7) Conflicts: external/openssl/UnpackedTarball_openssl.mk Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c Reviewed-on: https://gerrit.libreoffice.org/15221 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-04-14icu: various regex fixesEike Rathke4-0/+1314
Backported from http://bugs.icu-project.org/trac/changeset/36724 http://bugs.icu-project.org/trac/changeset/36727 http://bugs.icu-project.org/trac/changeset/36801 Change-Id: Ib9a0d47466287fdc1d33fb191c97bc2c45116c80 Reviewed-on: https://gerrit.libreoffice.org/15237 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-03jpeg-turbo: work around failure in AC_PROG_MAKE_SET on WNTMichael Stahl1-0/+11
autoconf < 2.61a uses "echo" here and for some bizarre reason that converts " inside ' to \ so remove the " to get it to work. echo 'foo="bar"' foo=\bar" Change-Id: I6bee94d4d075ce953f5788b7fdf9d3b66a7db0c7 (cherry picked from commit 9c6ce47eaf1a891edf7c200145de400fd1cf2871) Reviewed-on: https://gerrit.libreoffice.org/14589 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-02-19liborcus: Remove BOOST_ALL_NO_LIB, it's already included upstreamDavid Ostrovsky1-3/+0
Reviewed-on: https://gerrit.libreoffice.org/14559 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 38671c869d8903ba7d0bd516d53ba0ff9d152adf) This fixes the MSVC build breakage from commit 1714d4ce2cc3b1b1d88a4b30ce0abdb7669ecad8 Change-Id: I39e65a9ee3ede5217d9d6d8499297e449af798fe Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-02-11fix liborcus build with gcc 5David Tardon2-0/+1802
(cherry picked from commit 8b68841c1482d98bee98de0a60910b93feb8f8b6) How is that supposed to ever work? (cherry picked from commit a5ec343f6cb522f4d41e097eda48042bf85c4578) ...next attempt at getting this through both GCC 5 and MSVC (cherry picked from commit cdd8ab7e0caa5b6845581afd5fc69bc69b5589df) Change-Id: I38b2ecf86d4334d0179362079a216df4301bf184 Reviewed-on: https://gerrit.libreoffice.org/14416 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-02tdf#80370: Fix Mac OS X install names of external/{coinmp,lpsolve}Stephan Bergmann2-0/+12
Change-Id: I240c8c940d7d3e1310c4ee33911e8c7019e67060 (cherry picked from commit f694ab5198587dcacd8c40c9095e7bc9435cbff2) Reviewed-on: https://gerrit.libreoffice.org/14274 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-27Resolves fdo#72543: ib_util not found when creating or accessing new firebirdJulien Nabet2-0/+20
... embedded database See https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8 and https://bugs.freedesktop.org/show_bug.cgi?id=72543#c13 Change-Id: I299ab193333f43ff9aa87362adf76d3a362279fc Reviewed-on: https://gerrit.libreoffice.org/14146 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> (cherry picked from commit e3c0025461bdf55e62a308a76c3aa0a35109f076) Reviewed-on: https://gerrit.libreoffice.org/14149 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-06fdo#88098 ClarisWorks: import empty starting lines/columnsDavid Tardon3-0/+135
Change-Id: Ibe4d5be4df874336de7ae387d210deff0a927b38 (cherry picked from commit 2a8f6a8a81c568d9ad73838072d287ac4927649f) Reviewed-on: https://gerrit.libreoffice.org/13772 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-06upload libmwaw 0.3.4David Tardon1-1/+1
Change-Id: I0208d53522da4d3d32c4060b6d784d62a64bf0eb (cherry picked from commit 32c3167be34546bd437ad0f1cacc50a61ef753f7) Reviewed-on: https://gerrit.libreoffice.org/13748 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-05workaround error C2589: ´(´ : illegal token on right side of ´::´Caolán McNamara2-0/+23
Change-Id: I3654a4eb4caa3a987f6d797c9bcb577c6fd6b426 (cherry picked from commit 1fc30a25e2c69fe8b365300b0784f3a282183e80)
2015-01-05upload libvisio 0.1.1David Tardon4-1168/+0
Change-Id: I6587bd27d07ae39074d3c304614e3bc831afe8c8 (cherry picked from commit 6d3826588ac66c77555cc1c66bd6c6a8426a659d) Reviewed-on: https://gerrit.libreoffice.org/13721 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-05upload libodfgen 0.1.3David Tardon5-35/+31
(cherry picked from commit 9fbc8c06a3cb0df6d1208b8916e0e9f31ca8d025) error C1083: Cannot open include file: 'config.h': No such file or directory (cherry picked from commit fcf152ea70164f303861c7edcd83ab0766ad600a) define all needed macros for libodfgen build on windows (cherry picked from commit d2d941ceec8c02f2c062558bd573d49d988a0fcc) Library_odfgen: missing quotes (cherry picked from commit e4c2340c4e0c048af4c77d17380cccf7f2985b5d) Change-Id: I4137a362b0f163b82d1212d3833f8037ed4a773f Reviewed-on: https://gerrit.libreoffice.org/13720 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-12-30upload libwps 0.3.1David Tardon1-1/+1
Change-Id: Ifc0218b76f9b330185986bf4c7137f4f9a2f1081 (cherry picked from commit ff2990fded4f1745c44f62cca53e3bff28e371fb) Reviewed-on: https://gerrit.libreoffice.org/13705 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-12-25upload librevenge 0.0.2David Tardon1-1/+1
Change-Id: Ie12b7ec9630d45e23fb11f12d2d4955855ae34cc (cherry picked from commit a84f0aa8c30d744fdee5e36ad91fb8689ea2757c) Reviewed-on: https://gerrit.libreoffice.org/13644 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-12-22upload libabw 0.1.1David Tardon2-15/+0
Change-Id: Idbe25949adab4ac20613a4c14885d4b1a4c40775 (cherry picked from commit bc4bbf802fd2729ec70cd33a143d7c4c856fa317) Reviewed-on: https://gerrit.libreoffice.org/13565 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-12-19icu#11451 bidi, the gift that keeps on givingCaolán McNamara2-0/+12
Change-Id: I3bd37f8468c95a29ab3385dbc3ae825b76d8d3df (cherry picked from commit bfb9eb550c4facb9aa6346a8d19f015cf5182668)
2014-12-19libmspub depends on zlibChristian Lohmaier1-0/+1
Change-Id: I3024693698f85ef1c2bbb7fb6ee968a0d5ba6359 (cherry picked from commit 2116f1cfb31e5fcf829c2f101cd878a32b56c365) Reviewed-on: https://gerrit.libreoffice.org/13536 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-12-16Updated CMIS patches and the makefile for the OneDrive bindingMihai Varga7-490/+19
To fix build, also squashed in: Author: Miklos Vajna <vmiklos@collabora.co.uk> Date: Sun Dec 14 15:18:58 2014 +0100 upload libcmis 0.5.0 Author: Mihai Varga <mihai.mv13@gmail.com> Date: Mon Aug 11 13:23:53 2014 +0300 SharePoint binding settings, part 1 Conflicts: officecfg/registry/data/org/openoffice/Office/Common.xcu Change-Id: I45eb81a0139c42864f93ad89c4a31185f3ac5bd6 (cherry picked from commit a7b86c0e647bef6da677fa71aa921976bd165138)
2014-12-15poppler: let's disable Qt5 tooMichael Stahl1-0/+1
Change-Id: I8571aa0ccc9f691d7fd9290a647117161755d3a7 (cherry picked from commit aaf717a8fad0b097b84cbd803acea1330bd925a5)
2014-12-08Don't treat clew as part of an "external" clcc moduleTor Lillqvist6-137/+0
There is no obvious authoritative upstream for clew anyway, so it causes philosophical problems for distros. For a while, we used to use a zip archive from the "clcc" project on SourceForge that included clew.c and clew.h. (Before that we also just had clew.c and clew.h in our source repo.) So, drop the external/clcc module and have clew.c and clew.h in the source repo again. But this time clew is in a module of its own, not in sc. This re-introduces "No need to have OpenCL optional at configure-time" This reverts commit 764836cb00e8e6dfd2ab48e080a166ec90359e01. Change-Id: I413142f4f9f8399489f9c3e5327132822f07a454 Reviewed-on: https://gerrit.libreoffice.org/13368 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-12-02fdo#86664 VSD import: handle metadataMiklos Vajna2-0/+652
(cherry picked from commit 9b61cf4a70b9c3023d035a1b0f7cc1488dd55e22) (cherry picked from commit 386014bb5ee1fb611bbc00c37c04cdf191a833b7) Change-Id: Icec212a93df10b212a9ae614b5c1ced6bf25ff7f
2014-12-01fdo#86664 VSDX import: handle metadataMiklos Vajna4-0/+538
(cherry picked from commit 411bd6e440266a0db95907ad73a3a5be92bd1827) (cherry picked from commit b3b0ecbf3717b04de3a5149db1c70a8ee93bf2ee) Change-Id: I04a446e6b8a8352be9f091980bca31842bb7e643
2014-11-30mirror fixes for fdo#78906 and deb#766788 into icuCaolán McNamara2-0/+59
Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9 (cherry picked from commit a66451887425ddd9387e2b25d5125916f4a35f83)
2014-11-28Move clew into a library of its ownTor Lillqvist6-0/+137
Change-Id: Ifb7e86b078bd549506a9cc1b9ce9fc22fffc5eec
2014-11-27collada2gltf: Force GLSL versionMatúš Kukan2-0/+14
Change-Id: Ia5e29cff04c3a38d992a78b956a93103ad1042a3 (cherry picked from commit 76b76049e57319a772b863519d8bbc57460eb6f4)
2014-11-26there is no HI country code, I suspect it should be HT for HaitiCaolán McNamara2-0/+12
https://github.com/languagetool-org/languagetool/pull/219 Change-Id: I32e5caac17165a77d0803e782a285a9f32752742 (cherry picked from commit 4e14439b065d3f36823029bb1a314dad5af73821)
2014-11-24upload libodfgen 0.1.2David Tardon3-65/+1
Change-Id: I9a4719e60f910256c529551fdbb387e98aefd6ce (cherry picked from commit 4578ed5b0ae63850704027861b3d475d818ead33)
2014-11-19coinmp: conditional patchRobert Antoni Buj i Gelonch1-2/+3
Change-Id: I33927632173d422d04771f550721dba1767cded5 Reviewed-on: https://gerrit.libreoffice.org/12040 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-18Apache Commons Codec 1.9 at least requires Java 1.6 and non debug versionRobert Antoni Buj i Gelonch1-3/+8
Change-Id: Ie7834a908c8b19cfa46d71ff6fd712e10bbe8fbb Reviewed-on: https://gerrit.libreoffice.org/12115 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-17Add internal libjpeg-turbo library to be used instead of libjpegMatúš Kukan8-0/+164
Unfortunately requires nasm - the netwide assembler - http://www.nasm.us/ Upstream libjpeg-turbo is meant to be built with CMake on Windows but thanks to our gcc-wrappers we are able to avoid that. jpeg is kept mostly for platforms we are cross-compiling to. For now, it's used also for Mac OS X because jpeg-turbo does not build there, which should be fixed later. Change-Id: Id87b7072a8acc2578c3abf7e82cb1499e5094dbf