summaryrefslogtreecommitdiff
path: root/config_host.mk.in
AgeCommit message (Collapse)AuthorFilesLines
2021-10-26Install UCRT from MSUs, not using nested VC Redist installMike Kaganski1-1/+0
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>
2017-11-02tdf#108580 ship universal crts with the program as workaroundChristian Lohmaier1-0/+2
the universal crts redistributables are available as part of the Windows 10 SDK. Point to the dir (or a copy of the dir) using --with-ucrt-dir Use --without-ucrt-dir (or --with-ucrt-dir=no) if you don't want to ship them as part of LO and are annoyed by the configure warning. Change-Id: I5487e3f6e583222fa053b2fc03176f061d57746c Reviewed-on: https://gerrit.libreoffice.org/44074 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a) Reviewed-on: https://gerrit.libreoffice.org/44122
2017-07-04xmlsecurity: implement support for building against system-xmlsecMiklos Vajna1-0/+3
The only remaining difference is that in the system-xmlsec case we work with the default key manager, not with the one that's only added by our xmlsec patches. This works for me for the uses I know of (see <https://lists.freedesktop.org/archives/libreoffice/2017-February/076947.html> for the motivation): signing and verifying of different signatures (bad signature, good with non-trusted CA, good with trusted CA) with software-based certificates all behave as expected. Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06 Reviewed-on: https://gerrit.libreoffice.org/39075 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/39274 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org>
2017-05-29Re-enable building with ICU 59, tdf#108043 follow-upEike Rathke1-0/+1
After having reverted to internal ICU 58, still be able to build with ICU 59. Change-Id: If2cf651aaacee5f64bee737f9da140b913ebd510 Reviewed-on: https://gerrit.libreoffice.org/38154 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-29Resolves: tdf#108043 Revert "Upgrade to ICU 59.1"Eike Rathke1-1/+0
As it would force us to not run on XP *AND* Vista anymore already with this 5.4 release. This is a combination of 4 commits. Revert "Add ICU ticket number for this patch" This reverts commit e24cd3818821971fe3c52820dafe0f5ccb4b023a. Revert "Add ICU ticket number for this patch" This reverts commit 8720877b8b6bc96e330842f7391ae49a21ec2f63. Revert "Upgrade to ICU 59.1 follow-up: only add icu/source/data/misc/icudata.rc" This reverts commit 89de6f62ae1e96d2c492cb5cd8f7d313b51e2f98. Revert "Upgrade to ICU 59.1" This reverts commit fabad007c60958f2ff87e8f636ff6a798ad1f963. Change-Id: Idd2bfecf7f3c148ee404322e7287ac236c46b6cf Reviewed-on: https://gerrit.libreoffice.org/38143 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-04-28build boost::locale libraryCaolán McNamara1-0/+1
Change-Id: I40b89a0df483645fc743fb092d3d39ea682c510c Reviewed-on: https://gerrit.libreoffice.org/37060 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-04-26Upgrade to ICU 59.1Eike Rathke1-0/+1
Also regenerated all patches using make icu.genpatch (hence the .1 suffix that indicates the path level) as some hunks did not apply anyway and all now have the correct offset. Using genpatch may have the future benefit to yield smaller diffs between different versions of patches. Also prefixed all patch names with icu4c- for a cleaner listing. New patches introduced are prefixed with icu4c-59-... Change-Id: Ia83754b0823839887fce1a1d4ed04f8375b113c2 Reviewed-on: https://gerrit.libreoffice.org/36809 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-04-14remove the old collaboration feature based on telepathyMarkus Mohrhard1-3/+0
Change-Id: I1f08d6ef43b76e7bae41ac33bb954f506ae7c485 Reviewed-on: https://gerrit.libreoffice.org/36542 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-04-10gbuild: revert to -O0 instead of -Og for GCC --enable-debug/dbgutil buildsMichael Stahl1-1/+0
Unfortunately -Og doesn't work as well as advertised, variables are optimized away too often. See thread at https://lists.freedesktop.org/archives/libreoffice/2017-April/077479.html Change-Id: I5fc141ea9c7c6931aaf8220c7abf6b413326049e
2017-03-27Remove last use of md5sum (in building)Bryan Quigley1-1/+0
Switch to using sha256sum for checking if files change. Not for security, just so we don't need to check for md5sum. We also change the Windows installer to rely on the perm md5 digest instead of the environment variable. The code to do this was already in directory.pm Change-Id: I24aed542c6201abf030fdd62116aec3f8ea3513b Reviewed-on: https://gerrit.libreoffice.org/35140 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-03-14No need for --disable-activex and --disable-atl any longerTor Lillqvist1-2/+0
Change-Id: I7ac4f32cb01bfcc3a2c06e69280c2150d408ec6b Reviewed-on: https://gerrit.libreoffice.org/35174 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2017-03-03Move file download verification from md5sum to sha256sumBryan Quigley1-0/+1
This leaves all the md5sum parts in place for now, but switches to using sha256sum. Tries both shasum -a 256 and sha256sum. Change-Id: I393d0dde56521f6e9e76f3d5a8d15c6c830fd683 Reviewed-on: https://gerrit.libreoffice.org/34633 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2017-02-24Always enable liblangtagKhaled Hosny1-1/+0
The license should not be an issue any more since liblangtag now has an LGPL/MPLv2 dual licence. Change-Id: I4dfffcccf5d710bd16b21c3254c1449ae041b8ab Reviewed-on: https://gerrit.libreoffice.org/34511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-02-23gpg4libre: We want to use C++ library insteadKatarina Behrens1-3/+3
in particular, the one from gpgme project. configure check is set up in such a way that it will fail with older gpgmepp that depends on KDE development packages. This means Linux distros released before 2016 have to rely upon in-tree version, but such is life ... Change-Id: I5cdceffad6e81643603fcdee57a7656218f76834 Reviewed-on: https://gerrit.libreoffice.org/34130 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-23HAVE_GCC_PRAGMA_OPERATOR is only needed as AC_DEFINEStephan Bergmann1-1/+0
Change-Id: I1f1978bbc8c38a7d5504fb86b8a716cbbc01c830
2017-02-21When building with clang-cl on Windows, build CLR code with MSVCStephan Bergmann1-0/+1
...as clang-cl doesn't support the /clr switch. * In configure.ac, capture the MSCV version (that would be used if CC hadn't been overridden to use clang-cl) into MSVC_CXX. * The logic which flags to pass into gb_CObject__command_pattern is coded into the platform-agnostic LinkTarget.mk, so it's too late to try and filter all relevant flags in com_GCC_class.mk, depending on whether a given .cxx file is a normal one built with the normal $CXX or a special /clr one built with $MSVC_CXX. Thus, a new CxxClrObject class had to be introduced that captures this information early. * When building with clang-cl, the generated config_host/config_*.h files contain values suitable for clang-cl, but not for MSVC. But the .cxx files compiled with MSVC happen to include config_global.h, and would fail. Hack around that problem for now by introducing a hard-coded, minimal solenv/clang-cl/config_global.h that is found first when buliding such a CxxClrObject. Needs cleaning-up properly. Change-Id: Iff8aac51c0b4fa906b14503c692640dda0996d33 Reviewed-on: https://gerrit.libreoffice.org/34509 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-16gpg4libre: Build internal libgpg-error, libassuan and gpgme(pp)Katarina Behrens1-0/+4
Change-Id: I1953e7062b872340b844771adc8ebe40f524cc76 Reviewed-on: https://gerrit.libreoffice.org/34227 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-10Remove MinGW supportStephan Bergmann1-8/+0
In OOo times, there'd originally been efforts to allow building on Windows with MinGW. Later, in LO times, this has been shifted to an attempt of cross- compiling for Windows on Linux. That attempt can be considered abandoned, and the relevant code rotting. Due to this heritage, there are now three kinds of MinGW-specific code in LO: * Code from the original OOo native Windows effort that is no longer relevant for the LO cross-compilation effort, but has never been removed properly. * Code from the original OOo native Windows effort that is re-purposed for the LO cross-compilation effort. * Code that has been added specifially for the LO cross-compilation effort. All three kinds of code are removed. (An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing --with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.) Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568 Reviewed-on: https://gerrit.libreoffice.org/34127 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-10add --disable-pdfiumCaolán McNamara1-0/+1
Change-Id: I9137dc0030c3c752ffc0931721bf6b0013309d39
2017-02-07Remove MINGW_CLIB_DIR left-overStephan Bergmann1-1/+0
...after b28f25aa9eeed71bd3f399a9c8fc4f1497b92e82 "MINGW_CLIB_DIR is unused" Change-Id: I8395d492120455378ec001e37428a645aa879440
2017-02-07Remove HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION left-overStephan Bergmann1-1/+0
...after 4c18af27bf95b332ee2006cfc0bbf469fb1a84d4 "tdf#96398 kill remaining NPAPI support for plugins _inside_ LO" Change-Id: Ide62fa142108562c191ca95ab307638178476fea
2017-02-07Remove GNOMEVFS left-oversStephan Bergmann1-2/+0
...afer b40b6010077f875565ce90cd995222451e37321c "ditch gnome-vfs2 support" Change-Id: I0a57da5f2d810e78837035c86ee1f03ae33aacd8
2017-02-07Remove DBUSMENUGTK left-oversStephan Bergmann1-2/+0
...after 4e7f9650e2a32b648cbd50ab113955920f960354 "remove ancient lo-menubar implementation now that we have the shiny new one" Change-Id: I49e7a5489279aaf3469d14c4e9d75245203c5937
2017-02-02drop bundled ooo2gd (Google Docs) extensionDavid Tardon1-1/+0
LibreOffice has had direct support for Google Drive since (I think) 5.1, via libcmis. Change-Id: I7587923b3fd7dd505124b790066cdaa99a858af1 Reviewed-on: https://gerrit.libreoffice.org/33822 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-02-01Adapt CustomTarget_odk/build-examples to macOSStephan Bergmann1-0/+1
Change-Id: Ib64d5b5fa1bf13a484adb296b969d1b96387f0c6
2017-02-01gpg4libre: Support building --with-system-gpgme (Linux only so far)Katarina Behrens1-0/+3
Change-Id: I22af89b920d43f3fc5f0fff02070f288bfa59fb4 Reviewed-on: https://gerrit.libreoffice.org/33702 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2016-12-20use new ENABLE_NSS for code which needs nssCaolán McNamara1-0/+1
which isn't available on a static-only build (iOS and fuzzing) and android Change-Id: I99bb7c0b45d4499579ddf73f469a762ddcae99ab Reviewed-on: https://gerrit.libreoffice.org/32182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-13change from glew to epoxyCaolán McNamara1-3/+3
because that works under wayland out of the box and gtk3 uses it already Change-Id: Iefaac31e325534a81a5389f752804af917c1baef Reviewed-on: https://gerrit.libreoffice.org/31213 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-08Retire the --disable-export optionTor Lillqvist1-1/+0
It was never fully implemented, and its usefulness is unclear. Change-Id: I86dee8ee6326bdfaa178260c76188261aef2fb4c
2016-12-05optionally enable oss-fuzz targets via --enable-fuzzersCaolán McNamara1-0/+1
Change-Id: I16f52515a149a1e6e47cd0301a45db84ddd95885
2016-12-01enable optimization (-Og) with --enable-debugLuke Deller1-0/+1
gcc-4.8 introduced a new optimization level -Og which enables optimizations that do not interfere with debugging. When configured with --enable-debug, use -Og rather than -O0 if available. Change-Id: Iff3f98d736681ae34e49b96510228a14ce456b34 Reviewed-on: https://gerrit.libreoffice.org/31333 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-11-28orcus is mandatory nowMarkus Mohrhard1-1/+0
We use it as a json parser, for calc cell styles and tests. Making it optional is just making the code more complex and introduces more sources for errors. Change-Id: I8769628a4ab9519cafc3d43db7c0007e0aa265dc Reviewed-on: https://gerrit.libreoffice.org/31307 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-11-26Kill old Graphite layout enginesKhaled Hosny1-1/+0
Change-Id: Ia19d4d0a3a33694b6edfff62e6b40028dac19677 Reviewed-on: https://gerrit.libreoffice.org/31212 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
2016-11-16Exit GLyphyTor Lillqvist1-3/+0
Change-Id: Ib84e703d4c1528d022435c7695c97a3fc284563a
2016-11-02poppler: build against libjpegMichael Stahl1-0/+2
Albert Astals Cid points out that --disable-libjpeg causes poppler to use internal JPEG code instead, which is not actively maintained. Add LIBJPEG_CFLAGS / LIBJPEG_LIBS to config_host.mk and patch poppler to respect LIBJPEG_LIBS. Change-Id: Id19a62a9bd9dc41fee5e8e43e2798e515aacc299 Reviewed-on: https://gerrit.libreoffice.org/30496 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-10-25Add configure option --enable-formula-logger to conditionalize it.Kohei Yoshida1-0/+1
Change-Id: I1badbcfa259b22d742e5241bd817ea44769a771e
2016-10-18Always build HarfBuzz everywhereKhaled Hosny1-1/+0
It is no longer an optional feature on any platform. Change-Id: I70cdcd2c0df69d961ecc5f36b4e8d035d251ef16
2016-09-23Clarify KDE4 and TDE config variablesJan-Marek Glogowski1-5/+5
The configure flag is already --enable-kde4, so rename most build and configure variables, including the config headers, and the build module to include the major number. Also rename the TDE MOC stored as $MOC to $TDE_MOC to prevent conflicts. Change-Id: Ib947ae4b80349cc52eac7812cb93e8a42606b526
2016-09-20Remove HAVE_GCC_VISIBILITY_BROKEN, never trueStephan Bergmann1-1/+0
The check for broken -fvisiblity-inlines-hidden doesn't mention a specific bug. Its roots date back to 072e89cf68dcf9b6713945e402dd7a9fe5cea48d "INTEGRATION: CWS newportstl" of the --with(out)-stlport area. Lets assume whatever failure is long since fixed. Make this a fatal configure error for now. The check should be removed completely after LO 5.3 branch-off. Change-Id: I7c64c2e8b9bd342beec9b84ff71f5712a6155b7d Reviewed-on: https://gerrit.libreoffice.org/29075 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-20[API CHANGE] Remove HAVE_GCC_VISIBILITY_FEATURE, always trueStephan Bergmann1-1/+0
* GCC documents -fvisibility at least as far back as the GCC 4.0 online documentation at <https://gcc.gnu.org/onlinedocs/gcc-4.0.4/gcc/Code-Gen-Options.html>. * For external code, odk/settings/settings.mk unconditionally set HAVE_GCC_VISIBILITY_FEATURE for all platforms other than Windows. Make this a fatal configure error for now. The check should be removed completely after LO 5.3 branch-off. Change-Id: I1de415b6ed1591e0a7b6640ece861b6f0ef74112 Reviewed-on: https://gerrit.libreoffice.org/29073 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-08Remove obsolete OxygenOffice bitsGabor Kelemen1-20/+0
Since 77104ccd7658cb8f3ac142ea9f7fabc15fc08580 the OxygenOffice distro configs are removed and no other official distro uses these. Change-Id: I2b4d5fea7e4b9098ac88733821af219db23c48fe Reviewed-on: https://gerrit.libreoffice.org/28738 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-09-05gbuild: remove hardlink deliverThorsten Behrens1-1/+0
Since there's hardly any 'deliver' going on anymore... Change-Id: Id349958d299c9742382d37deab2125bc09930c14 Reviewed-on: https://gerrit.libreoffice.org/28655 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-08-26Remove gcj support from build system.Thorsten Behrens1-1/+0
Change-Id: I79fe046ff8c932c5f6a9a5f70970168e42d23702 Reviewed-on: https://gerrit.libreoffice.org/28406 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2016-08-25Bump JDK buildtime requirement to 1.6Thorsten Behrens1-1/+0
Change-Id: I3dc715f3cd924d681658829254fd1392677d9e73 Reviewed-on: https://gerrit.libreoffice.org/28382 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2016-08-18external/firebird: Make GCC check work for Clang, tooStephan Bergmann1-0/+1
Randomly approximate that HAVE_GXX_FNO_SIZED_DEALLOCATION also implies support for -fno-delete-null-pointer-checks, and hope that approximation matches the various versions of GCC and Clang that are relevant for us. Change-Id: I265bf3432a852a094318a54975403eac60721ab4 Reviewed-on: https://gerrit.libreoffice.org/28211 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-08-17Use correct path to the build platform's services.rdb when cross-compilingTor Lillqvist1-0/+1
Requires introducing LIBO_URE_MISC_FOLDER_FOR_BUILD. Change-Id: I133a7f73e48090f67764838b45de4fe8b7580efe
2016-08-11integrate libstarofficeosnola1-0/+3
Change-Id: I85913f1bd1af5d102573040588cca9d8ddeebb5d
2016-08-04Introduce --with-product-name superseding --with-macosx-app-nameTor Lillqvist1-1/+1
The new option thoroughly replaces the product name mentioned in the AC_INIT() call. Work in progress. Also take care of spaces in the product name in a more systematic fashion. This should affect mainly OS X where the final app bundle that is installed should use the product name as such, including spaces, if any. However, our build system does not cope that well with having an app bundle with spaces in it in instdir. So in instdir, and also in test-install, spaces are stripped away from the product name when used as part of the app bundle name. Change-Id: Ic16b5039f23c96a4f39387a1869faeb25e05aafb
2016-08-03Reduce ENABLE_OPENGL / ENABLE_HEADLESS confusionTor Lillqvist1-1/+1
ENABLE_OPENGL means whether to enable the OpenGL slideshow transition code. It does not mean whether to enable use of OpenGL in general. So rename it to ENABLE_OPENGL_TRANSITIONS while at it. ENABLE_HEADLESS means whether to disable use of X11 and OpenGL on X11 (and Wayland) platforms, I think, meaning Linux and maybe Solaris and the BSDs. Maybe it should be renamed to DISABLE_X11_AND_OPENGL. Change-Id: Ibb30f51646b1bcc477fe691a3fa38c7a1e3944ae
2016-06-23integrate libzmfAleksas Pantechovskis1-0/+3
Change-Id: I0c7ea5b56ea4ed4839ff38798c0b915aaca81774 Reviewed-on: https://gerrit.libreoffice.org/26574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>