Commit Graph

1602 Commits

Author SHA1 Message Date
David Tardon
6831ae4d0e fix debug build of libxml2 on windows, version 2
Change-Id: I67f269e316906913b1a9b4d91907d95b869ca71f
2014-07-21 16:37:14 +02:00
Tor Lillqvist
22274468ef Test $(DEBUG) for being non-empty instead of "1" (which it is not)
Change-Id: I22e7a142bb874653344a7ffcc55e8a062669fa2a
2014-07-21 17:07:56 +03:00
David Tardon
a8a3ad1e5f fix debug build of libxml2 on windows
Change-Id: I36672c56742468cda8c0481b76ee6e3fec700983
2014-07-21 15:33:37 +02:00
László Németh
d7374d4812 fdo#80363 _wfullpath in MyThes and Hyphen
Change-Id: I4232040d4c62220389ca356797d18b1c87673e64
2014-07-20 13:46:57 +02:00
David Tardon
7515b1a90f fdo#63756 build libxml2 with ICU support
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
2014-07-20 10:15:25 +02:00
László Németh
7efd83bb29 fdo#80363 add _wfullpath to expand ".." in dictionary paths
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>
2014-07-19 08:32:51 +00:00
Caolán McNamara
bcbd2d65f5 fix higher debug levels build
Change-Id: If002fa0140174e43128469fc0af35edd0dfb7839
2014-07-17 11:54:01 +01:00
Cédric Bosdonnat
89361fa68a fdo#72277: don't build and use nsspem when building against system curl
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.

Change-Id: Ie5074c78f7d78b2c2f452d4d4e11c98222529883
2014-07-17 10:39:35 +02:00
Zolnai Tamás
3cd7c0f6b6 fdo#81182: glTF window size does not match with the scene size after resizing
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
2014-07-16 14:49:02 +02:00
Michael Stahl
008b98f928 nss: document why --with-system-nss can't be used in generic builds
Change-Id: I93ce16b4dd059ca0ed79975cfb6373dd629f29a9
2014-07-16 11:15:33 +02:00
Cédric Bosdonnat
a8fd30771a fdo#72277: NSS-PEM windows fixes.
Added missing SEC_ASN1_MKSUB for windows to build
Use PL_strcasecmp instead of strcasecmp.
Fixed remaining declaration not at begining of a block
Added missing nsspem.rc for windows

Change-Id: I144f9cf19c0efe85ad68011cf81e0466aa1ac9f5
2014-07-15 21:32:25 +02:00
Cédric Bosdonnat
0058b43700 fdo#72277: NSS-PEM, use PR_snprintf instead of snprintf
Change-Id: I8aeb9a787992deb784e4e4430f7e0eab57f9a598
2014-07-15 14:31:25 +02:00
Cédric Bosdonnat
85d1bd151c fdo#72277: NSS-PEM yet another build fix for MS compiler
Change-Id: I524a14cd124e69e288de5ae8464eb611989dffde
2014-07-15 12:27:09 +02:00
Cédric Bosdonnat
6602f904ac fdo#72277: nss-pem fixed windows and macos build errors
Change-Id: I30b4036b6cf00dec753115bbc59990daec27ef20
2014-07-15 12:04:05 +02:00
Cédric Bosdonnat
165075e0d7 fdo#72277: Use NSS CACERT in cmis ucp with internal curl
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

Change-Id: Ie8dedf020480cca01bf9761382886566a1150778
2014-07-15 11:15:45 +02:00
rbuj
38d0bde62b ExternalProject_python3.mk: MACOSX
To build a universal binary in Mac OS X 10.6+ with an Intel processor, it is better to set --with-universal-archs=intel, remember that Rosetta is not installed by default in Mac OS X v10.6 and it is neither included nor supported in Mac OS X v10.7 or later.

If we don't use --with-universal-archs then the configure.ac sets the architectures:

...
UNIVERSAL_ARCHS="32-bit"
if test "`uname -s`" = "Darwin"
then
        if test -n "${UNIVERSALSDK}"
        then
                if test -z "`/usr/bin/file "${UNIVERSALSDK}/usr/lib/libSystem.dylib" | grep ppc`"
                then
                        UNIVERSAL_ARCHS="intel"
                fi
        fi
fi
...

In Snow Leopard (Mac OS 10.6):

/usr/bin/file /Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib: Mach-O universal binary with 4 architectures
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture ppc7400):	Mach-O dynamically linked shared library stub ppc
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture ppc64):	Mach-O 64-bit dynamically linked shared library stub ppc64
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture i386):	Mach-O dynamically linked shared library stub i386
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture x86_64):	Mach-O 64-bit dynamically linked shared library stub x86_64

