1018 Commits

Author SHA1 Message Date
Douglas Mencken
9b6c462b54 Revert "use bundled (non-system) versions of libxml2 and libxslt for OS X <10.6"
This reverts commit e5934962bd55970c54b399351559e90d02b75b6b.

It never worked on 10.5 (but worked for >10.5) actually due to xsltproc
and make's "Circular dependency dropped" issues.

Change-Id: I8770d99a86deb5276bf28dc38da8a5165426e1ef
Reviewed-on: https://gerrit.libreoffice.org/9958
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
2014-06-30 06:53:04 +00:00
rbuj
67c20d42b5 OS X: PYTHON_CFLAGS & PYTHON_LIBS (--enable-python=system)
Use $FRAMEWORKSHOME instead of /Developer/SDKs/MacOSX${with_macosx_sdk}.sdk/System/Library/Frameworks.

As of Xcode 5.0, Python has been moved outside the SDK, so it doesn't provide the Python framework.
Now we have to use common unix parameters unlike older versions of Xcode.
It is described in the technical note TN2328.

Change-Id: Ib2a010e7c3839a8906acb2453c90ef2bd2f258d7
Reviewed-on: https://gerrit.libreoffice.org/9926
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-06-29 17:37:37 +00:00
rbuj
2c2df7185c OS X: JDK_HOME configuration
/usr/libexec/java_home helps to set the current JDK_HOME.
Actually JDK_HOME should NOT be set where java (/usr/bin/java) is located.
AC_PATH_PROG(JAVAINTERPRETER, $with_java) returns /usr/bin/java.
/usr/bin/java -> /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java.

Change-Id: Ie3166731c1525f5b44414fa4dda642edb9408757
Reviewed-on: https://gerrit.libreoffice.org/9960
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-06-29 17:34:10 +00:00
Norbert Thiebaud
3934ec179f revert forcing system-odbc on MAc as Maverick dropped system support
We prolly need to look at iODBC and how to carry the headers
as 'external'
Note the dylib for runtime are still in 10.9

Change-Id: I6cad2b90fcb61b5787c0599e40d48a74b8ff917a
2014-06-28 07:31:56 +02:00
Norbert Thiebaud
0181a13904 odbc properly support platform with sizeof(SQLWCHAR) = 4
Change-Id: I06d5a6c93817d2623fac3962b82c1319caf13276
2014-06-27 17:08:04 +02:00
Stephan Bergmann
ae19cfde67 Assume $FRAMEWORKSHOME/JavaVM/Headers is junk
(What I have on OS X 10.9 $FRAMEWORKSHOME/JavaVM.framework/Headers, but that
should already be covered by the preceding
$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers.)

Also, fix up 359ba1dfdf8de1f2cff185f16ec21b6dc88feac9 "OS X: JDK include path
for JDK 1.8" to not set JAVAINC twice.

