wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity
339,899 Commits 5 Branches 0 Tags
5b03bc8a4d92fee2fdfdca4917b321985feb930a
Commit Graph

463 Commits

Author SHA1 Message Date
Rene Engelhard
3e2a03a8f4 fix system-libeot build 
Change-Id: I1473dc65cf768bbe92e50cb0a8414d526c5e7c68
 2013-12-01 14:05:38 +01:00
Michael Stahl
88e65df2e4 curl: upgrade to version 7.33.0 
- from curl-7.26.0.patch:
  * drop ADDCFLAGS stuff, must be some dmake relic
  * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000
    which is unsupported (and ws2_32.lib is linked anyway...)
  * split out curl-freebsd.patch.1
- curl-7.26.0_win.patch:
  * drop the library renaming stuff - can be handled in Package and
    RepositoryExternal.mk without patch
  * rename the rest to curl-msvc.patch.1
- drop curl-aix.patch:
  presumably don't need special check for V7BETA since it's released now
- drop curl-7.26.0_strlcat.patch (obsolete)

Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0
Reviewed-on: https://gerrit.libreoffice.org/6642
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
 2013-11-18 14:27:40 -06:00
Michael Stahl
cca8c8cf79 nss: upgrade to 3.15.3 
- from nss_macosx.patch drop nmedit hunk (removed upstream)
- adapt include and lib paths to changed tarball directory layout

Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe
Reviewed-on: https://gerrit.libreoffice.org/6670
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
 2013-11-14 11:27:38 +00:00
David Tardon
49a4d366ee integrate libeot 
Change-Id: I0f28ff1680026d883909cc12efabb54f705cecb4
 2013-11-12 17:28:12 +01:00
David Tardon
316be1b6f1 bundle libebook 
Change-Id: I05d96875b9d1deb87dadd63f446080a6fe3494a9
Reviewed-on: https://gerrit.libreoffice.org/6630
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
 2013-11-11 06:52:50 +00:00
Andrzej J.R. Hunt
f479f62c14 Make libatomic_ops buildable and enable on non-X86. 
Change-Id: Iec1d329f143ab76de7e8b4acd3da66efb6e0220c
Reviewed-on: https://gerrit.libreoffice.org/5812
Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Reviewed-on: https://gerrit.libreoffice.org/6600
 2013-11-07 01:05:55 -06:00
Andrzej J.R. Hunt
31fd531b27 Revert "Make libatomic_ops buildable and enable on non-X86." 
(Pushed from wrong branch -- incomplete/broken.)

This reverts commit 0351eaf42f4ebda8564f0f7cdf32706dfff735f6.
 2013-11-06 19:41:30 +00:00
Andrzej J.R. Hunt
0351eaf42f Make libatomic_ops buildable and enable on non-X86. 
Change-Id: I9423672b03caa4d500d44155bc47d4a8fa10c3cb
Reviewed-on: https://gerrit.libreoffice.org/5812
Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
 2013-11-06 13:20:34 -06:00
David Tardon
9ce38ef1e6 fix build 
Change-Id: I90892fe0b585a5b50ee46fcc48f964f423bee256
 2013-11-05 07:03:08 +01:00
David Tardon
c69941fc45 this must be in lowercase letters 
Change-Id: I58e4824156b1646d000a39ba196068efbe10425e
 2013-11-05 06:56:18 +01:00
David Tardon
8fa06c85da add an external for bluez_bluetooth_headers 
Change-Id: Idf48f9a5c2245f6696688a17a0fa3809ae751582
 2013-11-05 06:53:49 +01:00
David Tardon
217eae4f1f move mariadb to libs section 
Change-Id: Ie78ea961a32e96c90bb674766b24a0c44d27412c
 2013-11-05 06:49:33 +01:00
Khaled Hosny
891bb7cc7c fdo#70393: move unixODBC to a subdir of external 
Change-Id: I191b75802eba781fc62ab21cd41918983a6efdb0
Reviewed-on: https://gerrit.libreoffice.org/6569
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
 2013-11-04 23:46:55 -06:00
Khaled Hosny
a62e7733b3 fdo#70393: move sane and twain to subdirs of external 
Change-Id: I0876c3295416abb704ca455bdd61881ff54a0285
Reviewed-on: https://gerrit.libreoffice.org/6568
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
 2013-11-04 23:45:42 -06:00
