strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14183 commits 9 branches 795 tags 2.1 GiB
Commit graph

192 commits

Author SHA1 Message Date
Michael Meeks
5c3f86934e use the unix quickstarter un-conditionally. 2011-03-21 21:17:57 +00:00
Jan Holesovsky
61a4bf5a07 Merge remote-tracking branch 'origin/integration/dev300_m101' 
Conflicts:
	set_soenv.in
 2011-03-17 16:06:07 +01:00
Hanno Meyer-Thurow
ff33fd9d5d 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-14 18:47:10 +01:00
Norbert Thiebaud
dcbb52f15a mismerge: l10n has not changed location in libo 2011-03-12 18:49:14 -06:00
Andras Timar
68a38407f5 remove legacy SOURCE_ROOT_DIR variable 2011-03-12 09:29:25 +01:00
Norbert Thiebaud
f0e5895d5b Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 
* commit 'ooo/DEV300_m101': (500 commits)
  masterfix DEV300: #i10000# remove hard dep
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i100000# dep. fix
  masterfix DEV300: #i10000# removed one hard dep
  masterfix DEV300: #i10000# fixed patch handling
  masterfix DEV300: #i10000# new configure
  DEV300
  masterfix DEV300: #i10000# nawk -> awk
  l10nmove: adjust repository handling
  l10nmove: fixed regex
  l10nmove: minor fixes
  l10nmove: add l10n repo to gb_REPOS
  DEV300 masterfix: gnumake3: subsequenttests requires  in environment
  ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
  DEV300 masterfix: #i10000#: windows: more bizare hacks ...
  locales34: have a matching configure as well
  DEV300
  locales34: back out change from autoreconf
  gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
  ...

Conflicts:
	configure
	configure.in
	instsetoo_native/prj/build.lst
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	instsetoo_native/util/pack.lst
	ooo.lst
	scp2/source/canvas/canvascommons.scp
	scp2/source/canvas/mtfrenderer.scp
	scp2/source/ooo/common_brand.scp
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/file_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/module_langpack.ulf
	scp2/source/ooo/ure.scp
	scp2/source/python/file_python.scp
	scp2/source/sdkoo/sdkoo.scp
	scp2/source/templates/module_langpack_accessories_templates.sct
	scp2/source/templates/module_langpack_accessories_templates_root.sct
	set_soenv.in
	soldep/bootstrp/appdef.cxx
	soldep/bootstrp/dep.cxx
	soldep/bootstrp/hashtbl.cxx
	soldep/bootstrp/makefile.mk
	soldep/bootstrp/minormk.cxx
	soldep/bootstrp/prj.cxx
	soldep/bootstrp/prodmap.cxx
	soldep/inc/dep.hxx
	soldep/inc/minormk.hxx
	soldep/inc/prodmap.hxx
	soldep/inc/soldep/appdef.hxx
	soldep/inc/soldep/connctr.hxx
	soldep/inc/soldep/depper.hxx
	soldep/inc/soldep/depwin.hxx
	soldep/inc/soldep/hashtbl.hxx
	soldep/inc/soldep/objwin.hxx
	soldep/inc/soldep/prj.hxx
	soldep/inc/soldep/sdtresid.hxx
	soldep/inc/soldep/soldep.hxx
	soldep/inc/soldep/soldlg.hxx
	soldep/inc/soldep/tbox.hxx
	soldep/prj/d.lst
	soldep/source/connctr.cxx
	soldep/source/depapp.hxx
	soldep/source/depper.cxx
	soldep/source/depwin.cxx
	soldep/source/makefile.mk
	soldep/source/objwin.cxx
	soldep/source/soldep.cxx
	soldep/source/soldlg.cxx
	soldep/source/soldlg.src
	soldep/source/tbox.cxx
	solenv/bin/build.pl
	solenv/bin/cws.pl
	solenv/bin/make_installer.pl
	solenv/bin/mhids.pl
	solenv/bin/modules/CwsConfig.pm
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/modules/installer/regmerge.pm
	solenv/bin/modules/installer/scriptitems.pm
	solenv/bin/modules/installer/servicesfile.pm
	solenv/bin/modules/installer/simplepackage.pm
	solenv/bin/modules/installer/substfilenamefiles.pm
	solenv/config/ssolar.cmn
	solenv/inc/_tg_rslb.mk
	solenv/inc/extension_post.mk
	solenv/inc/libs.mk
	solenv/inc/minor.mk
	solenv/inc/postset.mk
	solenv/inc/settings.mk
	solenv/inc/tg_rslb.mk
	solenv/inc/unxlng.mk
	solenv/inc/wntmsc.mk
	soltools/HIDCompiler/hidclex.l
	stlport/prj/d.lst
	stlport/systemstlguards/postextstl.h
 2011-03-08 19:43:29 -06:00