/usr/bin/file /Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib
/Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib: Mach-O universal binary with 3 architectures
/Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib (for architecture x86_64):	Mach-O 64-bit dynamically linked shared library stub x86_64
/Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib (for architecture i386):	Mach-O dynamically linked shared library stub i386
/Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib (for architecture ppc7400):	Mach-O dynamically linked shared library stub ppc

If x86_64 (for OS X 10.8+) or PPC (for OS X 10.5) is only desired then a universal binary is not useful and we don't have to use --enable-universalsdk=${UNIVERSALSDK}.

Change-Id: Ib0578cfdb912fed5a803df3d2e04d2b037cfe13f
Reviewed-on: https://gerrit.libreoffice.org/10249
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-07-14 15:36:33 +00:00
Zolnai Tamás
11b328103f 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

Change-Id: Ie0f65be3312688196fcca634eb396c577f991073
Reviewed-on: https://gerrit.libreoffice.org/10274
Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-07-14 12:35:52 +00:00
rbuj
2729671e35 coinmp: macosx.build.patch
Fix UNAME_PROCESSOR detection in Mac OS X.

Add a filter expression before to apply a platform-specific patch.

Change-Id: I9fc4cf790f16255f4e807e070dbae0e5a1f28781
Reviewed-on: https://gerrit.libreoffice.org/10227
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-14 11:36:13 +00:00
Zolnai Tamás
ae4004548a Revert "Update libgltf: various fixes, memory usage optimization"
This reverts commit fc40081993.

Some files are missing from the new tarball, so revert
this until this is fixed.
2014-07-14 11:04:51 +02:00
Zolnai Tamás
fc40081993 Update libgltf: various fixes, memory usage optimization
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

Change-Id: Iba90d43e13dac7792072877d83d17fb1bcbfaae4
2014-07-14 10:40:57 +02:00
Markus Mohrhard
717f8a87a7 enable debug informations for gltf in debug builds
Change-Id: I81fc7ebc77a67d2d64dd74e1dec0ce7ffbb1b19b
2014-07-12 14:25:05 +02:00
Markus Mohrhard
dfdc9f5ba4 fix memory leak in collada2gltf
Change-Id: I7d4a00d94cf97e988847f11ded0de2dc0cb77828
2014-07-12 04:44:45 +02:00
Douglas Mencken
f4beadc6e2 avoid -arch for bundled OpenSSL, Python3, and nss/nspr on OSX@PowerPC
this fixes gcc: error: unrecognized command line option '-arch'

The '-arch' option is part of Apple's extensions to GCC, and it is uncompatible
with "vanilla" GCC from FSF. Also, we're not building "universal binaries".

Change-Id: I44e7c72bbb1dd4be5ac9cdbc4f210aaccea513b4
Reviewed-on: https://gerrit.libreoffice.org/10117
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-11 14:42:57 +00:00
David Ostrovsky
a21d0d7d5c VS2013: Adjust lcms2 to 12.0 vcproj version
Change-Id: I5ec1ea40e57c7d9de337645421be89e1e4c5a867
Reviewed-on: https://gerrit.libreoffice.org/10157
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-11 11:47:02 +00:00
David Ostrovsky
5a03dad452 VS2013: Adjust python3 to 12.0 vcproj version
Change-Id: Ic4566e8a199d3f31d6d4cb2d3fd41ad7b762c02a
Reviewed-on: https://gerrit.libreoffice.org/10162
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-11 11:45:43 +00:00
David Ostrovsky
705473c9bd VS2013: Adjust libgltf to 12.0 vcproj version
Change-Id: I076c998f5c843b60ac5624381e51271a0924043f
Reviewed-on: https://gerrit.libreoffice.org/10161
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-11 11:36:56 +00:00
David Ostrovsky
f4afc39514 VS2013: Adjust glew to 12.0 vcproj version
Change-Id: Ibfb6f7d23c0f3afbd7ef810093dbbec7f9134aaa
Reviewed-on: https://gerrit.libreoffice.org/10160
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-11 11:35:44 +00:00
David Ostrovsky
729e26426c VS2013: Adjust cppunit to 12.0 vcproj version
Change-Id: I9223fc0620bf31389ab4ea0971835dd7a27feb7e
Reviewed-on: https://gerrit.libreoffice.org/10159
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-11 11:34:49 +00:00
David Ostrovsky
83cfe89697 VS2013: Adjust coinmp to 12.0 vcproj version
Change-Id: I3b069278297c489b0aeb54ebef484c73dee503c0
Reviewed-on: https://gerrit.libreoffice.org/10158
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-11 11:32:21 +00:00
rbuj
07601de43b nss/nspr: update build/autoconf/config.{guess,sub}
Update the file nss/nspr/build/autoconf/config.guess to the version 2014-03-23.
Update the file nss/nspr/build/autoconf/config.sub to the version 2014-05-01.
Create the file nss/nspr/build/autoconf/GPLv3.txt.

