Skip to content

C
core
Dal (branch)/etiket değiştir
  1. 07 Mar, 2019 1 kayıt (commit)
  3. 10 Şub, 2019 1 kayıt (commit)
  5. 28 Ara, 2018 1 kayıt (commit)
  7. 17 Ara, 2018 1 kayıt (commit)
  9. 09 Ara, 2018 1 kayıt (commit)
  11. 22 Eyl, 2018 1 kayıt (commit)
    • Stephan Bergmann's avatar
      external/harfbuzz's libharfbuzz.a links against icuuc library · 0a554243
      Stephan Bergmann yazdı 
      buovjaga reported on IRC that his build (implicitly --without-system-harfbuzz
--without-system-icu) failed to link e.g. Library_vclplug_gtk3 due to harfbuzz
missing symbols from ICU, like

> /usr/bin/ld: /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a(libharfbuzz_la-hb-icu.o): in function `hb_icu_unicode_decompose_compatibility(hb_unicode_funcs_t*, unsigned int, unsigned int*, void*)':
> /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/hb-icu.cc:334: undefined reference to `unorm2_getNFKDInstance_62'
[...]

It is not clear to me why Library_vclplug_gtk3 would actually use
libharfbuzz.a's hb_icu_unicode_decompose_compatibility (and for e.g. my builds,
it apparently doesn't), but in general libharfbuzz.a does depend on some symbols
from icuuc, so it is correct to add icuuc to the link when linking against
harfbuzz.  (And "gb_LinkTarget_use_external,...,icuuc" conveniently only adds
libs for linking, and does not add C/C++ include file paths, which would not be
wanted here.)

(<https://gerrit.libreoffice.org/#/c/60882/> "Revert 'Add more more dependencies
to VCL makefiles'" was a false start trying to address the above issue.)

Change-Id: Ic8bcfa2aab185f8a9487d7787b4f22068e7cb481
Reviewed-on: https://gerrit.libreoffice.org/60898
Tested-by: Jenkins
Reviewed-by: 's avatarIlmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
      0a554243
  13. 31 Agu, 2018 1 kayıt (commit)
  15. 30 Agu, 2018 1 kayıt (commit)
  17. 27 Agu, 2018 1 kayıt (commit)
  19. 26 Agu, 2018 1 kayıt (commit)
  21. 24 Agu, 2018 1 kayıt (commit)
  23. 22 Agu, 2018 1 kayıt (commit)
  25. 08 Agu, 2018 1 kayıt (commit)
  27. 21 Haz, 2018 1 kayıt (commit)
  29. 17 May, 2018 1 kayıt (commit)
  31. 04 May, 2018 1 kayıt (commit)
  33. 03 May, 2018 1 kayıt (commit)
  35. 25 Nis, 2018 1 kayıt (commit)
    • Mike Kaganski's avatar
      Install UCRT from MSUs, not using nested VC Redist install · b8424437
      Mike Kaganski yazdı 
      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 61b1d631 is effectively reverted.

Change-Id: I1529356fdcc67ff24b232c01ddf8bb3a31bb00bd
Reviewed-on: https://gerrit.libreoffice.org/52923Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
      b8424437
  37. 12 Nis, 2018 1 kayıt (commit)
  39. 10 Nis, 2018 1 kayıt (commit)
  41. 08 Mar, 2018 2 kayıt (commit)
  43. 07 Mar, 2018 1 kayıt (commit)
  45. 28 Şub, 2018 1 kayıt (commit)
  47. 03 Şub, 2018 1 kayıt (commit)
  49. 23 Ock, 2018 1 kayıt (commit)
  51. 19 Ock, 2018 1 kayıt (commit)
    • Michael Stahl's avatar
      fix libxml2 dependency on icu · 0c3838bd
      Michael Stahl yazdı 
      liblangtag build runs a "reg2xml.exe" which requires the ICU dlls in
instdir.

Change-Id: Icf44c51e802636de613f76a25fb16a567a8d982d
      0c3838bd
  53. 18 Ara, 2017 1 kayıt (commit)
    • Mike Kaganski's avatar
      tdf#108580: integrate vc_redist.exe into MSI · 61b1d631
      Mike Kaganski yazdı 
      ... 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 71d9a613, 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
71d9a613.

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/46356Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
Tested-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
      61b1d631
  55. 14 Ara, 2017 1 kayıt (commit)
  57. 08 Ara, 2017 1 kayıt (commit)
  59. 26 Kas, 2017 1 kayıt (commit)
  61. 24 Kas, 2017 1 kayıt (commit)
  63. 23 Kas, 2017 2 kayıt (commit)
  65. 22 Kas, 2017 1 kayıt (commit)
  67. 18 Kas, 2017 1 kayıt (commit)
  69. 06 Kas, 2017 2 kayıt (commit)
    • Jan-Marek Glogowski's avatar
      QT5 rename from KF5 · 2ffb83da
      Jan-Marek Glogowski yazdı 
      Move out of unx, as this will eventually compile on other
OS platforms. At least currently it doesn't contain platform
dependant code.

Change-Id: Iea0bebf574201881ea158381fe7ba8af2a9a6488
      2ffb83da
    • Jan-Marek Glogowski's avatar
      KF5 initial VCL plugin · 9335945c
      Jan-Marek Glogowski yazdı 
      Something that compiles, basically just interface stubs.
All used Svp classes don't use any cairo.

Change-Id: I9a8858c930989438cc2a3f3346c01a7abc579d62
      9335945c
  71. 30 Eki, 2017 1 kayıt (commit)
  73. 26 Eki, 2017 1 kayıt (commit)