Commit graph

239 commits

Author SHA1 Message Date
Stephan Bergmann
39a6e45bfd cppunit is PLAINLIBS_NONE
Change-Id: I98765698773f9b349d6aac200ee2e55c25e7a47a
2012-12-07 08:11:16 +01:00
Peter Foley
143835b928 convert cppunit to gbuild
Change-Id: Idcba54973940b9f197f2fd84a906b50468d1b166
2012-12-06 13:53:52 +01:00
Michael Stahl
75a2c50148 RepositoryExternal.mk: try to fix python3 external on Mac
Change-Id: I934d6b89624482e9bca763a1b6c8efac86dff39e
2012-12-04 13:47:56 +01:00
Michael Stahl
1658e4efac RepositoryExternal.mk: clean up awful icudata/icui18n duplication
Change-Id: Ic4794d9a908b60220a4a849ff263eaa08776550c
2012-12-02 20:58:32 +01:00
David Tardon
ff7735d7a1 fix build with internal libxml2
Change-Id: I2dbef5bbe93cd8561ae0fba24f8d30771747098c
2012-12-02 17:02:44 +01:00
David Tardon
c2eca359af move setting up of ext. executables out of gbuild.mk
Change-Id: Icacd44abfa5bf5f75f0ee719b39fba6821976a8a
2012-12-02 10:56:48 +01:00
Peter Foley
921f31fb36 add python3 to tail_build
Change-Id: I01c3d280b4ff05ddbce77343ced6934b26bd3ceb
2012-11-30 11:34:30 -05:00
Michael Stahl
ca3590466c remove comment obsoleted by 49313b0626
Change-Id: Id32034c2a584110be44eebee721147b9cbee0ddb
2012-11-27 16:57:20 +01:00
Michael Stahl
919263362c pyuno: add python_headers external and use it for wrapper
Change-Id: Ie151a1200037b6060eab00d6f0f0889134826e5e
2012-11-27 16:57:19 +01:00
Michael Stahl
9d921baa17 clean up PYTHON related version etc. variables:
- configure defines PYTHON_VERSION, PYTHON_VERSION_MAJOR,
  PYTHON_VERSION_MINOR
- remove pyversion.Makefile

Change-Id: I19ac8df18a520ad56bf63ea038dc0769b8249d0b
2012-11-27 16:57:19 +01:00
Stephan Bergmann
49313b0626 Make python3 work with custom VALGRIND_CFLAGS
Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
2012-11-27 15:35:02 +01:00
Michael Stahl
38a22a9026 Switch from python to python3
Mac specific parts of patch by:
Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f
2012-11-27 12:45:23 +01:00
David Tardon
f1035c1660 fdo#55435 orcus needs Boost.System with recent Boost
Change-Id: I2df230e0ca6293131ceaf9211fb301165981ab86
2012-11-23 06:51:17 +01:00
Fridrich Štrba
ec6013c88a Revert "Xlib import via generic pkg-config"
It breaks our baseline Linux release builds where x11_extensions
headers are actually used.

This reverts commit 3f00bc6717.
2012-11-21 16:28:14 +01:00
Michael Meeks
d04ac66578 dung out berkeleydb gnumake / configure bits ... 2012-11-21 14:52:49 +00:00
Enrico Weigelt, metux ITS
3f00bc6717 Xlib import via generic pkg-config
Generic importing Xlib+friends via pkg-config, instead of scanning
through a list of directories. This is very helpful for non-standard
installation pathes and crosscompiling, as the generic pkg-config
infrastructure will handle it all.

Also dropping the obsolete bundled Xext headers.

Conflicts:
	vcl/prj/build.lst

Change-Id: I6ee381030ff9f1d2d83062a17ab55ad3d847a4c6
2012-11-21 14:30:11 +00:00
Michael Stahl
de14220ae5 cairo: add missing dependencies, and add include dir...
...to find the right cairo-version.h

Change-Id: Ia609f7498aae97a68e908101bdeae274d940d2e8
2012-11-20 22:26:32 +01:00
Matúš Kukan
2cb7ba189d cairo: convert to gbuild
Change-Id: I1f3dd368a0d0b78b73df3baad214a1079bbbd1d3
Reviewed-on: https://gerrit.libreoffice.org/1144
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-11-20 20:36:42 +00:00
Stephan Bergmann
ea64122c01 Further SYSTEM_MOZILLA/SYSTEM_NSS clean-up
...past 8648c974ea "Clean-up 'SYSTEM_MOZILLA' ->
'SYSTEM_NSS.'"  Looks like -DSYSTEM_MOZILLA in RepositoryExternal.mk's
gb_LinkTarget__use_nss3 was only relevant for
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (for which it had been set
explicitly in xmlsecurity/Library_xsec_xmlsec.mk, and renamed to SYSTEM_NSS
already).  And looks like xmlsecurity/Library_xsec_xmlsec.mk's explicit
SYSTEM_NSS code was more or less a duplication of RepositoryExternal.mk's
gb_LinkTarget__use_nss3, so made that DRY.

