Commit graph

64 commits

Author SHA1 Message Date
Jan Holesovsky
a1c23a44b9 Fix the --disable-xmlsec build. 2011-11-03 21:07:04 +01:00
Tor Lillqvist
6744ccd782 Don't bother with --with-openssl=no for Android then as we do use openssl 2011-11-03 17:24:43 +02:00
Tor Lillqvist
64a25bc57a Pass --build and --host to xmlsec1 configury when cross-compiling 2011-11-03 17:24:43 +02:00
Tor Lillqvist
c163a61499 Use our openssl build as crypto lib for xmlsec1 for Android
Seems to build that way; no idea if it works of course.
2011-11-03 17:24:42 +02:00
Tomas Chvatal
f6f5c89259 Rename --enable-nss-module to --with-system-nss + introduce --enable-xmlsec.
This also finishes the uncoupling of NSS from the --with-system-mozilla.
2011-11-02 17:37:53 +01:00
Rene Engelhard
5e80f012e7 make libxmlsec be built again with SYSTEM_MOZILLA=YES 2011-10-19 11:01:00 +02:00
Jan Holesovsky
d37209912b Decouple NSS build from the Mozilla build.
This allows xmlsecurity to be built even when --disable-mozilla is provided.
2011-10-18 12:10:05 +02:00
Jan Holesovsky
43832043d3 Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-17 17:00:47 +01:00
Hanno Meyer-Thurow
2d1e4290a9 Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
   against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
   available for more than two years. Noone cares, therefore rest in peace.
   Python2 is going to be ditched at some point. Simply do not fail then.
   Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
   handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
   interesting for Linux Distributions. Enforce the user to place JVMs in one
   base directory.
5. Fix build for libxml-2.7.8 with ICU support.

* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
2011-03-13 16:15:21 +01:00
Jan Holesovsky
89c4f8907f Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
	cppunit/ldflags.patch
	hyphen/hyphen-2.4.patch
	libegg/source/eggtrayicon.c
	libtextcat/makefile.mk