Khaled Hosny
622a6338dc fdo#70393: move np_sdk to a subdir of external 
Change-Id: Iafba7ff0d0a4b163f9d99195cab36c9968e0bd73
Reviewed-on: https://gerrit.libreoffice.org/6558
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
 2013-11-04 02:59:44 -06:00
Khaled Hosny
6c4b7e4004 fdo#70393: move Mesa to a subdir of external 
Change-Id: Ib3c0516297b0bd68b59c8cfc5c5488005c059c27
Reviewed-on: https://gerrit.libreoffice.org/6557
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
 2013-11-04 02:55:40 -06:00
David Tardon
b253d44327 update libmwaw to 0.2.0 
Change-Id: Ia66d7557e5056398e03ede9d54bf61317e84f2f3
 2013-11-03 10:07:45 +01:00
Michael Stahl
5f9cda2dc5 Repository*: no need to register libraries built via ExternalProject 
Only libraries (and similar for executables) built as Library need to be
registered; those built via ExternalProject are delivered by Project and
used via gb_LinkTarget_add_libs.  This also means there is no need to
mangle the names in RepositoryFixes.mk.

Change-Id: Ib0b67f54e2eb6efdb0c454c9e2dd599ada229676
Reviewed-on: https://gerrit.libreoffice.org/6533
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
 2013-11-02 18:06:06 -05:00
David Ostrovsky
2c92030ff0 Kill servlet-api and tomcat 
Change-Id: I630da3fa37144b2e5fb5117017f43841ba89c42a
Reviewed-on: https://gerrit.libreoffice.org/6454
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
 2013-11-02 05:43:38 -05:00
Fridrich Štrba
67153d7684 bundle libfreehand 
Change-Id: I12de5e96754a8dba94dfdef3deb2aac18af28f22
Reviewed-on: https://gerrit.libreoffice.org/6510
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
 2013-10-31 12:50:46 +00:00
Michael Stahl
bf80dfc061 clean up mozilla external 
Change-Id: Ic69b8763da2933159b55a243c7aed4a8ce557183
 2013-10-31 11:00:47 +01:00
David Tardon
08ca3e40b0 bundle libetonyek 
Change-Id: I4099ea49ebce7c28152a0895086be5b86b18e28b
Reviewed-on: https://gerrit.libreoffice.org/6486
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
 2013-10-30 20:12:33 +00:00
Michael Stahl
3dadfa5afb moz: remove Package moz_lib 
Use xpcom libs from UnpackedTarball; the nsldap32 libs appear to be
unused (presumably postgresql uses some MS LDAP libs).

Change-Id: I56c6b9d38a11a39b8b0e878c892f30926d50284c
 2013-10-30 00:01:35 +01:00
Michael Stahl
a60427ef5a swext: fix wiki-publisher / apache-commons build 
gb_Extension_use_package is inherently broken because it creates cyclic
dependencies with gb_Extension_add_file.  Fortunately it's not necessary
because the added file is a target by virtue of being in the Package.

There is another cyclic dependency that can be avoided by not using the
Package in gb_ExternalProject__use_commons-logging.

Change-Id: Id4ddd4f78d819e47882387533a2d64693b2879ea
 2013-10-26 21:39:18 +02:00
Michael Stahl
5bad73429c oops, fix gb_ExternalProject__use_commons-logging 
Change-Id: I11ed8f8c51fde0205d86580c2af46a1d7c399b3a
 2013-10-25 23:42:44 +02:00
Michael Stahl
070ca1e280 jfreereport: stop pointlessly renaming the jar files 
Change-Id: Ia2c5ce1176496e98643e2cefc65d4c6d0cf9c781
 2013-10-25 23:31:30 +02:00
Michael Stahl
30ad101b10 tomcat: use servlet-api.jar from WORKDIR too 
Change-Id: I985ee75aa6e313a5933c2b3f5c7c5b10a8b8b9f5
 2013-10-25 23:31:30 +02:00
Michael Stahl
461d830ed8 stop using apache-commons jars from OUTDIR too 
Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1
 2013-10-25 23:31:30 +02:00
Michael Stahl
7da7682965 gbuild: add gb_Jar_use_external_jar 
... which is an ugly hack to handle jar files that are from externals
and are not bundled in the main instset, only in extensions.

Change-Id: I992242b7c990c24318b040e98b6632e3b78b6f63
 2013-10-25 11:42:39 +02:00
Michael Stahl
db23d4b0e3 RepositoryExternal: fix layer of de-extensionized Jars 
Change-Id: I16b72d7603ff08305fb4f24cf64b0ef74123e146
 2013-10-25 11:42:39 +02:00
