summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)AuthorFilesLines
2016-03-03libxslt: add patch for CVE-2015-7995Michael Stahl2-0/+30
(cherry picked from commit 45d1abeff9d4041b3e174f0eddd10bfd6ab8a360) 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) (cherry picked from commit 5cf00b458326204819332be4424acca16514a8c6) Change-Id: I733cd21f6d8c7ea1e01f594d1483ad9c2043c188
2016-03-03libxml2: 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) (cherry picked from commit 4bf27ce7bc9116302ddbaf49d6771335b4e9abd0)
2016-03-03nss: upgrade to release 3.19.4Michael Stahl15-38/+761
Change-Id: I303254d17450e5252b5d9e925082c39d0077654e
2015-11-16bump png to 1.5.24 CVE-2015-7981 + CVE-2015-8126Caolán McNamara1-8/+8
Conflicts: download.lst Change-Id: Ice54f6c89eb2a2492d2b55a3f4edb13df4192446
2015-09-28tdf#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> (cherry picked from commit 8a12cb1a98186deaedf21446592e2aedbda52e80)
2015-04-14openssl build breakage on MacOSX 10.6Norbert Thiebaud1-1/+1
3217bae01e58e7fe6f075514cf8d2baf89e76afe changed the apply of openssllnx.patch to make it unconditinal which introduce a -Wa, option that is not supported by the 10.6SDK Change-Id: Ic9f68bad5c7d0694d206bc4d6899ab01009942c0 Reviewed-on: https://gerrit.libreoffice.org/15252 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-14upgrade to openssl-1.0.2aCaolán McNamara8-126/+194
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 external/openssl/opensslosxppc.patch Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c Reviewed-on: https://gerrit.libreoffice.org/15222 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-04-04fix liborcus build with gcc 5David Tardon2-0/+1752
(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/14817 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-06tdf#80370: Fix Mac OS X install names of external/{coinmp,lpsolve}Stephan Bergmann2-0/+12
(cherry picked from commit f694ab5198587dcacd8c40c9095e7bc9435cbff2) Conflicts: external/lpsolve/ExternalProject_lpsolve.mk Change-Id: I240c8c940d7d3e1310c4ee33911e8c7019e67060 Reviewed-on: https://gerrit.libreoffice.org/14288 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2015-01-08icu#11451 bidi, the gift that keeps on givingCaolán McNamara2-0/+12
Change-Id: I3bd37f8468c95a29ab3385dbc3ae825b76d8d3df (cherry picked from commit bfb9eb550c4facb9aa6346a8d19f015cf5182668) (cherry picked from commit 915153b2e14dd75a6c90f5f4b1ac01b7f47bafdb) (cherry picked from commit b8e57ee5b9f0e847992307899533bb3915efb054)
2015-01-08libmspub depends on zlibChristian Lohmaier1-0/+1
Change-Id: I3024693698f85ef1c2bbb7fb6ee968a0d5ba6359 (cherry picked from commit 2116f1cfb31e5fcf829c2f101cd878a32b56c365) Reviewed-on: https://gerrit.libreoffice.org/13537 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit dc8bd693190eca30372e6e031364a192ec81914a)
2015-01-08poppler: let's disable Qt5 tooMichael Stahl1-0/+1
Change-Id: I8571aa0ccc9f691d7fd9290a647117161755d3a7 (cherry picked from commit aaf717a8fad0b097b84cbd803acea1330bd925a5) Reviewed-on: https://gerrit.libreoffice.org/13485 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f9c9517cae3441d2cc9aa5d09fcd8dbb042e48e7)
2014-12-13mirror fixes for fdo#78906 and deb#766788 into icuCaolán McNamara3-0/+128
(cherry picked from commit a66451887425ddd9387e2b25d5125916f4a35f83) (cherry picked from commit bff0fe902686d8c126a73e1d2c914f5d65c6ffaf) Conflicts: external/icu/UnpackedTarball_icu.mk Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9 Reviewed-on: https://gerrit.libreoffice.org/13221 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-23make libmwaw unit tests valgrind-cleanDavid Tardon2-0/+26
Change-Id: I4bb8a1810f484f7b991e1eb3791f69cb9b744363 Reviewed-on: https://gerrit.libreoffice.org/12984 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-23fdo#82430: MSVC build: disable a few more cases of SSE2 in externalsMichael Stahl3-2/+13
(cherry picked from commit c79d2dbe3a75e3376a5997444b6a3a5f947da107) Conflicts: external/icu/ExternalProject_icu.mk Change-Id: I8f0db23d1f9ba6b9fc3c8b64b32822ba8166428f Reviewed-on: https://gerrit.libreoffice.org/12247 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-20Make the patch applyTor Lillqvist1-1/+1
Change-Id: Ib4d7bc4e703a1c67380d6afaa6ab5fc22c43aed9
2014-10-20Use correct CFBundleExecutable in the Info.plist for Python.appTor Lillqvist1-0/+11
Apparently the Python build machinery apparently does not use proper autoconfigury to expand this Info.plist.in file, so can't use @PYTHONFRAMEWORK@ as for the Info.plist for the framework itself, but have to hardcode LibreOfficePython. As such I am not sure that Python's way of including an app bundle inside a framework's Resources subtree is acceptable in the stricter code signing and Gatekeeper rules that soon will be in effect. Will see. Change-Id: I1ef9e7b748d41ec4b32d80e721d5fba5e7a90d18 (cherry picked from commit a925583c009d2829e313cea11ed6cf7b40eca097)
2014-10-20Use correct CFBundleExecutable for the LibreOfficePython frameworkTor Lillqvist1-0/+11
It should be the basename of the framework. The Python configury already provides that as @PYTHONFRAMEWORK@. Change-Id: I116a34c3bcc8f661abe16b2b5cc1b9268ecd2780 (cherry picked from commit bb03775f9a73aeb4f25ad25c733bd88a2b6677d9)
2014-10-14bump nss from 3.15.3 to 3.16.5Caolán McNamara6-171/+194
Reviewed-on: https://gerrit.libreoffice.org/11700 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe) Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: external/nss/ExternalProject_nss.mk external/nss/nspr-build-config.patch external/nss/nss_macosx.patch Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e
2014-10-14Revert "dos2unix on SSE2 patch files"Christian Lohmaier2-14/+14
content need to be dos, otherwise patch fails to apply This reverts commit 089b243c8b48aecfd25c79a70b4209a2399dbafa.
2014-10-14dos2unix on SSE2 patch filesAndras Timar2-14/+14
Change-Id: I3e71333647f3cec3a7c014cd4d245d2b8fdc4fc8 Reviewed-on: https://gerrit.libreoffice.org/11856 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-14fdo#84008: kill c++11 code from collada2gltfZolnai Tamás3-0/+5826
... so older compliers can deal with it. Change-Id: I7ecfa37601cae2979a5285436596175d2ebe1fe4 Reviewed-on: https://gerrit.libreoffice.org/11706 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-14fdo#82430: MSVC build: avoid using SSE2 instructions in some externalsMichael Stahl17-5/+89
Hopefully this should fix up the most important external libraries. (cherry picked from commit cd42e5f3e2eb9540b16e568559e6e95ffd7cc2a7) Conflicts: external/coinmp/UnpackedTarball_coinmp.mk external/icu/ExternalProject_icu.mk external/lcms2/UnpackedTarball_lcms2.mk external/python3/UnpackedTarball_python3.mk Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400 Reviewed-on: https://gerrit.libreoffice.org/11769 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-09-04Upgrade libgltf to 0.0.1Zolnai Tamás4-50/+2
News in this version: - Solve some limitations of walkthrough mode (fdo#81425) - Multisampling (better rendering quality, mainly at the edges) - Better error handling (no crash in case of invalid input file) Reviewed-on: https://gerrit.libreoffice.org/11179 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> Conflicts: download.lst external/libgltf/UnpackedTarball_libgltf.mk external/libgltf/pathces/append_shader_version.patch external/libgltf/pathces/missing_include.patch vcl/source/opengl/OpenGLContext.cxx Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794 Reviewed-on: https://gerrit.libreoffice.org/11194 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-08-29upgrade to hunspell 1.3.3Caolán McNamara8-307/+11
Reviewed-on: https://gerrit.libreoffice.org/11136 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5955a98b2aff796a0c7311f6f61a13eac8754ce7) Conflicts: download.lst Change-Id: Ibf8345885e99ae8eb9dd6d64ccd9b5407d8d610e Reviewed-on: https://gerrit.libreoffice.org/11185 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-28bidi, the gift that keeps on givingCaolán McNamara1-4/+6
Change-Id: Ia33eb3e4c89963d7391df0339a2a5b948efd0d9f (cherry picked from commit 854bf7399a635928e6c155ef2246d636ab11ec13) Reviewed-on: https://gerrit.libreoffice.org/11166 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-08-27Resolves: icu#11100 resolveImplicitLevels woesCaolán McNamara2-0/+25
Change-Id: I0c052cbcfe375bd1279c2235b53c909920e2e779 (cherry picked from commit 5d952d4208aa61b6bb0c20d36745d0554be7cec3) Reviewed-on: https://gerrit.libreoffice.org/11129 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-25fdo#82430: configure: MSVC build: avoid using SSE2 instructionsMichael Stahl2-2/+4
MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD 32-bit CPU, neither on Intel Pentium III. http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx (cherry picked from commit 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd) fdo#82430: MSVC 2010 refuses both -clr and -arch in the same command (cherry picked from commit 36ce22f41a754fa405804434899a08a23081e721) fdo#82430: gcc-wrappers: don't stop if REAL_CXX_FLAGS is empty Hopefully should fix MSVC 2010 build... (cherry picked from commit a18ff3d5c75c2b468c48bd19439dee0689d24d67) Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e Reviewed-on: https://gerrit.libreoffice.org/10925 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-08-18Resolves: icu#11054 crashes in bracketAddOpeningCaolán McNamara2-0/+45
(cherry picked from commit d79d2f0ef7a0e300a3ee4be128c625121d0c4b26) Conflicts: external/icu/UnpackedTarball_icu.mk Change-Id: I5dd63fa41c1568e8bf2d120cc0de5d2c44dd789c Reviewed-on: https://gerrit.libreoffice.org/10907 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-08-18libgltf: check for #version string in the shader before add an own one.Zolnai Tamás1-12/+19
Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf (cherry picked from commit 6be202585f201deaf07c57e0f2cf722cce91165e) Reviewed-on: https://gerrit.libreoffice.org/10957 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-17libgltf: Append shader language version to the shader filesZolnai Tamás2-0/+31
In general glTF shader files does not contain version directives and in some case it make shader compiler using GLSL 1.1 which leads to that the shader compiler fails. So we need to append the choosen version number which is GLSL 1.3 in case of libgltf, but this also means that from that point OpenGL 3.0 is the new reuirements since GLSL 1.3 is available only from that version. (cherry picked from commit c67026f27023008d124c8ab76533169f032b04f6) Conflicts: external/libgltf/UnpackedTarball_libgltf.mk Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280 Reviewed-on: https://gerrit.libreoffice.org/10947 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-06Fix libgltf dbgutil buildJan-Marek Glogowski1-2/+2
The simpler version of the master fix commit 1f23cc159de5e8584b9354a42d431356530d1ce0 This just changes the environment visibility of CPPFLAGS by exporting it, so $(MAKE) and configure actually see it. Change-Id: I6d508cbfbee26cdb3062f0628ee8151be4f11881 Reviewed-on: https://gerrit.libreoffice.org/10788 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-05Upload first official libgltf release: libgltf-0.0.0Zolnai Tamás4-72/+18
News relative to previous draft version: - Memory management improvements (fdo#81180) - Reduced OpenGL requirements (version 3.3 -> version 3.0) - Cleaned up API Reviewed-on: https://gerrit.libreoffice.org/10744 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit 48d1f860716720abdd7febdad4b57b9f31a6a1dc) Conflicts: avmedia/source/opengl/oglplayer.cxx download.lst libgltf: fix dbgutil build (cherry picked from commit dabfe7dd025f95862e302b3c4526d382eeba19ea) libgltf: missing <cstdio> include (cherry picked from commit d085bba9139d882e191b46ee8056d364e7526f88) libgltf: remove obsolete patch (cherry picked from commit 841d50ec234e71e8e89d0e9135e2002f35fc42fa) Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99 Reviewed-on: https://gerrit.libreoffice.org/10747 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2014-08-04fdo#82035 fix loader pathsDavid Tardon4-0/+16
Change-Id: Ibecd7a89491b487bec54e8a86edbb1b133cdb8f0 (cherry picked from commit 6cf40d263e33dd6934005af8319ae6fc8a386592) Reviewed-on: https://gerrit.libreoffice.org/10726 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-24icu: un-break installation of Java extensions on Windows (rel. fdo#63756)Michael Stahl3-4/+34
Linking libxml2 against ICU libraries has a nasty side effect: The URE library javavm.dll links against URE libxml2.dll, which is now linked against OOO icuuc53.dll; when a URE program, like uno.exe, tries to load javavm.dll it fails because the OOO layer "program" dir is not on PATH; this breaks the installation of Java extensions. Fix that by splitting up ICU libraries and putting the required ones into URE layer. (regression from 7515b1a90fac9e31733c0fdcc1156adadf0e6f99) Change-Id: If98dd0357162cb632d9762cd2d20162de5eb1a52 (cherry picked from commit 057613c6864204ac5c09260e93a8f14cc9768b90) Reviewed-on: https://gerrit.libreoffice.org/10500 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-22fix debug build of libxml2 on windowsDavid Tardon2-2/+6
(cherry picked from commit a8a3ad1e5f2c2539aae8067a3506a896b83389de) Test $(DEBUG) for being non-empty instead of "1" (which it is not) (cherry picked from commit 22274468ef27ae8651f8ea8805611bf39758b9d5) fix debug build of libxml2 on windows, version 2 (cherry picked from commit 6831ae4d0e0b69e4f06c2987c3be748c8f35c9d8) Change-Id: I22e7a142bb874653344a7ffcc55e8a062669fa2a Reviewed-on: https://gerrit.libreoffice.org/10442 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-21fdo#63756 build libxml2 with ICU supportDavid Tardon12-18/+42
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab (cherry picked from commit 7515b1a90fac9e31733c0fdcc1156adadf0e6f99) Reviewed-on: https://gerrit.libreoffice.org/10428 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-21fdo#81182: glTF window size does not match with the scene size after resizingZolnai Tamás2-0/+72
When viewport changed it is necessary to resize the whole scene. Calling releasFbo removes size dependent objects and triggers creating the new ones with the new size. Change-Id: Ibd8be1e92be92da31add4a30aa799f0995b1cc88 (cherry picked from commit 3cd7c0f6b6cdb8ebc6c72d2ffe1e0bc18968e27b) Reviewed-on: https://gerrit.libreoffice.org/10352 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-21fdo#80363 _wfullpath in MyThes and HyphenLászló Németh3-9/+18
(cherry-picked from commit d7374d4812316a79916956f03c8bd4a281fdbdec) Conflicts: external/hyphen/hyphen-fdo48017-wfopen.patch Change-Id: I4232040d4c62220389ca356797d18b1c87673e64 Reviewed-on: https://gerrit.libreoffice.org/10422 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-19fdo#80363 add _wfullpath to expand ".." in dictionary pathsLászló Németh1-2/+7
Change-Id: I6c9edd0b4d2c63f7735d090e5d2d72d5fb81b921 Reviewed-on: https://gerrit.libreoffice.org/10400 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 7efd83bb29ef8be8c78c4da5452fe3293ed15ea4) Reviewed-on: https://gerrit.libreoffice.org/10405
2014-07-17fdo#72277: Use NSS CACERT in cmis ucp with internal curlCédric Bosdonnat3-0/+6384
This fix contains two parts: * initialize NSS in the CMIS UCP right before sending an HTTP request in case internal curl is used. This makes internal curl find the NSS CACERT database from the user mozilla profile. * add nsspem to allow curl to use CACERTs from libnssckbi. Without libnsspem curl is unable to read the certificates from the NSS database. The nss-pem code has been extracted from the fedora-hosted repository: https://git.fedorahosted.org/cgit/nss-pem.git System CURL will know how to get the CA bundle from the system openSSL. There is no need to have internal NSS CA database support and thus build nsspem. (cherry picked from commit 165075e0d705cbd146463c94b027e728db864ab2) (cherry picked from commit 6602f904ac1858ef571eab5b2df733be0461e7e3) (cherry picked from commit 85d1bd151cca1572e39019288cb2b7b35fc0bbda) (cherry picked from commit 0058b4370070c96e1edc9dd3c80715187ad30cca) (cherry picked from commit a8fd30771a019f727b07adfd82d610028f640f1e) (cherry picked from commit 89361fa68af9a6854dc3a07711279f27561ea8fb) Conflicts: external/nss/UnpackedTarball_nss.mk Change-Id: Ie8dedf020480cca01bf9761382886566a1150778 Reviewed-on: https://gerrit.libreoffice.org/10364 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-07-14Update libgltf: various fixes, memory usage optimization (second try)Zolnai Tamás17-499/+0
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 <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit 11b328103f9184b98a822577aaac18d1cdbc5868) Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Conflicts: download.lst external/libgltf/UnpackedTarball_libgltf.mk Change-Id: Ie0f65be3312688196fcca634eb396c577f991073
2014-07-10fdo#81095 update our copy of Source Sans ProAndras Timar1-2/+10
Change-Id: Ifea8069b9d499cb7b23575786350446e85771eb6 (cherry picked from commit e842914ae3ec6109e889cfc4d0387192a68d2907) Reviewed-on: https://gerrit.libreoffice.org/10183 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-30libgltf: fix Linux-with-check buildZolnai Tamás3-0/+71
It seems some of the warnings are treated as errors in Linux-with-check builds. Change-Id: I9ed876ba634d944c022838a625164f06f100a7df (cherry picked from commit a2648efa6748b782bf739c55cf93fb69d547ead1) Reviewed-on: https://gerrit.libreoffice.org/9980 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-29Update libgltf: new build system and various fixesZolnai Tamás23-201/+444
Building: - The new tarball has reasonable build system so build libgltf as external package instead of compiling source files directly. - Freetype dependancy is removed Improvements comes with the new libgltf - Can rotate the models too (orbit mode) - Two camera handling mode: walkthrough and orbit (press M to change). - gltf_animation_set_time() works - FPS can be displayed without freetype (press F) Additional notes: - There were some bugs/regressions which are fixed during the integration (see patches). - License files are uddated now. - libgltf building is enabled only on those platforms on which gltf support actually works (windows and linux) Reviewed-on: https://gerrit.libreoffice.org/9895 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit 6403f2b59b4c83e0899012e5ca0ddd705784350c) Conflicts: avmedia/source/opengl/oglplayer.cxx Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b libgltf: variable names need module prefix Change-Id: Id144a483fe5576cdd546ac5da87890dc61f964b3 (cherry picked from commit d83e66da94d9c789190c4729c8f0c8464e99ba88) libgltf: add patch to find the headers in WORKDIR Change-Id: I8570511be7c1d6de94ee82e18bad5b00b36d99bb (cherry picked from commit dfe787ef5de1b38e61989507b26ee4b92f25b9d5) libgltf: try to fix the MSVC2010 build Change-Id: I8dde439d19be45d5039904b6e917b17ca0ee4758 (cherry picked from commit 96ff10449464ae9d869fe21dccf193a6eef670c1) glTF rendering: moving in walktrough mode is to fast Change-Id: I2b7869c6c14b69732db864a03a2d9b6638424cf7 (cherry picked from commit f2b5ece0caca18f21f7c8e42a84d451bb399ec35) libgltf: use --with-pick Change-Id: Ide01491460c9c81ed044be762c7dd07e8a5ca575 (cherry picked from commit bb9078e3dee48afc4c2bd8006a892924f8b38b39) libgltf: replace configure patch to avoid using autoreconf Change-Id: Idcab012af9c27c4fed31c07ce230816d1c61d605 (cherry picked from commit c5bb272883e042e38c58847f6eb2a2f94c6ef919) libgltf: try again with this configure patch Touch only the configure but not the configure.ac Change-Id: Iee93036f2378f29530ffae9be8b4324e8425d2ec (cherry picked from commit 211e07c0e02ebfe9cea4b5d97b614a23f8b2012c) libgltf: remove dependencies of config.h.in It seems something is wrong with the files in the libgltf tarball (maybe wrong timestamps?), because config.h.in is always regenerated by make (autoheader). It causes build problems so just remove the deps for this time. Change-Id: I404c29673987d7c8f75ec8fe4978173593c75a2f (cherry picked from commit 3bebda9cd3269d684a3b430e25f17951deaf3d3d) libgltf: fix typo in license Change-Id: I0e5f3afb19c2457c5ccca922e75e617312801ab9 (cherry picked from commit 1d5e875a6c61ddc9fbf0ed09878b7dfb75f89fe3) libgltf: compiler error fixes: missing include and missing namespace Thanks to Rene Engelhard for the report and the fixes. Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371 (cherry picked from commit 481a17b6a6fb332935c3e41c077cc5f60b751021) libgltf: it seems gb_SPACE is not that we need here Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd (cherry picked from commit c7d6541f5daa59d04accb30c727a83d936f02150) libgltf: fix wrong include path to config_$(gb_Side) Change-Id: I63d1822fd08c997a9432ed09ada6d5299bc658b1 (cherry picked from commit ab028bf00e3e5f8424ea5e746815e8438144e4bf) libgltf: use WHITESPACE Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0 (cherry picked from commit b05b970daaf69b5b491b847375ee07539de9481f) libgltf: make 'Requires' valid in libgltf-0.0.pc file Thanks to Rene Engelhard for help to make it valid. Plus glu is not used, so remove it. Change-Id: I5e3631e9b3d24c2b1d9044192d7c0a55c234f7c0 (cherry picked from commit 4bdbc1c93bb3b7e6b1f2fc9a700977ccfa3daae4) Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371 Reviewed-on: https://gerrit.libreoffice.org/9922 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-17external/librevenge,libmwaw,libodfgen,libwps: fix self-linked symlinks build ↵Douglas Mencken4-4/+4
problem ...LibreOfficeDev.app/Contents/MacOS/librevenge-0.0.0.dylib: Too many levels of symbolic links (librevenge-0.0.0.dylib --> librevenge-0.0.0.dylib: broken symbolic link to librevenge-0.0.0.dylib) The reason for this is that symlink librevenge-0.0.dylib (UnpackedTarball/librevenge/src/lib/.libs/librevenge-0.0.dylib -> librevenge-0.0.0.dylib) is copied via cp --no-dereference, thus becoming linked to self. Change-Id: I4b918c35c594800fb2d7f84ee0ee9f2ff2a5fe14 Reviewed-on: https://gerrit.libreoffice.org/9783 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 9f339a89453808b917177a3ee675a76385758902)
2014-06-13kmz2gltf: Use LO's ZipFileAccess to unzip kmzZolnai Tamás4-8666/+0
Instead of this hacky collada2gltf patch. Change-Id: I9f15c4ee1c9ea1a1a64116691b12b696c1d63ac5 (cherry picked from commit 3d300f1e86624b989863639626c6220e20a5b3fb)
2014-06-13glTF: Avoid segmentation fault when one of the input files can't be loadedZolnai Tamás2-0/+99
libgltf: Parser releases the glTFHandle, but it was not connected to the corresponding handle by RenderScene::initScene. So when rendering stopped during file loading because of missing file, Parser's handle member was an uninitialized pointer so it crashed by calling release method. (cherry picked from commit 6904c836b203acbe87a85446a0c59bfbed359240) Change-Id: I80099195341766f474143014d5949703d47a6fd8
2014-06-11Patching libgltf: fix wrong deallocation methodZolnai Tamás2-0/+13
Change-Id: I05c5650c1e43cf9ac4156e8d74073bf92ac0c4df (cherry picked from commit 3ce0f83cec6d2ee1467523209df633c5a2487f71) (cherry picked from commit 00e7b772b418049b117c57f8a3d85567701b47a6)
2014-06-11Patching libgltf: the passed texture bitmaps are RGBA buffersZolnai Tamás2-0/+13
(cherry picked from commit 9c830b09a033a4716bbc54bfe59f46e22cafe677) Conflicts: external/libgltf/UnpackedTarball_libgltf.mk Change-Id: I53f6a97820da12e89d567e1bc10226fa27cafd84
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 12:15:52 +0000