Matthias Klose
265cfde593 lp#727118: ppc and openjdk fix 
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
 2011-03-01 15:10:51 +01:00
Ivo Hinkelmann
f5c661e67e masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:11:18 +01:00
Francois Tigeot
60fe1a1958 Remove OSF/1 support. 2011-02-21 14:37:59 +01:00
David Tardon
657710a76d configure inclusion/exclusion of scripting providers 2011-02-18 09:47:50 +01:00
Ivo Hinkelmann
94f7fa3c81 CWS-TOOLING: integrate CWS l10nmove 2011-02-17 17:08:18 +01:00
Ivo Hinkelmann
42d31088dd CWS-TOOLING: integrate CWS locales34 2011-02-17 16:39:56 +01:00
Francois Tigeot
2b6daefaea dragonfly stuff 2011-02-15 12:08:10 +00:00
Ivo Hinkelmann
a3a148c0be l10nmove: add l10n repo to gb_REPOS 2011-02-14 18:48:22 +01:00
Thomas Arnhold
7387cd7edb Easy hack: remove obsolete gjc aot compilation 2011-02-12 11:58:27 +01:00
Andras Timar
509adda149 remove unused --with-dict option 2011-02-10 21:45:02 +01:00
Francois Tigeot
3dd75542a2 Porting LO to Dragonfly 2011-02-10 10:38:31 +01:00
Fridrich Štrba
c296fe08de Build STLport only as a compatibility library 2011-02-09 20:18:10 +01:00
Eike Rathke
0003a55a90 locales34: merge m99 2011-02-08 19:44:39 +01:00
Jan Holesovsky
d856c71a7d Merge remote branch 'origin/libreoffice-3-3' 
Conflicts:
	configure.in
	solenv/bin/build.pl
 2011-02-08 00:31:41 +01:00
Ivo Hinkelmann
6bb97c8b31 l10nmove: #i116586# Move l10n module into own repository 2011-02-03 16:29:56 +01:00
Caolán McNamara
9d0e903392 odf1->osf1 2011-02-03 13:18:02 +00:00
Ivo Hinkelmann
a0d42cf895 l10nmove: #i116586# Move l10n module into own repository 2011-02-02 16:23:08 +01:00
Ivo Hinkelmann
a17d76c92f l10nmove: #i116586# Move l10n module into own repository 2011-02-01 16:24:30 +01:00
Ivo Hinkelmann
3da3939805 l10nmove: #i116586# Move l10n module into own repository 2011-02-01 15:43:35 +01:00
Michael Stahl
36db278681 gnumake3: configure: set $GNUCOPY on all platforms 2011-01-31 18:35:25 +01:00
Fridrich Štrba
f486b35f98 Fix a copy&paste error 2011-01-29 23:16:19 +01:00
Caolán McNamara
631eaf3312 Resolves: fdo#31271 wrong line break with ( 
(cherry picked from commit de475b03b02e4cac162b517f7d9f302b6134d546)
 2011-01-29 12:57:23 +00:00
Caolán McNamara
0c73802c54 Resolves: fdo#31271 wrong line break with ( 2011-01-29 12:53:25 +00:00
Mathias Bauer
166738d8ac CWS gnumake3: kill ENABLE_VBA 2011-01-28 13:59:35 +01:00
Tor Lillqvist
289917e183 Minor cleanup 
When JAVA_HOME is empty or "NO_JAVA_HOME" don't use such paths in ILIB
or SOLARINC. Use $INCLUDE consistently everywhere instead of
$ds."include". Avoid duplicating the DirectX include in SOLARINC.
 2011-01-28 01:07:25 +02:00