Michael Stahl
b308526fbc libatomic_ops: use libraries from WORKDIR 
Change-Id: I9d1267d6fc14a3149fb92a486bee3023a531e574
 2013-10-24 13:10:39 +02:00
Michael Stahl
b242cee828 freetype: use libraries from WORKDIR 
Change-Id: Ia31a6f56fd8347f6fc50677e86a414f4c5ed81b1
 2013-10-24 13:10:38 +02:00
Michael Stahl
76596b3948 fontconfig: use libraries from WORKDIR 
Change-Id: I4b967187bca35527a3c3d718952ae0a3ae6ebae9
 2013-10-24 13:10:38 +02:00
Michael Stahl
5b90662d7a openssl: use libraries from WORKDIR 
Change-Id: I1e7a75ad4c8d35cb6adef8d6c4104f1955ad4574
 2013-10-24 13:10:38 +02:00
Michael Stahl
32a001d85b cppunit: remove ExternalPackage 
The DllPlugInTester executable is apparently unused.

Change-Id: I1d26aebe8aa67b037438bd21bb00496804c41125
 2013-10-24 09:10:44 +02:00
Michael Stahl
b7d8ca8af9 un-break lpsolve for MSC 
Change-Id: Iccf8f5572530412ef72f802e968778826a73d886
 2013-10-24 01:34:26 +02:00
Michael Stahl
831aaef3a1 redland: unbreak this for MSC 
Change-Id: Ifb1e841ed342103651e7d34d9bb47563c4015b23
 2013-10-24 01:10:15 +02:00
Michael Stahl
83c4ebbe67 remove pointless use_libraries 
Change-Id: I5cf4170867fe40a59f5809c466c0be2255c151d2
 2013-10-24 00:32:58 +02:00
Michael Stahl
714b93b4ec fix curl for MSC 
Change-Id: I61316f0912e4d70c0a28bfa055c07018c39a6b10
 2013-10-24 00:32:57 +02:00
Michael Stahl
77fe50b0f6 cppunit: use libraries from WORKDIR 
Change-Id: I5ce895e6cadc874a3464e6109dfbedd785dbac77
 2013-10-24 00:24:16 +02:00
Michael Stahl
936a1a9daf curl: use libraries from WORKDIR 
Change-Id: Ib4a3aef1ff1d42270e737659b3f663260d3f1175
 2013-10-24 00:24:16 +02:00
Michael Stahl
25f65f26a2 lcms2: use libraries from WORKDIR 
Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5
 2013-10-24 00:24:14 +02:00
Michael Stahl
b177b30675 lpsolve: use libraries from WORKDIR 
Change-Id: I9b0aba0050d73287887de2d7d2376d9aa6303150
 2013-10-24 00:24:13 +02:00
Michael Stahl
d89f48b43c cairo: use libraries from WORKDIR 
Change-Id: Ieb28a48c5fe3b0d89261ff790ecc9db2b5bbf21c
 2013-10-24 00:24:13 +02:00
Michael Stahl
2793c546dc redland: use libraries from WORKDIR 
Change-Id: Ief9a38cbef7552e94ce4ad01fa363a29654bdf9e
 2013-10-24 00:24:12 +02:00
Michael Stahl
d7ddb18d41 icu: apparently "icutu" library is only used by genbrk etc. tools 
Change-Id: I15a3cc3fcdca7d9c4f91e67a4517c9c3533efea7
 2013-10-23 19:21:14 +02:00
Michael Stahl
e353b2bcc2 icu: use executables from WORKDIR 
Change-Id: I74b9d1dbcb3e8f7f2cc092dad60266cf60475367
 2013-10-23 19:21:14 +02:00
Michael Stahl
a92f80fdca icu: use libraries from WORKDIR 
Change-Id: I7d996cc9412eadf89c8d04ee29abe1fa6f7d53db
 2013-10-23 19:21:14 +02:00
Michael Stahl
d2f62c32e0 nss: use libraries from WORKDIR 
Change-Id: I120fdbd32d3c20df7f2c6f67e0df6de216606396
 2013-10-23 00:37:11 +02:00
Michael Stahl
e6c47b03d0 libxml2, libxslt: use executables from WORKDIR 
Change-Id: I1324c8f21e31c69b9780136cc777e1aea3bc546e
 2013-10-22 22:30:20 +02:00