Change-Id: Ifc508a3c1bee57f810588d0013971e4bf1984c10
Reviewed-on: https://gerrit.libreoffice.org/10148
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-07-10 15:24:40 +00:00
Andras Timar
e842914ae3 fdo#81095 update our copy of Source Sans Pro
Change-Id: Ifea8069b9d499cb7b23575786350446e85771eb6
2014-07-10 09:46:28 +02:00
Tor Lillqvist
502246c3a8 VS 2013 has round()
Change-Id: I1cc91bccd288543162b1169ce5621a91a5d4f991
2014-07-08 03:01:01 +03:00
Michael Stahl
108ad26747 icu: pass in install program as native path, so Win32 make can invoke it
No idea why this wasn't a problem before.

Change-Id: Icbb94111061079069e2fc2102cfa4fe4bdd59bb9
2014-07-07 23:12:52 +02:00
Tor Lillqvist
87e9c4d98d Add one missing line of context
Change-Id: I13e938d0b2845b691bdd0f2b7208561e7ed177d4
2014-07-08 00:06:08 +03:00
Tor Lillqvist
8159e3bd1a Adapt for VS 2013
Change-Id: Icd7a3d0cbcb994986ea53a5fe91d3996b26cbe0c
2014-07-07 23:15:04 +03:00
Tor Lillqvist
9c95aabbbe VS 2013 has fmin() and fmax()
Change-Id: Iecb8e289d94c479447b80f1d5ebc21eb2210301b
2014-07-07 22:17:03 +03:00
Tor Lillqvist
ed4697e665 Accidentally committed this file with DOS line endings
Change-Id: If1f6f9755c4b3b44ae34a126d7f3534969bfc630
2014-07-07 21:53:53 +03:00
Tor Lillqvist
9b896716f9 VS 2013 has rint()
Change-Id: I6ab759a54ef369e20d93c0767d6a103aabd14faa
2014-07-07 21:34:39 +03:00
Tor Lillqvist
3efe9b2954 Handle VCVER==120 (VS 2013) too
Change-Id: I4dbf663790bd8906ef8b123a01bdf52e0c0c1962
2014-07-07 20:52:56 +03:00
Tor Lillqvist
71aedada9e Use gb_DEBUG_CFLAGS to get -FS for VS 2013
Change-Id: I22485919713f5cafb494992a36c5ada21bdcc18c
2014-07-07 20:52:55 +03:00
Tor Lillqvist
e64a4441bb VS 2013 already has float_t
Change-Id: Ibf6f1d60fc7ec92e24fc366dc193cbd70f13c18c
2014-07-07 20:52:54 +03:00
David Tardon
56ccb184e0 fix build with msvc2013
Change-Id: Ic027cd02f590db06a75fdd2b23d6f67bd42f575a
2014-07-07 19:39:51 +02:00
Caolán McNamara
745105a482 try and help scan-build out wrt cppunit asserts
Change-Id: Id86607802415ad069aa88be98012a5c99f594218
2014-07-06 15:38:01 +01:00
Markus Mohrhard
237426e104 Revert "fix OpenGL error in libgltf"
New tarball already contains the fix for it.

This reverts commit 6f855fed65.
2014-07-06 05:05:45 +02:00
Markus Mohrhard
a6da91bd2d fix memory leak in collada2gltf
Found by Lsan. Saves about 12MB per loaded model.

Change-Id: Idaff5defd5affc3d9becf2a00d1e64f8d1d42e0f
2014-07-06 04:43:18 +02:00
Markus Mohrhard
6f855fed65 fix OpenGL error in libgltf
The code tried to free a program as a shader

Change-Id: I47de706044a5756cf972d9fdb38cac2ca1355414
2014-07-06 03:43:07 +02:00
Markus Mohrhard
7148669279 fix new[]/delete mismatch in collada2gltf
Found by Asan.

Change-Id: Icc73e50b7f230880dda982f1c783c86aaeaa5ca2
2014-07-06 02:15:21 +02:00
Zolnai Tamás
8ea270213b libgltf: Stop a memory leak
Change-Id: I7f3f5cfcdc368907670d58b07300889ea8452340
2014-07-04 16:47:38 +02:00
Norbert Thiebaud
4cf0e29ccf Revert "firebird: enable-debug cause trouble due to a lifecycle management issue"
This reverts commit 814818c345.
Upstream patched the underlying cause
2014-07-03 17:32:34 +02:00
Norbert Thiebaud
c39f77fcbe firebird: backport upstream patch to avoid life cycle issues
with temp files...

Change-Id: I3c76baa38c6854600fbfd1dd48c554ff8716969e
2014-07-03 17:32:34 +02:00