Eike Rathke
a11f234834 locales34: #i112240# for system icu >=4.4 add Close_Parenthesis to $CL Close_Punctuation; patch from <cmc> 2011-01-27 23:56:24 +01:00
Tor Lillqvist
e7def2bfc6 Check also $JAVA_HOME being set to "NO_JAVA_HOME" by the configure script 2011-01-26 21:15:55 +02:00
Thomas Klausner
5e4955a4f6 Pass thru PYTHON, found by configure. 
Will be used by filter/source/config/fragments/makefile.mk.
 2011-01-26 11:43:50 +01:00
Ivo Hinkelmann
8af0fe6102 CWS-TOOLING: integrate CWS mingwport33 2011-01-19 12:20:03 +01:00
Tor Lillqvist
9cf5f41bed Cleanups and hacks on the start of support for 64-bit Windows build 
* configure.in: Look for the x64 assembler ml64.exe when building 64-bit
  binaries, not ml.exe. Use the 64-bit tools in VC/bin/amd64, not
  the 32-bit cross-compiling tools in VC/bin/x86_amd64. We can
  currently build 64-bit only on a 64-bit OS anyway, for instance
  because of the unit tests.

* set_soenv.in: Set CPUNAME, CPU and OUTPATH appropriately for
  64-bit build. We end up with "wntsmcx12" for 64-bit MSVC 2008
  build. Drop sections for no longer supported MSVC versions. Don't
  talk about ".NET 2005" etc, ".NET" was part of the MS suite product
  name only in the 2003 version. Add Emacs and vim mode lines.
 2011-01-16 20:57:08 +02:00
Tor Lillqvist
8910ee630e Add Emacs and vim mode lines 2011-01-12 18:49:14 +02:00
Petr Mladek
961abfc6f2 Fix distro specific about intro hadling 
I guess that nobody uses more alternative branding pictures. It was implemented
for SLED10-GM and it is not longer needed there. So I renamed:

    --with-intro-bitmaps to --with-intro-bitmap
    --with-about-bitmaps to --with-about-bitmap
and
    INTRO_BITMAPS to INTRO_BITMAPS
    ABOUT_BITMAPS to ABOUT_BITMAP

Also .png file format is requred instead of .bmp now.

Signed off by KAMI.
 2011-01-07 18:38:45 +01:00
tono
756ad0fa5c mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name 2011-01-06 21:56:21 +09:00
Hans-Joachim Lankenau
d384a2a1f2 ause129: #i116289# set MACOSX_DEPLOYMENT_TARGET in environment for use in dmake and gnumake build 2011-01-06 12:31:18 +01:00
Jan Holesovsky
d7d7b15e94 Set TMP on Windows if not set. 
Otherwise we have problems with paths containing spaces - they don't get
quoted in some cases.
 2011-01-04 15:47:57 +01:00
Rene Engelhard
bb0e0f0743 missing @ 2010-12-22 16:04:34 +01:00
Rene Engelhard
9038e9a595 export MDDS_CPPFLAGS into the env 2010-12-22 16:01:05 +01:00
Tor Lillqvist
6eebbe5bba It's called MinGW, not mingwin, mingw32, etc 2010-12-20 15:37:58 +02:00
Jan Holesovsky
70896c190c Merge commit 'libreoffice-3.3.0.2' 
Conflicts:
	configure.in
	scp2/source/extensions/directory_extensions.scp
	scp2/source/extensions/module_extensions.scp
	scp2/source/ooo/file_ooo.scp
	set_soenv.in
	solenv/bin/modules/installer/download.pm
	solenv/bin/modules/installer/helppack.pm
	solenv/bin/modules/installer/windows/createfolder.pm
	solenv/bin/modules/installer/worker.pm
	solenv/bin/ooinstall
 2010-12-20 01:11:02 +01:00
Rene Engelhard
a528189281 actually add WITH_HELPPACK_INTEGRATION to set_soenv.in 2010-12-17 20:04:07 +01:00
Rene Engelhard
0cf7331043 AC_SUBST gperf (fdo#32195) 2010-12-14 11:05:52 +01:00
Rene Engelhard
803f02e6a3 AC_SUBST gperf (fdo#32195) 2010-12-13 22:17:31 +01:00
Fridrich Štrba
73e4a11ef0 Propagate the WITH_EXTENSION_INTEGRATION variable to build environment 2010-12-13 20:41:32 +01:00
Fridrich Štrba
f86d86532a Propagate the WITH_EXTENSION_INTEGRATION variable to build environment 2010-12-13 20:38:28 +01:00