Change-Id: I83c0cdc33ada897fcf8b79fb8df737af26687aa6
Reviewed-on: https://gerrit.libreoffice.org/9931
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
2014-06-27 10:54:15 +00:00
David Tardon
516fb340b1 integrate libpagemaker
Change-Id: I077d7c9a41793abdf5f001386f44ac407f94a6d3
2014-06-27 10:39:29 +02:00
Caolán McNamara
069ab2135d my clang doesn't grok -isystemPATH only -isystem PATH
Change-Id: I08a961fa7c9e1983239b9c2606d47824bc535d3b
2014-06-26 16:29:11 +01:00
Zolnai Tamás
6403f2b59b Update libgltf: new build system and various fixes
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)

Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b
Reviewed-on: https://gerrit.libreoffice.org/9895
Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-06-25 13:22:29 +00:00
rbuj
359ba1dfdf OS X: JDK include path for JDK 1.8
Change-Id: Ibc2787475249b228b987fb56fab04b8465a26136
2014-06-18 14:12:04 +01:00
Zolnai Tamás
fe70101856 Introduce HAVE_FEATURE_GLTF to enable/disable gltf related code
When it is a release build then enable it only on Windows and
Linux.

Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
2014-06-12 21:43:35 +02:00
Baptiste Daroussin
db67702eb3 redland >= 1.0.16 is required not 1.16
Change-Id: I92e7e6a1b871c3cefc5aca39d32b6837e624c157
Reviewed-on: https://gerrit.libreoffice.org/9752
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-06-12 13:15:54 +00:00
Tor Lillqvist
21a1ff0634 Thinko
Change-Id: I78a388385d4629bda35af8c08445f21ac547e86b
2014-06-11 10:48:06 +03:00
Tor Lillqvist
568dc479a6 The Cygwin realpath command fails for dirs on a mounted volume so just warn
Change-Id: Idff480084b22a5db6a0f00f90b7febc8488ba2af
2014-06-11 10:46:29 +03:00
Baptiste Daroussin
93152e2633 On FreeBSD x86_64 is named amd64
Change-Id: I14c653f8b3fe0dc9855aa51643cfc40cbccb763e
Reviewed-on: https://gerrit.libreoffice.org/9714
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-06-10 17:21:40 +00:00
Tor Lillqvist
8ff6bfb75d Add --enable-macosx-package-signing
Change-Id: I355158f6cb584d252a21dfbce6e7cea6c70bba99
2014-06-10 11:44:49 +03:00
Michael Stahl
0584e7233e gbuild: UnpackedTarball: use Win32 paths for make targets
Change-Id: I78f56bb28d4b9b6c0696f83f3e06d836fd3427cd
2014-06-09 17:05:55 +02:00
Tor Lillqvist
d7b3b5c09d Add --with-macosx-app-name configure option that propagates to MACOSX_APP_NAME
Change-Id: I5997669d9e990c302871e08a336a4d8365d5aa13
2014-06-08 10:43:17 +03:00
Tor Lillqvist
9b57a0aeb8 PackageMaker does not exist any more
Change-Id: Iefd1980fc87daa709e8e5c833407c2595e71b401
2014-06-06 17:48:00 +03:00
David Tardon
1031dba9e2 getDataStream() returns non-const ptr now
Change-Id: I6d1e811622cda61575464df8e4036b388a4ab706
2014-06-03 09:59:20 +02:00
Tor Lillqvist
67f987f6ff Accept the OS X 10.10 SDK
Change-Id: Ic9c210e51f9f6b776e77988fdb1c719ee3d9d73a
2014-06-02 23:44:23 +03:00
Rene Engelhard
70b0634dc2 libe-book/etonyek 0.1.0, is not enough, we need (upcoming) 0.1.1
Change-Id: I068a3fb7ad2da0133f60900d4db85c2107269653
2014-05-31 18:16:04 +02:00
Tor Lillqvist
d6b9b1e9c3 We don't need cups on the build platform when cross-compiling
Change-Id: I462a33b58d427dd2fce3ab9de4b4c96f4ad0440e
2014-05-30 22:52:30 +03:00
Rene Engelhard
59eabfcfea Debians cups lib is not libcupsys2-dev anymore since long - but libcuups2-dev
Change-Id: I6c7dad163f6c93ba135329901dc86917577d59a2
2014-05-30 21:01:37 +02:00
Michael Stahl
3935ff3b33 configure: don't check JVM bit-ness when cross compiling
Change-Id: Icf3a58257c8c8e90d7e9d38f167a9b9f80d4bf32
2014-05-27 20:52:53 +02:00
Michael Stahl
6de9dfac1d configure: try to detect using JDK with wrong bitness
Another option would be to try -d32 / -d64, not obvious which is better.

Change-Id: I2836d8a07e55971999f91dd417916aca394ccfa6
2014-05-27 11:13:00 +02:00
David Tardon
aa4015151a drop trailing comma
Change-Id: Iaed722dc183158e1a73a6cafd91248aa76527ff3
2014-05-26 21:46:23 +02:00
David Tardon
a075584ec3 libwpd-stream does not exist anymore
Change-Id: Iaec196373d913f47c2b4575fcefcd41fa97fc808
2014-05-26 20:08:43 +02:00
David Tardon
48c9d7ac7c rebase all import libs
Change-Id: I9e1fc613816c943f4fb1033185e34e3acf317f1d
2014-05-26 18:49:04 +02:00
David Tardon
0b7d0a82b2 always provide REDLAND_CFLAGS/LIBS to ext. projects
Change-Id: Iad1004503e91fbaf6251edc50b20d89ddbb15efa
2014-05-25 21:00:08 +02:00
David Tardon
b421ce79e3 bundle librevenge
Change-Id: Ic36c1670866545db2cf2f29867de7e5b0ad2d57d
2014-05-25 12:48:09 +02:00
Tor Lillqvist
8be75a2dc5 Bin "Do not use for the TDF build" warning
Change-Id: I465e23dbe1d84a411c65500875a8821a116ecd2b
2014-05-21 23:32:39 +03:00
Tor Lillqvist
e854b7d188 Make using libc++ non-optional on OS X, always use when possible
Change-Id: I76da768e035176c6469d9473364e9e2c9086ecae
2014-05-21 23:02:20 +03:00
Christian Lohmaier
dea4a3b9d7 bump product version to 4.4.0.0.alpha0+
Change-Id: Ic309dbcc49a423bce10e9ea711e8ba0702552816
2014-05-21 19:16:44 +02:00
Douglas Mencken
7e4708739d care for Java 1.5 support in external packages
apache commons-lang 3.3.1 and commons-codec 1.9 are for use
only with JDK 1.6 and higher

see commits:
  1731f6e692bb0a07a2bca4b1b190163f209d2b9e "bump apache-commons-lang to 3.3.1"
  3dad9b1019bebcc6db63a424afa146e007f768d2 "bump apache-commons-codec to 1.9"