Change-Id: Ie6eca2c4eb7fb70f6a36c97d8681b4140f9870cb
2012-11-19 16:48:30 +01:00
Michael Stahl
7728967fec RepositoryExternal.mk: add gb_ExternalProject__use_expat
Change-Id: I4cb6417ede15253de1815b3f58dd320ab5aee296
2012-11-17 00:45:12 +01:00
Stephan Bergmann
13ef9dcc20 Rename "Mozilla headers" to "NPAPI headers" (incl. configure option name)
...to avoid confusion what that is actually about.  (Especially, it is
completely unrelated to --enable-mozilla.)

ATTENTION:  This renames the configure option --with-system-mozilla-headers to
--with-system-npapi-headers.

Change-Id: I48f3c79d69c4d4f445a94e7ddbeab06ea667becc
2012-11-15 18:15:43 +01:00
Tor Lillqvist
d8edf07ed9 Bin use of UTF-16 expat variant in the Windows shell extension
Thus we can drop that variant completely.

Change-Id: I11a8e40436921219bd6dd4afad4c7907ccb6b84c
2012-11-15 18:33:09 +02:00
Michael Stahl
70527511fa expat: get rid of expat_xmltok static library:
Just compile those files twice.
Also rename the UTF8 library to plain "expat".
This allows python to simply use that library and build "pyexpat"
succesfully.

Change-Id: I7e37ec5b87b70c2cf8c86e06709f0e8d0a67f09d
2012-11-15 11:35:58 +01:00
Christian Lohmaier
1654a1e71b gb_LinkTarget_get_preparation_target is not defined (2nd try)
gb_ExternalProject_use_unpacked has completely different different
side-effects, so use the manual way/the actually expected part of
the rule

Change-Id: I35edb19c3e768608bbb70314cac7ca908a426c7c
Reviewed-on: https://gerrit.libreoffice.org/1067
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-14 18:02:41 +00:00
Tor Lillqvist
6d5d057a19 Revert "gb_LinkTarget_get_preparation_target is not defined"
Nah, this then caused a repeatable other problem; in liborcus:

/bin/sh: line 1: ./configure: No such file or directory

This reverts commit dff0a481db.
2012-11-14 18:46:45 +02:00
Christian Lohmaier
dff0a481db gb_LinkTarget_get_preparation_target is not defined
and in turn build breaks because boost headers are not ready.
use the suggestion by mst and use gb_LinkTarget_use_unpacked instead.
Also use gb_ExternalProject_use_unpacked for consistency

Change-Id: Ie52ba7cd99ae6622b11f32eca8895ca004b8ae95
Reviewed-on: https://gerrit.libreoffice.org/1066
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-14 16:37:33 +00:00
Christian Lohmaier
3dee92e135 library definitions for lcms2 and curl are in Extarnal*Package*_foo.mk
using external_project breaks a uniprocessor build since the libraries
are only partially copied to solver.

Change-Id: I0a83486e466e1c062a1dad89d9ea3d9e78d8c9b1
Reviewed-on: https://gerrit.libreoffice.org/1048
Reviewed-by: Peter Foley <jpfoley2@gmail.com>
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-14 11:54:20 +00:00
Peter Foley
e1f742a601 fix system boost
Change-Id: Id80557cb47ab471a0f3a643a1c11a59e89c14c54
2012-11-13 17:03:35 -05:00
Fridrich Štrba
9fe9011fcf liblangtag really does not need to be a shared library
Change-Id: I73f9422268f58ded971150f1ef16643885669ea3
2012-11-13 11:59:33 +01:00
Tor Lillqvist
97d8b88221 Revert "fdo#38878 upgrade xpdf to poppler"
Also revert my two minor follow-up popper commits.

Poppler doesn't build on Mac OS X. It uses fontconfig, and we don't
depend on that on the Mac.

There is a patch from 2009
http://lists.freedesktop.org/archives/poppler/2009-July/004932.html
(actual patch at
http://lists.freedesktop.org/archives/poppler/attachments/20090712/f3b154d0/attachment-0001.obj
) that makes poppler not use fontconfig on the Mac, but it was never
upstreamed.

And that patch uses the obsolete ATSUI API, which we want to stop
using in LO code, not introduce new uses of.

