| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined
DISABLE_ATL on all platforms in configure)
(cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40)
Conflicts:
postprocess/Rdb_services.mk
Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Reviewed-on: https://gerrit.libreoffice.org/2098
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
|
|
| |
Change-Id: Ieee849e3e3b8bda5674027af9c6c2993b045d71a
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
desktop/source/app/sofficemain.cxx
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk
Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
|
| |
| |
| |
| |
| | |
Change-Id: If6c607fc9f0be1f7a71eda8d555399451938c5fc
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I70cb4856f1db4722e886407d1c2fdf6a73b9a7f3
(cherry picked from commit d9412fb4755377b8358a46a249cfe29a22ea9451)
Signed-off-by: Andras Timar <atimar@suse.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
scp2/source/ooo/makefile.mk
Change-Id: I5b65933015051aa3a03c7151d39d6d68072273a6
|
|/
|
|
| |
Change-Id: Iec60fca2895cffac34290dc8db8954b95dda6606
|
|
|
|
|
|
|
|
| |
(cherry picked from commit 8b749cb16dde14b199a61456741b586ddd88a584 plus
238eba337cedda17a9ed1ce7e91755c66446195a "make the vc2010 redist optional")
Change-Id: If22bed6728121ec66ecd89ad4f869e980aeb79b7
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
|
|
|
|
|
| |
Change-Id: I0b6eb67014a61e22981f1f6be488fa762d639554
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
|
|
|
|
|
| |
Change-Id: Ib17bb0a2fc95207da69bfef11b2fab59aefa719d
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
|
|
|
|
|
| |
Change-Id: Icde6310d922a3d5e2822789a23403b9f188efaf4
Signed-off-by: David Tardon <dtardon@redhat.com>
|
|
|
|
|
|
|
| |
Change-Id: Ibe7e33d0f79caac177cf84fdbdc2cbf48ced8840
(cherry picked from commit 68909d3d25da0fe350319dfc82ca5b8fe9f38dc8)
Signed-off-by: David Tardon <dtardon@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either. This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).
Conflicts:
setup_native/prj/d.lst
Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
Signed-off-by: Andras Timar <atimar@suse.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Merged changes from Alexander Wilms <alexander dot wilms at zoho do com>
Bjoern Michaelsen <bjoern dot michaelsen at canonical dot com> and
Petr Mladek <pmladek at suse dot cz>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Change-Id: I942f747aadc897b73d97b2047e267d752580aa33
|
|
|
|
| |
Change-Id: Ie002ab01a804cceea06e0a2ba7e6b2fe2a495344
|
|
|
|
| |
Change-Id: I0362d758205e7d12484e9e86ff2dce9608730c57
|
|
|
|
|
|
| |
This reverts commit 4c2e9fc655b6480ffc7f0feb5d07b8106b6b8e22.
Change-Id: Iea84991ee689240fe6e6ddbc47f44b444f582dde
|
|
|
|
| |
Change-Id: Id68521b92f572366a68f35c09387a7ed45a835ff
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... so it can do the pre-registration of bundled extensions in
INSTALLLOCATION/share/prereg/bundle.
The meaning of Type of custom action is the following:
msidbCustomActionTypeDll + msidbCustomActionTypeBinaryData +
msidbCustomActionTypeInScript + msidbCustomActionTypeNoImpersonate +
msidbCustomActionTypeCommit = 3585
So it is a binary in a dll from the MSI itself, it runs deferred
with system privileges and after commit, because msvcrt90.dll is
available only after commit. The same type was chosen for the
removing part, it works.
Change-Id: I14c347b5cbc47789eb0484769a676703361c2193
|
|
|
|
| |
Change-Id: Ice52de070220b4e7ae8a3dd0ccb41e3a12d471b8
|
|
|
|
|
|
|
|
|
|
| |
64-bit registry entries were entered via a custom action, which
did not always work. By default the custom action ran with user
privileges, which were not sufficient to write the registry.
It is not necessary to use custom actions for this task. Windows
installer supports it well.
Change-Id: Id65458c363c2b90b3e7d166b4c836bfb1ff19bf4
|
|
|
|
| |
Change-Id: If75d2daaac2c629028a76f55941345c1c565a69a
|
|
|
|
|
|
| |
This reverts commit 45295f3cdceb4c289553791071b5d7f4962d2ec4.
File Open/Save window of 32-bit applications still need the 32-bit
shell extensions on a 64-bit system.
|
| |
|
|
|
|
|
| |
Remove hack in sofficemain we really don't want and don't install
a lib we are not building.
|
| |
|
| |
|
| |
|
|
|
|
| |
Change-Id: Ia4fd68af25725770cc620254dedba805102301a8
|
|
|
|
| |
Change-Id: I49680c13989c9031150bae110e498a02af2476c4
|
|
|
|
| |
Change-Id: Ia1c75076254c0300b19d6e12879143f7966b8294
|
|
|
|
|
|
|
|
|
|
| |
This makefile must be included from other makefiles, which means it must
be delivered first, which does not play so well with gbuild's
all-in-one-process build. Because the version has not changed once since
the library was introduced in 2006, I consider this just an unecessary
complication of already complex build process.
Change-Id: I8304f0e8ef9e59a046b10f423dbe61d75e3fc5c2
|
|
|
|
| |
Change-Id: Ie3fe45fce1e27332c178596ed7f60967781ffcda
|
|
|
|
| |
Change-Id: I236165572652d7740d637ac19994aca549f501bb
|
|
|
|
| |
Change-Id: I I7d0de9bc04c26e71c6bd915a659a15c3e1f712d2
|
|
|
|
| |
Change-Id: Ife00d7477dacfe1eb325c722517fb038ead083db
|
|
|
|
| |
Change-Id: Ic11bfb94cbee4116fe94255f5dc7c49bf795797a
|
|
|
|
| |
Change-Id: I75474c2f0e938987c28dcfa1f31428e77de03e90
|
|
|
|
| |
Change-Id: If9a0906a76943160cfdbd647b26a801bc4389615
|
|
|
|
|
|
| |
mark the file as %config
Change-Id: I445a0e4570eb15113da58a5f824d618e44ab3bdd
|
|
|
|
| |
Change-Id: I50d5cee6302e8d6b4b329e30b7a5ce47b47bc945
|
| |
|
| |
|
|
|
|
| |
Change-Id: I4941d97a8eb540bbf63320db83230707ced9f90f
|
| |
|
|
|
|
| |
Change-Id: If77543855fe34f70d248fe8a4644d293f693f190
|
|
|
|
| |
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In some circumstances installation of embedded VC++ runtime
fails with error code 1935. This usually occurs, when there are
many different versions of VC++ runtimes installed on the computer,
including beta versions. We can workaround this Microsoft bug, if we
don't install our VC++ runtime. A new property was introduced. It is
called VC_REDIST, and installation of VC++ runtime depends on its
value. (BTW the solution is general, ComponentCondition can be used
for any merge module, now we have only the VC++ runtime merge module.)
When the user experiences error code 1935, he should try to install
LibreOffice with the following command line:
msiexec /i <msi file name> VC_REDIST=0
The patch fixes another minor issue. 64-bit VC++ runtime will
not be installed on 32-bit systems any more.
Change-Id: I I6c5e066c6e60b011235e6019a8a35c9e953209bc
|
|
|
|
|
|
|
| |
we have both a SYSTEM_LIBJPEG and SYSTEM_JPEG but only SYSTEM_JPEG appears to
be used
Change-Id: Ib1a5da4c907222be33465ce06997f111c4fffe87
|