2011-03-09 09:55:09 +01:00
Thomas Arnhold
fb95d02a1d Clean up makefiles 2011-02-02 11:50:17 +01:00
tono
5256f32b98 mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name 2011-01-06 21:56:21 +09:00
Jesús Corrius
36ad473eee Build fixes for VC++ 10 2010-10-20 19:17:19 +02:00
Caolán McNamara
2bea2079c0 fix up conflict, merge into configure patch 2010-10-05 20:30:56 +01:00
Sean McNamara
4f678fedc0 fix libxmlsec build 2010-09-29 22:59:50 +02:00
sb
cb852ad284 sb126: merged in DEV300_m87 2010-09-16 16:45:57 +02:00
obo
532f35c60b CWS-TOOLING: integrate CWS ause124 2010-07-29 13:49:01 +02:00
Jens-Heiner Rechtien
32c69599b1 CWS-TOOLING: integrate CWS solaris10u8_OOO330 2010-07-21 16:23:13 +02:00
Hans-Joachim Lankenau
39565fee52 #i107097# - pass MAXPROCESS to GNU make in external modules 2010-07-20 12:46:55 +02:00
Michael Stahl
ae05c62681 solaris10u8: #i112480#: fix libxmlsec configure:
xmlsec1-configure-libxml-libxslt.patch: do not prepend /bin to $PATH.
2010-07-12 15:57:50 +02:00
sb
15a4ec2c3e sb126: merged in DEV300_m84 2010-06-30 15:38:26 +02:00
sb
05c8709f2c sb126: #i110197# remove -Wl,-z,noexecstack hack 2010-06-22 09:31:32 +02:00
obo
8027e13d54 masterfix: #i10000# xmlsec1-update-config-sub-and-guess.patch is based on xmlsec1-1.2.12 and doesn't match current version (from CWS kfreebsdport01v2) 2010-06-10 15:11:12 +02:00
obo
9f1127bc42 CWS-TOOLING: integrate CWS kfreebsdport01v2 2010-06-09 08:34:10 +02:00
tono
af97d059b7 mingwport30: merge with DEV300 m80 2010-06-05 22:39:55 +09:00
tono
2f0d1f09eb i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 2010-05-31 21:53:32 +09:00
Hans-Joachim Lankenau
1b5a253cc1 xmlsec1_2_14: update to DEV300m77 2010-05-19 14:54:32 +02:00
Rene Engelhard
b61b265e18 kfreebsdport01: update config.{guess,sub} of libtextcat/libxmlsec 2010-04-16 14:34:40 +02:00
Hans-Joachim Lankenau
c2d29ac912 ause110: update to DEV300_m74 2010-03-10 16:36:40 +01:00
Caolán McNamara
b1d4997e71 xmlsec1_2_14: merge with DEV300 m74 2010-03-10 09:09:23 +00:00
Caolán McNamara
991d51b9ba libxmlsec: #i107747# Document what I think xmlsec1-nssdisablecallbacks.patch does 2010-03-05 19:10:01 +00:00
Ivo Hinkelmann
b5dbfc6ae6 CWS-TOOLING: integrate CWS obo45 2010-03-03 14:27:12 +01:00
Caolán McNamara
b2e49190df #i107747# allow building against older libxml2 2010-03-02 15:54:30 +00:00
Caolán McNamara
194993bb67 xmlsec1_2_14: merge with DEV300 m73 2010-03-02 14:17:28 +00:00
obo
02bb22a2e4 #i109425# libxmlsec not buildable with HH environment 2010-02-19 09:23:25 +01:00
Jens-Heiner Rechtien
aac3a82b82 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Hans-Joachim Lankenau
b29bb2dbee ause110: #i106731# remove tarballs from scm and find them in download cache dir 2010-01-15 14:55:12 +01:00
Caolán McNamara
94bc4993ff xmlsec1_2_14: #i107747#: upgrade to latest xmlsec1, libxml2 and libxslt 2009-12-17 13:32:53 +00:00
Kurt Zenker
618a465336 CWS-TOOLING: integrate CWS jl135_nss
2009-10-01 15:20:03 +0200 jl  r276605 : #1004856# moved to xmlsec1-mingw32.patch 
2009-10-01 10:51:24 +0200 jl  r276580 : #1004856# build keymgr with mingw
2009-10-01 10:50:52 +0200 jl  r276579 : #1004856# build keymgr with mingw
2009-10-01 10:37:28 +0200 jl  r276578 : #1004856# do not build xmlsec1 app
2009-09-29 16:01:31 +0200 jl  r276532 : #1004856# Using libxml2 from solver if available
2009-09-26 16:31:32 +0200 jl  r276477 : #i104856# xmlsec1-mscrypto-1 is now xmlsec1-mscrypto
2009-09-25 17:05:26 +0200 jl  r276470 : CWS-TOOLING: rebase CWS jl135_nss to trunk@276429 (milestone: DEV300:m60)
2009-09-24 12:57:10 +0200 jl  r276419 : #i104856# libxmlsec update
2009-09-24 12:46:58 +0200 jl  r276418 : #i104856# fixing mac configure problem in configure.in and regenerating configure
2009-09-23 16:49:54 +0200 jl  r276405 : i#104856# configure failed on mac
2009-09-23 10:21:35 +0200 jl  r276369 : #i104856# adapting patches to apply cleanly and readme change
2009-09-21 13:45:47 +0200 jl  r276326 : #i104856 updating to 1.2.12, using changes patches from cmc made on xmlsec1_2_12
2009-09-21 11:27:46 +0200 jl  r276319 : #i105183# forget to uncomment PATCH_FILES
2009-09-18 17:41:20 +0200 jl  r276296 : #i105183# update of nss libs
2009-10-14 16:21:13 +00:00
Ivo Hinkelmann
93b228f440 CWS-TOOLING: integrate CWS mingwport24
2009-09-13 02:15:22 +0200 tono  r276097 : i#105033: mingw port: accept incomplete deflib
2009-09-12 15:14:34 +0200 tono  r276096 : i#105012: mingw port: $(PATH) should be quoted
2009-09-12 15:12:49 +0200 tono  r276095 : i#105011: mingw port: berkeleydb fix
2009-09-12 15:11:39 +0200 tono  r276094 : i#105010: mingw port: decline libdl
2009-09-12 15:10:21 +0200 tono  r276093 : i#105009: mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
2009-09-12 15:08:27 +0200 tono  r276092 : reverting changes to revise log messages
2009-09-12 11:55:48 +0200 tono  r276090 : i#105014: mingw port: change to latest w32api and mingw runtime
2009-09-12 11:52:12 +0200 tono  r276089 : i#105013: mingw port: fix gas error in call.s in bridges
2009-09-12 11:42:04 +0200 tono  r276088 : mingw port:  should be quoted
2009-09-12 11:35:35 +0200 tono  r276087 : mingw port: berkeleydb fix
2009-09-12 11:32:34 +0200 tono  r276086 : mingw port: decline libdl
2009-09-12 11:20:50 +0200 tono  r276085 : mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
2009-09-18 14:37:01 +00:00
Jens-Heiner Rechtien
408c5595e3 CWS-TOOLING: integrate CWS cloph13
2009-09-01  #i104566# also use syslibroot/isysroot for external components
2009-08-28  #i104568# clean up duplicated definitions of OBJCXXFLAGS
2009-08-28  #i104567# add ccache-detection to configure (to skip to objcxx-flags)
2009-08-28  #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility
use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches
ignore "-isysroot /Developer/..." arguments for OOo's cpp
2009-09-16 14:49:32 +00:00
Jens-Heiner Rechtien
8ffd74a9de CWS-TOOLING: integrate CWS sb113
2009-09-01 sb #i76393# second attempt at properly #ifdef-ing previous HG commit d598efdbf012
2009-08-28 sb #i102469# change back <T extends XInterface> to just <T> on queryInterface, to avoid binary incompatibility (method changing its signature from (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to (Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;)
2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012
2009-08-27 sb #i94421# work around compiler error (based on a patch supplied by cloph)
2009-08-26 sb merged in DEV300_m56
2009-08-26 sb #i76393# on Linux, include dynamic section offset in crash report so as to be able to map "prelinked" callstacks back to original (patch by cmc)
2009-08-26 sb #i88162# remove unnecessary whitespace lines from per-locale xcu files (patch by tora)
2009-08-17 Juergen Schmidt #i104292# set context classloader after create new custom UNO loader
2009-08-17 Juergen Schmidt #i103749# integrate patch
2009-08-14 sb #i103269# cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955# changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8")
2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface (detected via the simplified UnoRuntime.queryInterface, the HG changeset 29de35fc9554) to use AnyConverter instead; changed qadevOOo's lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater for IllegalArgumentException thrown by AnyConverter
2009-08-12 sb #i104178# drop extra libxml2-config script from libxmlsec
2009-08-10 sb #i101754# simplified osl_getProcessInfo for LINUX (patch by cmc)
2009-08-10 sb #i95018# avoid closing -1 fds (patch supplied by cmc)
2009-08-10 sb #i103585# removed (apparently unnecessary) zlib support from libxml2; in turn, removed zlib dependencies from libxmlsec, libxslt, and redland (assuming those were transitive dependencies brought in by direct dependencies on libxml2)
2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5 generics; adapted URE-related modules accordingly
2009-08-10 sb #i101213# adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set PYTHONHOME) in accordance with configure env (set_soenv.in); fixed testtools/source/bridgetest/pyuno (which now should work everywhere out of the box, thanks to the fixed setsolar PYTHONPATH)
2009-08-10 sb cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955# work in progress for a .hgignore file, continued")
2009-09-16 14:37:52 +00:00
Vladimir Glazounov
f0ec1971d9 CWS-TOOLING: integrate CWS mingwport22
2009-08-19 16:18:46 +0200 tono  r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-08-05 12:27:41 +0200 tono  r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54)
2009-08-01 00:56:35 +0200 tono  r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-27 00:13:27 +0200 tono  r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 06:19:59 +0200 tono  r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
2009-07-25 06:13:56 +0200 tono  r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
2009-07-25 06:05:22 +0200 tono  r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
2009-07-25 05:54:09 +0200 tono  r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
2009-07-25 05:44:58 +0200 tono  r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
2009-07-25 05:33:09 +0200 tono  r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
2009-07-25 05:24:42 +0200 tono  r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
2009-07-25 05:16:20 +0200 tono  r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 04:01:59 +0200 tono  r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-07-25 02:44:01 +0200 tono  r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
2009-07-25 02:28:21 +0200 tono  r274321 : i#103791: mingw port fix typo
2009-08-26 06:36:38 +00:00
Vladimir Glazounov
275debd869 CWS-TOOLING: integrate CWS mingwport17
2009-02-02 09:09:07 +0100 tono  r267246 : i#98723#: Less conditionals in libs.mk for mingw
2009-02-02 09:06:03 +0100 tono  r267244 : i#98722#: Skip building ldump in mingw
2009-02-02 09:04:05 +0100 tono  r267243 : i#98721#: Improve symbol extraction in mingw
2009-02-02 09:02:07 +0100 tono  r267242 : i#98720#: Improve strip performance in mingw
2009-02-02 08:59:36 +0100 tono  r267241 : i#98719#: Copy mingw multithread runtime in external
2009-02-02 08:55:09 +0100 tono  r267240 : i#98718#: Cleanup cygwin workaround for mingw
2009-02-02 08:53:33 +0100 tono  r267239 : i#98718#: Cleanup cygwin workaround for mingw
2009-02-02 08:50:36 +0100 tono  r267237 : i#98717#: Avoid MSVC version check in mingw configure
2009-01-28 22:28:53 +0100 tono  r267088 : i#97608#: Remove Guiddef.h inclusion
2009-01-28 22:24:23 +0100 tono  r267087 : i#96980#: cairo dll name is different in mingw build
2009-01-28 22:19:19 +0100 tono  r267086 : i#96731#: MinGW port fro embedserv update
2009-03-12 22:38:26 +00:00
Oliver Bolte
177eb5d1cd CWS-TOOLING: integrate CWS ause099
2009-01-29 12:30:57 +0100 hjs  r267116 : #i98365# fix unsetting g+s bit
2009-01-23 14:21:19 +0100 hjs  r266819 : #i40246# - cleanup
2009-01-23 14:14:07 +0100 hjs  r266818 : #i40246# - fix quoting of final echo line
2009-01-23 12:42:33 +0100 hjs  r266807 : #i98365# leave higher bits alone
2009-01-23 11:23:42 +0100 rt  r266799 : Header
2009-01-22 19:14:25 +0100 hjs  r266753 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:22:18 +0100 hjs  r266737 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:20:54 +0100 hjs  r266736 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:20:24 +0100 hjs  r266735 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:08:33 +0100 hjs  r266734 : #i40246# renamed variable
2009-01-22 16:05:26 +0100 hjs  r266733 : #i40246# renamed variable
2009-01-20 17:46:54 +0100 hjs  r266610 : #i98290# cleanup
2009-01-19 19:32:19 +0100 hjs  r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428 (milestone: DEV300:m39)
2008-12-08 21:00:09 +0100 hjs  r265049 : CWS-TOOLING: rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37)
2008-11-27 18:25:18 +0100 hjs  r264513 : #i40246# - support multiple patches per archive
2008-11-17 19:00:12 +0100 hjs  r263738 : CWS-TOOLING: rebase CWS ause099 to trunk@263288 (milestone: DEV300:m35)
2009-02-19 07:29:28 +00:00
Rüdiger Timm
ddca3b4bf1 INTEGRATION: CWS sb91 (1.17.8); FILE MERGED
2008/07/11 10:08:20 sb 1.17.8.1: #i91567# adapt to unxsolu4
2008-08-27 12:48:25 +00:00
Vladimir Glazounov
48480927a1 INTEGRATION: CWS cmcfixes48 (1.17.14); FILE MERGED
2008/08/01 14:04:33 cmc 1.17.14.1: #i92247# build a pic .a on unix, we only link in one place now, so this reduces size slightly and removes the conflicting libxmlsec1 provides from the hacked version vs the system one on AutoReqProv rpm systems
2008-08-18 12:17:56 +00:00
Rüdiger Timm
5d030a2f39 INTEGRATION: CWS changefileheader (1.16.6); FILE MERGED
2008/03/31 13:19:21 rt 1.16.6.1: #i87441# Change license header to LPGL v3.
2008-04-11 06:19:29 +00:00
Oliver Bolte
11cf5b2fd4 INTEGRATION: CWS obo19 (1.15.2); FILE MERGED
2007/11/30 08:54:11 obo 1.15.2.1: #i83979# EXTRA_CFLAGS added
2008-01-04 13:57:39 +00:00
Rüdiger Timm
50fdc8b0f7 #i82774# Quote LIBXML2LIB in CONFIGURE_FLAGS 2007-10-19 09:32:40 +00:00