This reverts commit 39f9eb0d85.
This reverts commit 0941c21185.
This reverts commit a6e9bb4c7b.
2012-11-13 10:28:15 +02:00
Peter Foley
a6e9bb4c7b fdo#38878 upgrade xpdf to poppler
Change-Id: Ib908a3acba1faabeb411b4d1459968a362ee8029
Reviewed-on: https://gerrit.libreoffice.org/1036
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-13 07:29:34 +00:00
Peter Foley
782151a791 convert liblangtag to gbuild
Change-Id: Ib019e248b16a39ea058cdebeaa1f37a967a00d6c
2012-11-11 19:03:15 -05:00
Peter Foley
093acfe13c cleanup libexttextcat naming
Change-Id: I8aee95e0f93deaaf08046f544713af010a7f1e44
2012-11-10 11:47:50 -05:00
Peter Foley
cdb6eca477 liborcus needs boost
Change-Id: I83c6bd1bfb44e74b9f659a970b5c32d7475addfb
2012-11-10 08:57:06 -05:00
Peter Foley
31219f0f97 convert libexttextcat to gbuild
Change-Id: I633892a6d611e6481e49f9bd2739d3886563a24a
2012-11-09 17:48:15 -05:00
Michael Stahl
3bdb950f5e RepositoryExternal: fix gb_LinkTarget__use_valgrind
... which i've also managed to break, unaware of its existence.
Consolidate 2 different ways to use VALGRIND_CFLAGS.

Change-Id: I245c7a9a2b6bc904a227a15063cf5d8a2f64313c
2012-11-09 20:22:45 +01:00
Peter Foley
8905c0e4b0 fix system lcms2
Change-Id: I1dfb345d3047b59c79454d60747d192a761071ef
2012-11-08 21:02:36 -05:00
Peter Foley
f745212f96 convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
2012-11-08 19:56:11 -05:00
Peter Foley
29d5e29a31 fix system lpsolve
Change-Id: I452b0514da11bbcf16a2f69b214fca90a1c76e2b
2012-11-07 18:18:08 -05:00
Peter Foley
085346f80d convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Reviewed-on: https://gerrit.libreoffice.org/1002
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-07 22:33:48 +00:00
Caolán McNamara
1e98bb470a leave gio blank for sfx2 --disable-gio case
Change-Id: I670e5c04b56a59321efc59e7a92961362f47f706
2012-11-06 20:09:57 +00:00
Rene Engelhard
ac3c7ba458 make gb_LinkTarget__use_gthread/_gobject work again; used in vcl/connectivity
Change-Id: I30b249de52822dbd8c327c2213c5a7868a460fdd
2012-11-06 20:38:47 +01:00
Tor Lillqvist
e10124b20e Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg
Now with librsvg no longer used, and liblangtag no longer using glib,
a bunch of bundled (in some configurations, always on some platforms)
3rd-party libraries are no longer needed.

Initial work by rene, continued by tml.

Change-Id: I76edd7aea5452e3487499f0b9ed9f767cf760194
2012-11-06 18:59:44 +02:00
Fridrich Štrba
64ab61152c Uploading new libvisio 0.0.20 release
Change-Id: Ic090ae81c28f12a106a74aa6d10b43cce9d68fed
2012-11-05 11:47:42 +01:00
Norbert Thiebaud
1b61693a15 Enough with that...
peter's gbuildifications caused and ocean of red, that
1/ was not followed up by any attempt by the author to fix
2/ I wasted a good part of the weekend to de-entangle with
only partial sucess

reverting the whole mess for now...
to be resubmited when a bit less borked...

This reverts commit c4c160a451.
This reverts commit faef2e51d0.
This reverts commit 057ce1fe29.
This reverts commit a7d34af344.
This reverts commit befae0ceb8.
This reverts commit 433b43bcd2.
This reverts commit 93e2c4a9d2.
2012-11-04 16:33:21 -06:00
Norbert Thiebaud
faef2e51d0 fix some lcms2 gbuildification breakages...
Change-Id: Icad3132c1710c62559c35964fe5ce3f466646f13
2012-11-04 15:23:51 -06:00
Peter Foley
433b43bcd2 convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
2012-11-04 09:02:09 -05:00
Peter Foley
93e2c4a9d2 convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
2012-11-03 19:52:07 -04:00
Peter Foley
dd584cb4ea convert hyphen to gbuild
Change-Id: I55b3832128aa096eb44b67a26ec2afeb6c573604
2012-11-03 14:45:45 -04:00
Tor Lillqvist
23a324d282 Try to fix a highly parallel build of libcmis with a non-system curl
The problem us that gb_LinkTarget__use_curl only declared a dependency
on an *unpacked* curl tarball, but the curlbuild.h file is *generated*
during curl configury. So something that depends on a (non-system)
curl needs to depend on curl having been configured at least. Let's
try like this.

Change-Id: I87b2a3292807d9bb873c3656caf58c4d98d8f622
2012-10-30 13:21:10 +02:00