Change-Id: I3e71f6474becafe6c91836bbac5c6a8b7ca3442c
Reviewed-on: https://gerrit.libreoffice.org/9312
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-21 07:57:55 -05:00
Tor Lillqvist
4474d705ae No reason to avoid CoinMP for Android and iOS
Change-Id: I78eb3a706251ba64ad87e7985fc43c90bea2f767
2014-05-20 15:25:45 +03:00
Tor Lillqvist
8517dc95a6 If we don't want lpsolve we don't want lpsolve
Change-Id: I6038faf296831da0855eb7cd3628c5c6978d4cb3
2014-05-20 15:25:44 +03:00
Tor Lillqvist
f6f208dd9a Add more info about XCODE_DEBUG_INFORMATION_FORMAT
Change-Id: I90b1140d9c3f70f01eb673e6d9113593bbe57a09
2014-05-16 16:41:08 +03:00
Stephan Bergmann
da33122c84 Fix --with-export-validation check
Change-Id: I12b99b361a10f48435694719870ed16f2ce4a31a
2014-05-14 15:37:08 +02:00
Douglas Mencken
e5934962bd use bundled (non-system) versions of libxml2 and libxslt for OS X <10.6
fixes fdo#78612 and fdo#77893

Change-Id: Iac36211095cc009a356f335a93a184ea5078214d
Reviewed-on: https://gerrit.libreoffice.org/9353
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2014-05-14 12:26:29 +00:00
Zolnai Tamás
aa5fe7958d Introduce OpenCollada external library
Change-Id: I08a806b9319f7cb55be3b38a3bb9370799f6752b
2014-05-13 16:34:49 +02:00
Stephan Bergmann
d15540c431 Prevent false positive configure check under Clang -fsanitize=address
(at the expense of effectively disabling the check in that case, though)

Change-Id: I57a0f4f815e8e8dac09e8695f3281504a6501569
2014-05-08 14:37:19 +02:00
Stephan Bergmann
eae3f52f94 New --disable-runtime-optimizations
...to better serve the needs of tools like -fsanitize=address

Change-Id: Ic2f2b981b2f5c1bc95ff91bc7a8d21fbb695dc8d
2014-05-08 14:22:00 +02:00
Tor Lillqvist
171d001a89 Build libgltf (and freetype) for iOS, too
They won't be used for now, but just to enforce portability of the
libgltf code a bit.

Change-Id: Ie5d2b9125eb0f4a2e432dcb8b55d5f494a5ed34d
2014-05-07 15:07:41 +03:00
Tor Lillqvist
c6fdd34c16 Build libgltf for Android, too
It won't be used for now, anyway, as libgltf is used only in avmedia and we
don't build any avmedia for Android. But just to make sure the code stays
portable.

Change-Id: I7a4e5ee3d22f28a407d400a65a1704c23dcb1107
2014-05-07 12:09:03 +03:00
Tor Lillqvist
40dbddf185 libgltf builds without problems on OS X for me, so let's try enabling it
Change-Id: I3981629cf59c752388c647c939c998528d8ca610
2014-05-06 20:44:15 +03:00
Tomofumi Yagi
7623bc3158 fix windows build(external/poppler)
Fix build error on windows with --enable-dbgutil autogen.sh option.
We need to link freetype248_D.lib,when we use --enable-dbgutil option.
(Suffix "_D" is needed.)

Change-Id: Ib2927e777d9b9bb615e1df62e428cf17cc8bc26e
Reviewed-on: https://gerrit.libreoffice.org/9248
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-05-05 11:24:17 +00:00
Eike Rathke
2d843bb104 upgrade to ICU 53.1, fdo#77071 related
plus further work in i18npool to make that build

adapt i18npool to ICU 53 upgrade, fdo#77071

Korean charset collator can't be built from ko_charset.txt because of

"The runtime code decomposes Hangul syllables on the fly, with recursive
processing but without making the Jamo pieces visible for matching. It
does not work with certain types of contextual mappings."
"While handling a Hangul syllable, contractions starting with Jamo L or
V would not see the following Jamo of that syllable." (this is where we
bail out already with the first syllable of ko_charset.txt)
Another condition to fail is described as "A contraction ending with
Jamo L or L+V would require generating Hangul syllables in
addTailComposites() (588 for a Jamo L), or decomposing a following
Hangul syllable on the fly, during contraction matching."

Excluded the file from the build for ICU >=53 and hope that ICU in the
mean time handles Korean collation correctly.

Additionally, ICU 53 took ages (if it would had finished at all) to
build the collator from zh_TW_charset.txt because of the \u#### escaped
notation. Converted the file's content to characters using
http://www.rishida.net/tools/conversion/

Change-Id: I64213214b4870e7077f72b95fee1ddc9782c2b21
Reviewed-on: https://gerrit.libreoffice.org/9204
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
2014-04-29 18:28:15 +00:00
David Tardon
2a71e15589 specify linking opts for jawt centrally
Change-Id: Idb8d97d44b16bbe41372d97c46199ec786c38218
2014-04-26 16:50:37 +02:00
Luboš Luňák
508337db0c add better info on the Qt patches needed for KFileDialog
Change-Id: I1902f962ac03b171c5e7a45d9c8e59450b04418f
2014-04-25 14:18:07 +02:00