Age | Commit message (Collapse) | Author | Files | Lines |
|
Reviewed-on: https://gerrit.libreoffice.org/60657
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit a8eb515599526b5b69647a842b2889b6f56de2c8)
Change-Id: Iab7bc66db94fe02bb3714234d68b3e2fc3569fdf
|
|
Change-Id: If4337153f8b0edb424132ab60b50dc5a89ca25ee
|
|
Try to find >= 4.6 .NET SDK first.
+allow .NET SDK 4.7.2.
Change-Id: I64084e894ee829ecff091fe16a45f309a51eb4d5
Reviewed-on: https://gerrit.libreoffice.org/57550
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 9b8c8c70fa8116f606ce0ebacdaad04ed9402c9f)
Reviewed-on: https://gerrit.libreoffice.org/59205
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: Ibe331066cb584d45391bdaad971e51ed958463c9
|
|
Change-Id: If2673b0bdd1489e8bd0bc60b8372756da8cf1533
|
|
Change-Id: I8d7844fc7e2f67bc338cb1fb67b2bf792aca38e3
|
|
Change-Id: I52427a36808fd47dabf4ba26916f626c7956389e
|
|
Change-Id: I2f3c6a1d8eea3dc00a221c81704f1724df65a226
|
|
Change-Id: I2fa339d6b874d4338ea0be5582fe75cdbb1df1b9
|
|
Change-Id: Ib9059106e224622990823f2a3b790e5899256385
|
|
...left there by 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc into
connectivity as a library". (And remove latter half of sentence that doesn't
make much sense anymore.)
Change-Id: Ic87bd243cfde61080e4afae14de5c3fe7c53824b
Reviewed-on: https://gerrit.libreoffice.org/59656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 760111784eb014091a445b3c5c2d1ad7b1b1ded7)
|
|
Change-Id: I41cfbf41247270d29e08e5125adc05aac198b175
Reviewed-on: https://gerrit.libreoffice.org/59608
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 5061663ce052087c6d5d0910d6f99358e26dbbd1)
|
|
since...
commit 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
Author: Tamas Bunth <tamas.bunth@collabora.co.uk>
Date: Thu Aug 16 16:35:17 2018 +0200
Moving mysqlc into connectivity as a library
Additionally I erased the remains of the old mysql C++ connector.
Also update the code where the clang plugins were unhappy after moving
the mysqlc module.
Remove mysql-cpp-connector external.
so we don't need the source to it
Change-Id: I0436e9f5a9cce87d0294cf3163a97a19566df1f4
Reviewed-on: https://gerrit.libreoffice.org/59605
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 44f878924648c23f5332e8a759b8c419b88724e1)
|
|
...left over from 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc into
connectivity as a library". (Apparently, for one, a module's Files that don't
exist are ignored, so 8ecf5e1815b5459bc0bbcdfb398d3bd53b0c2861 "Build fix, make
install: mysql-connector-ooo extension is gone" removing
gid_File_Oxt_MySQLConnector but not
gid_Module_Optional_Extensions_MySQLConnector referencing it didn't cause
trouble; and for another, an empty module is ignored, so there were no
extension-mysql-connector packages generated any more---but better clean up the
junk anyway.)
Reviewed-on: https://gerrit.libreoffice.org/59669
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 5988d888099d018ca1000bb17341c9529c538649)
Change-Id: If598a968dfbbe9b5f16d735e8011e192cbd4178b
|
|
Additionally I erased the remains of the old mysql C++ connector.
Also update the code where the clang plugins were unhappy after moving
the mysqlc module.
Remove mysql-cpp-connector external.
Change-Id: I771cc7afacf5012fc349afb6b36828fb0fee5a66
Reviewed-on: https://gerrit.libreoffice.org/59200
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/59713
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: Id09932212f348952fe9fb141dec1b5b13d727a54
Reviewed-on: https://gerrit.libreoffice.org/50989
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Unused ever since its introduction in b70d4ad13b909265c54a9ff55f07224a14e9feb2
"add --with-help=common parameter to the configure option". (Whether
--with-help=common is also unused is a different question that needs to be
addressed separately.)
Change-Id: Ic7843c838242bfe95dba7388f63358973f42e5b7
Reviewed-on: https://gerrit.libreoffice.org/53187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: I9b26f952dc681893b25712451535f4b539fd615d
|
|
Change-Id: I4debf079be228e5ce5fae5f1a153f78800407a59
|
|
This reverts commit 7e948427b09f4eb13eea812379ddacc01c28ef17.
|
|
This reverts commit 695489e29958ac66e6941afdedfdf9dd7e2cdde7.
|
|
MSP does not like this
This reverts commit c34783711b2eb207825de7fc7b7a6655ea65e576.
|
|
Change-Id: Ib7022c8c365cbcf9e4771198f81e0c205b78cded
|
|
Fixes CVE-2017-1000158.
Change-Id: I1871f031e3431253a3403f2ea2b586bcc4aa1016
Reviewed-on: https://gerrit.libreoffice.org/56609
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 744feb55a11263ae0947ab59db76b949b5863acf)
Reviewed-on: https://gerrit.libreoffice.org/56673
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit f764237989d8aa081a30b3518add39af4bb23632)
|
|
(cherry picked from commit ae8938f8848bcce96e21ee207c0226ff0a3cb4a2)
Change-Id: I1de9776e161161daf7349be304e05d5bb959f891
|
|
Change-Id: I4d550a6be50fe28d0537693e453acbbbe643cb7a
|
|
...as is used by the Flatpak build. Other settings only checked in that block
controlled by ENABLE_GTK, and thus potentially erronously left empty for
--disable-gtk --enable-gtk3 builds, are GTHREAD- and GTK_PRINT-related settings.
GTHREAD_LIBS is explicitly used in vcl/Library_vclplug_gtk3.mk even, but it
being empty apparently has no negative effects, so leave it at that for now.
On the GTK_PRINT-related settings, Caolan commented on IRC: "ENABLE_GTK_PRINT
is probably best removed entirely I guess, it didn't work out and they're
redoing the dialog in upstream gtk again I'm told."
Change-Id: I7e026c0ac9b23e7ace2c2e92390bdcc3be7d39a3
Reviewed-on: https://gerrit.libreoffice.org/55127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit b5dd045bf533a2ba4d1c98debe5a2acba4c8b486)
Reviewed-on: https://gerrit.libreoffice.org/55164
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a560bcbea943cb317e96c15c608c5e2f66e5698f)
|
|
Also remove questionable old "Hack needed at least by tml".
Change-Id: I478358ea114cee2f8a181b98cb3433447b3ed560
Reviewed-on: https://gerrit.libreoffice.org/54081
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit fc00041df85fd508d1fc34658d4c9ceeb10084b1)
|
|
Change-Id: Ibf3befe2f017387fd196718b9284a7226953b7a4
|
|
Change-Id: If85be11de1e91253f64e1046da5f0682a0e35e1a
|
|
Using nested install is bad because (1) MS advises against it (though it
most possibly doesn't relate to our specific case, when we install the
vc redist exe package in UI part, so actually only a single MSI session
is active at any time); (2) because it adds some extra interactions
(user sees something "unrelated" being installed, which raises concerns;
additional admin authentication required); and (3) because it runs in
InstallUISequence, thus only installing the UCRT when doing interactive
installation (unattended installs, including GPO, need to install UCRT
separately).
This patch aims to incorporate the original UCRT MSU (Windows Update)
packages (https://support.microsoft.com/en-us/help/2999226) available as
a zip archive from
https://www.microsoft.com/en-us/download/details.aspx?id=48234
- the same as used in VC redists for VS 2015 and 2017. This obsoletes
the separate installation of the redist; since we also have the redist
as merge module in our MSI, that is enough (and removes redundancy).
The MSUs are installed using wusa.exe in a custom action (deferred,
non-impersonating).
As a small bonus, embedding MSUs instead of redist EXE allows us to
shrink the size of installer a little (~10 MB).
As deferred custom actions cannot access current installer database,
we workaround this by using initial immediate impersonating action to
extract the binaries into a temporary location. To ensure that the file
gets removed upon completion (both successful and failed), we use an
additional cleanup action.
Commit 61b1d631331551b43bc7d619be33bfbfeff7cad6 is effectively reverted.
This commit also includes changes from commits from master:
8faa1bc61fa8f09365d483364aea2b1c2751b587
1f8a3657216e44796cb94087450552aa977ebdae
378c1576d2890625ebbd18ec9ccff560eeb1619f
Change-Id: I1529356fdcc67ff24b232c01ddf8bb3a31bb00bd
Reviewed-on: https://gerrit.libreoffice.org/53332
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
Apparently the MSMs have been renamed in Visual Studio 2017.3 but only
configure was adapted, not scp2.
Not sure if these MSMs are still relevant given the new
gid_File_Vcredist_Exe thing.
Change-Id: I4fe27c8298b3a2024acc62d12ce8ea67e2eca80d
Reviewed-on: https://gerrit.libreoffice.org/53319
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
The relevant error message in configure is:
> checking for al.exe... configure: error: al.exe not found as /al.exe
Change-Id: I24be20fdedf36153e4012dde6d7cc899098f769e
Reviewed-on: https://gerrit.libreoffice.org/52479
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 5bf00019c2bbe2045d3da7d98552c601309142b5)
Reviewed-on: https://gerrit.libreoffice.org/53304
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: I6c08476710ab541ff9b9407f5d874dbb038990df
|
|
Change-Id: I4c20ab9051b49149d4cd52339a61c98f5f62226b
(cherry picked from commit 2fc7778ba2ce545ecb6bd2e60a09eeb8fdb44b49)
|
|
Change-Id: Id7501b9adcd817ce84bfde3a928fe8b4c7e7e01f
Reviewed-on: https://gerrit.libreoffice.org/52330
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit e2e3118465411448a3b1f5e56c3456384c009f99)
Reviewed-on: https://gerrit.libreoffice.org/52382
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit e336b70550a5615a9b6fd1848c5785fe54c3156a)
|
|
This squashes the following commits:
From f68929ac611fdda19c1ee413effc59d33aa5ef97 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Date: Fri, 9 Mar 2018 01:38:26 +0100
Subject: gpg4libre: fix failing gpg test due to over-long filenames
With long workdir path, gpg sometimes fails with 'gpg: can't connect
to the agent: File name too long' error.
WK recommends to create preferred socket dir under /run/user, needs
prepping though via gpgconf.
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=84720
From d7ecf4a4e37a9eeffa2b40f9fe5a2e6a8f90c876 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 18 Mar 2018 11:25:41 +0100
Subject: properly check for gpgconf (and --create-socketdir) working
From d6ed1d415d36809d784af780231258ea0ee1024f Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 18 Mar 2018 19:06:58 +0100
Subject: actually add GPGCONF to config_host.mk.in
From 7a95ee8d0badb2cbbd137a6e18af1bada35ae933 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 18 Mar 2018 19:26:45 +0100
Subject: actually add HAVE_GPGCONF_SOCKETDIR to config_host.mk.in...
From 5204a5145d8232ea0650144fb4756c38303ef06e Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 18 Mar 2018 19:28:55 +0100
Subject: revert accidentially comitted local changes :(
From bc358d39ac985914160e8aaa23b29469470c032b Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 18 Mar 2018 20:36:45 +0100
Subject: this is sh, not make...
Change-Id: I7880fd7eee57cedc19b72348b45f0c1389409fe6
Reviewed-on: https://gerrit.libreoffice.org/51521
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 74d438f716d9cef165c78f950d4c53a46c37503c)
|
|
(We do require bash for other parts of the build, though, and have no
plans to change that. But let's make the bug reporter happy here.)
Change-Id: I4bcd3a86fb4e6f95d4eec8557faf359bf5549c03
(cherry picked from commit c902cbc7dc5294ab721a9aef3a152aa243d00011)
|
|
(cherry picked from commit 8958ed763e91794ed744a75c59461c745a42bc63)
Change-Id: I91bf310c77927e24c0693dc5b0b1297f11c001a0
|
|
(cherry picked from commit ace78a2e440cc71ba69179c2c715e1d96981a8cb)
(cherry picked from commit 6583d52f0287d88fbb79ee10e4e4fcc516c5b38e)
Change-Id: Id46452b5121077de7d5368257b538a85d1ef7dae
|
|
(cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc)
(cherry picked from commit c085f9176bda7bad0234d0087ff87f27086fc333)
Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
|
|
Conflicts:
configure.ac
Conflicts:
configure.ac
instsetoo_native/util/openoffice.lst.in
(cherry picked from commit dec4b25aaceeba671c0c3f7f81ef13e5b8e42e00)
Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487
|
|
This is a collection of the following:
(cherry picked from commit 20945a9a4de6684010fd5b3603595e6da543807d)
(cherry picked from commit a1c36eff089c3cd695bd78090575ca1c7677121e)
(cherry picked from commit 45a4e70484e7d90dab07a677914ada2d948b415c)
with all necessary changes to resolve conflicts & preserve correct
handling of font and cell background color imports.
Change-Id: I08eb3495adf74858bb23a84245a9923ebe2a13e2
Reviewed-on: https://gerrit.libreoffice.org/50213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Change-Id: Ia3299fda6e1639e21b21030b2f4b1cf6506956ae
|
|
Change-Id: I6d86af6663fdac9e8704f23a862a31de184708d1
|
|
Change-Id: I7e41676965b6d98612ae697d65a5644fe0544649
Reviewed-on: https://gerrit.libreoffice.org/48917
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
Change-Id: Ifa75f323cb631c24c1825481355571ff04f50885
|
|
... in InstallUISequense.
Use --with-vcredist-dir to point to a directory with vc_redist.x64.exe
and/or vc_redist.x86.exe. Use --without-vcredist-dir (or
--with-vcredist-dir=no) if you don't want to ship it as part of
installer and want to silence the configure warning.
VCRedist 2015 version 14.0.24215.1 is available at
https://www.microsoft.com/en-us/download/details.aspx?id=53840
Since VisualStudio 2015, VC redist merge module that we used before
started to work differently: it installs the UCRT only on WinXP,
but not on later OSes (Vista to 8.1) which may lack the UCRT (Win10
has it out of the box). The merge module only installs VCRuntime on
those systems, which still leaves us with "api-ms-*.dll is missing"
problem.
(https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/
gives more information on VCRedist refactoring background.)
Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a
workaround described at the page mentioned above as "App-local
deployment of the Universal CRT". We just copy all UCRT DLLs to
LibreOffice/program. This has a drawback though, that our UCRT
is not updated by Windows Update, so users would rely on LibreOffice
updates in case of some vulnerabilities in UCRT (and they could
even not realize they have that problem).
MS recommends to install UCRT using EXEs they provide from their
site. The EXEs install both VCRuntimes and UCRTs, along with
required patches, for all Windows versions (Windows XP through
Windows 10, where they only install VCRuntimes); the installed
libraries are managed by system's update mechanism. But those EXEs
cannot be used in MSI custom actions inside InstallExecuteSequence,
because they use MSI themselves.
So this patch integrates the vc_redist.xXX.exe into MSI binary
table, and uses custom action to run the EXE after ExecuteAction
in InstallUISequence. This will show the user a VCRedist install
window after the main LibreOffice installation finishes; no user
interaction is required (except for one additional UAC request),
and errors are ignored.
Since this installation takes care of both VCRuntime and UCRT,
we can ultimately drop both the app-local workaround, and
vcredist merge module (so VCRuntime would also be updated by
system). The former is done here: this reverts commit
71d9a61302e65fe091cf70c13fa72b3df09b7e3a.
This approach has its drawback: if one wants to use unattended
installation (without UI; one example is deployment using
ActiveDirectory GPO), then InstallUISequence is not run, and so
VCRedist isn't installed. In this case, one should install
VCRedist separately. Supposedly this should not be huge problem,
because this is the case for many existing applications that need
separate VCRedist deployment in these scenarios, and unattended
installation is advanced stuff that requires prepared user. A
notice would be required in release notes and FAQ, though.
Change-Id: Ia6a16be60af8a08f41ea7c3dbd457d8f89006006
Reviewed-on: https://gerrit.libreoffice.org/46356
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 61b1d631331551b43bc7d619be33bfbfeff7cad6)
Reviewed-on: https://gerrit.libreoffice.org/47603
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Change-Id: Ic7a87fdb4eb56490b189171908299e41a69a75b3
|
|
Change-Id: I1a5653669f5d15b5cdca0967c82263f0b7d17b3c
Reviewed-on: https://gerrit.libreoffice.org/46470
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/46492
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|