summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)Author
2018-02-24tdf#115968: make libcmis work better with CIB doximaAndreas Brandner
Change-Id: I1758bcee9a191937ed265dc26212f259a59fffef Reviewed-on: https://gerrit.libreoffice.org/50231 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-02-23tdf#115828: hsqldb supports multiple resultSetsJulien Nabet
Regression from 3c567e55e6aed9e0da892d8b9fc09f8a0c784fcc Thank you to Lionel for this suggestion Change-Id: I5eeadc1968e57d586e55a7aa5488b2ab3ee43724 Reviewed-on: https://gerrit.libreoffice.org/50202 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins <ci@libreoffice.org>
2018-02-20gpgmepp,xmlsecurity: fix testODFEncryptedGPG() failure caused...Michael Stahl
...by CppunitTest setting LD_LIBRARY_PATH to include instdir/program. This causes the spawned gpg-agent to load instdir/program/libassuan.so.0 instead of /usr/... and fail with: writev(2, [{iov_base="gpg-agent", iov_len=9}, {iov_base=": ", iov_len=2}, {iov_base="relocation error", iov_len=16}, {iov_base=": ", iov_len=2}, {iov_base="gpg-agent", iov_len=9}, {iov_base=": ", iov_len=2}, {iov_base="symbol assuan_sock_set_system_ho"..., iov_len=118}, {iov_base="", iov_len=0}, {iov_base="", iov_len=0}, {iov_base="\n", iov_len=1}], 10) = 159 The failure happens in the libreoffice-6-0 branch on Fedora 27, whereas the master branch doesn't fail because it has a newer version of libassuan that happens to provide the required symbol. Fix this by applying the patch that was added for ASAN in d15f042abd5a1093984a0c8380837145f38c4efc to clear LD_LIBRARY_PATH always on Linux. Change-Id: I6a5c7fdfdd32234f39a182581b03d79739880c11 Reviewed-on: https://gerrit.libreoffice.org/50056 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-02-15Update orcus to 0.13.3.Kohei Yoshida
This will be the new baseline for master, since, though this change is a fully API-compatible, one bug fix wrt the alpha value handling unfortunately would break some unit tests when using an earlier version. Change-Id: I5a17ce4085d3311a165748154d107d12b95e2c71 Reviewed-on: https://gerrit.libreoffice.org/49784 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2018-02-14pdfium: disable custom allocatorMiklos Vajna
That causes problems on aarch64 (see <https://lists.freedesktop.org/archives/libreoffice/2018-February/079384.html>) and provides little benefit to our use-case. Change-Id: I133d41476ab84cec67abc5b36a1e16c91bc6ac15 Reviewed-on: https://gerrit.libreoffice.org/49684 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-02-14Pick up hidden row and column flags when importing via orcus.Kohei Yoshida
Change-Id: Idf2530935eb93339602ac5f6a5d0547aa56b453a Reviewed-on: https://gerrit.libreoffice.org/49695 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2018-02-11Replace non-us-ascii characters that cause build failure on cp-950Mike Kaganski
Change-Id: Ic3d09cbc20b6bbfcaa15d46bae332945e42ccb3d Reviewed-on: https://gerrit.libreoffice.org/49560 Reviewed-by: Mark Hung <marklh9@gmail.com> Tested-by: Mark Hung <marklh9@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-02-09Pick up cell border colors when importing via orcus.Kohei Yoshida
Change-Id: Iee2d79930d0c917518b180fdd63fe30c6860b9b1 Reviewed-on: https://gerrit.libreoffice.org/49466 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2018-02-03tdf#114635: Add TWAINDSM.DLL to 64-bit Windows packageMike Kaganski
This patch allows us to use our own bundled TWAINDSM.dll (from twain-dsm project, http://www.twain.org, https://github.com/twain/twain-dsm) on 64-bit Windows systems that don't have their own TWAIN DLL, and without requiring users to install it from some other source. The DLL is put into INSTALLOCATION/program along soffice.bin. Of course, TWAIN sources still need to be 64-bit themselves (i.e., true 64-bit TWAIN drivers required) to be usable by 64-bit program. Also this drops external/twain/inc/twain/twain.h, which is an old version copied from twain-dsm, and instead uses the tarball to get the header (required by Library_scn on both 32- and 64-bit Windows). Change-Id: I191027f3221ce46db17f50db91c9cb9315900810 Reviewed-on: https://gerrit.libreoffice.org/46992 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-02-02Correctly import solid fill color.Kohei Yoshida
In orcus, a solid fill type uses the foreground color only and ignores the background color. Also, let's not use the alpha component as it would cause the color to not get rendered at all. Some patches are applied against liborcus in order to adjust the ODF styles import code for this change. These changes will be incorporated in 0.13.3. Change-Id: I9e8c243cc6a7f366de2393e7b7ecf77366f5f9ea Reviewed-on: https://gerrit.libreoffice.org/49071 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2018-02-01external: MSVC: pragma warning: make more specific, remove obsoleteMike Kaganski
Change-Id: Ic17ffd6fc34504cf848d963e787e685ed2142080 Reviewed-on: https://gerrit.libreoffice.org/48978 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-01-30Update liborcus to 0.13.2.Kohei Yoshida
Change-Id: I485757eb743e066730509202a3c077e5d822a311 Reviewed-on: https://gerrit.libreoffice.org/48863 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2018-01-30Remove obsolete patchMike Kaganski
A leftover from commit 147cb6a2ae63debed3dd500e19b2776cebbc0031 Change-Id: I1744f87dfe508aea6cb17b4411594dad5771b028 Reviewed-on: https://gerrit.libreoffice.org/48877 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-01-29fix android red and blue channel swap on jpegs w/ 24bit RGB surfaceChristian Lohmaier
that was introduced with 54596087e57ea533253e19eea594d9b6c06e8d26 without adjusting for Android accordingly Change-Id: Ie6a2001ab13ecec959da9b57bb49e1bac76e8691
2018-01-27Fix typosAndrea Gelmini
Change-Id: I8d5a8251a01af7cdf9832d98d8a6573b907f8532 Reviewed-on: https://gerrit.libreoffice.org/48683 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-01-24curl: upgrade to release 7.58.0Michael Stahl
* fixes 2 CVEs * disable some new optional dependencies Change-Id: If7725d126e68de04b67969a83c0ea08573a43679 Reviewed-on: https://gerrit.libreoffice.org/48493 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-24Silence upcoming GCC 8 -Werror=parentheses in external/boostStephan Bergmann
...reporting such delights as > [CXX] sal/cppunittester/cppunittester.cxx > In file included from workdir/UnpackedTarball/boost/boost/mpl/aux_/na_assert.hpp:23, [...] > from external/boost/include/boost/algorithm/string.hpp:25, > from sal/cppunittester/cppunittester.cxx:60: > workdir/UnpackedTarball/boost/boost/mpl/assert.hpp:188:21: error: unnecessary parentheses in declaration of ‘assert_arg’ [-Werror=parentheses] > failed ************ (Pred::************ > ^ where boost/mpl/assert.hpp contains > template< typename Pred > > failed ************ (Pred::************ > assert_arg( void (*)(Pred), typename assert_arg_pred<Pred>::type ) > ); Change-Id: I6976b2cc23f1d309d27d3fde9098b10c9d877599 Reviewed-on: https://gerrit.libreoffice.org/48386 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-23Silence -Werror,-Wundef in external/boostStephan Bergmann
> [CXX] vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx > In file included from vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx:20: > In file included from vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.hxx:30: > In file included from vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx:29: > In file included from workdir/UnpackedTarball/boost/boost/process/child.hpp:22: > In file included from workdir/UnpackedTarball/boost/boost/process/detail/execute_impl.hpp:24: > workdir/UnpackedTarball/boost/boost/process/detail/posix/executor.hpp:446:5: error: 'BOOST_POSIX_HAS_VFORK' is not defined, evaluates to 0 [-Werror,-Wundef] > #if BOOST_POSIX_HAS_VFORK > ^ under --enable-gtk3-kde5 Change-Id: Ib4648d1337a493c35b35897dc71c5e971c6eb214
2018-01-23EPUB export, fxl: silence Page <N> toc entries when have chapter namesMiklos Vajna
The EPUB ToC is now on par with the PDF ToC. Change-Id: Iea714fdb68c825aa14345037e909c354bbd7cf00 Reviewed-on: https://gerrit.libreoffice.org/48346 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-01-23EPUB export, fixed layout: add chapter names to the navigation documentMiklos Vajna
Extend vcl::PDFExtOutDevData so that it's possible to use it outside the PDF export; this way the EPUB export can know which chapters start on which page. This means fixed and reflowable layout has the same table of contents, instead of just Page <N> in the fixed layout case. Change-Id: I935fb23c66ec747431b91e83b0e677d4e5f704b9 Reviewed-on: https://gerrit.libreoffice.org/48332 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-22boost: upgrade to release 1.66.0Michael Stahl
This claims to support Visual Studio 2017.4, but not the current 2017.5. * remove boost.auto_link.patch; it does not apply; not sure why we need this if we can just define BOOST_ALL_NO_LIB (see commit 7f2e168421c3cd928a31a52a8b5afe97e931d3ba) * remove some hunks from clang-cl.patch.0 that look fixed upstream * add a global workaround for spurious GCC warning: oox/source/drawingml/shape.cxx:921:54: error: ‘oShadowColor.boost::optional_detail::tc_optional_base<int>::m_storage’ may be used uninitialized in this function [-Werror=maybe-uninitialized] aFormat.Color = *oShadowColor; Change-Id: I1eb1d8b66554a84a7d7269f1faaa98695fe2f501 Reviewed-on: https://gerrit.libreoffice.org/48187 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-19firebird: recognise MSVC 2017.5 (which defines _MSC_VER=1912)Michael Stahl
Change-Id: Ic526bc3babfd342fd2ebb10003639d600a668ae5
2018-01-19EPUB export: handle text frame and image widthMiklos Vajna
So that an image and its caption in a text frame always go to separate lines. Change-Id: I439e370ad3bc8628f80a8db45499f8bffd84ef2b Reviewed-on: https://gerrit.libreoffice.org/48148 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-01-18android: use unified headers and llvm-c++ STL (x86) with NDK 16Christian Lohmaier
gnustl (and others) are to be removed in future versions of the ndk also bump gradle and build-tools to current versions along with it arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix that later Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79 Reviewed-on: https://gerrit.libreoffice.org/45163 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-01-17Adapt external/harfbuzz/ubsan.patchStephan Bergmann
...to 3b773d5b41628c1ccf52bdd0d7962183d54c4138 "Upload HarfBuzz 1.7.4" Change-Id: I07459c9e03a4cd68a600150964a4e5358b559766
2018-01-16Upload HarfBuzz 1.7.4Khaled Hosny
Change-Id: I7dd1f87dc95d0fb190755a8742d28ef8679d7b1e Reviewed-on: https://gerrit.libreoffice.org/47897 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
2018-01-10Silence clang-cl -Werror,-Wmicrosoft-unqualified-friend, reduxStephan Bergmann
...adding two more wrapper files missing from aef6da021da33f099f99ed633814b8771ad4abda "Silence clang-cl -Werror,-Wmicrosoft- unqualified-friend in external/boost", necessary since 653736fb23346e07e8c0e6e0125689ae1f49f0f7 "pdf: use bimap for GraphicsContext-id map" Change-Id: Ied377274d355f27af5d97d7bea89e3b598d9b7d0 Reviewed-on: https://gerrit.libreoffice.org/47688 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-10pdfium: update to 3312Miklos Vajna
Change-Id: I3e81c097870264bfcdd8c14407dcb95f5b153793 Reviewed-on: https://gerrit.libreoffice.org/47689 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-09Silence clang-cl -Werror,-Wmicrosoft-unqualified-friend in external/boostStephan Bergmann
...messages like: > workdir/UnpackedTarball/boost\boost/bimap/detail/map_view_iterator.hpp(138,18): error: unqualified friend declaration referring to type outside of the nearest enclosing namespace is a Microsoft extension; add a nested name specifier [-Werror,-Wmicrosoft-unqualified-friend] > friend class iterator_core_access; > ^ > ::boost::iterators:: Change-Id: I393b7c95943a55d5f755cfed41e0b7bc3306c568 Reviewed-on: https://gerrit.libreoffice.org/47673 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-09upload libpagemaker 0.0.4David Tardon
Change-Id: Idc4b7eaa3331ee3831f7d27ca66663e23c30b8c9 Reviewed-on: https://gerrit.libreoffice.org/47615 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2018-01-08openssl: fix MSVC 64-bit buildMichael Stahl
For whatever reason OpenSSL wants to use "masm" (ml.exe) on 32-bit builds but "nasm" on 64-bit builds - this despite INSTALL.W32 claiming that only nasm is "supported". But /safeseh doesn't make sense on 64-bit anyway because there is no "unsafe" SEH there, so just apply the patch only for 32-bit. Change-Id: Ie32b17dfeeaf11c49ee29c3181021ffa5bd99091
2018-01-08libxslt: enable debug if ENABLE_DBGUTILMichael Stahl
BinScope requires a PDB file to check the DLL. Change-Id: Id4c584fb5b0e1a7368708267bb4650e4f1c61e79
2018-01-08openssl: MSVC build: link and run MSASM with /SAFESEHMichael Stahl
Actually the assembler requires lowercase /safeseh, oddly enough. Change-Id: I1569409a2d6358282a7463ea996a6b1615e6ed8c
2018-01-08lpsolve: always generate symbols with MSVCMichael Stahl
BinScope requires a PDB file to check the DLL; not worth the effort to conditionalize this. Change-Id: Ibb9800baa0932495504f0bebea2ffa765aa0cecf
2018-01-08coinmp: link with /DYNAMICBASEMichael Stahl
No idea why this would be explicitly disabled. Change-Id: I1e06544ae4ae579de578560ce66e310da659ccb4
2018-01-06upload libabw 0.1.2David Tardon
Change-Id: I972ff9e0dbb73f6a38c886e1acd03cc4d62da2ec Reviewed-on: https://gerrit.libreoffice.org/47251 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2018-01-05upload libe-book 0.1.3David Tardon
Change-Id: I8862e7f4d2dcb007295028b9ec7be04e58ebafd3 Reviewed-on: https://gerrit.libreoffice.org/47264 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2018-01-04libqxp, add update of config.subjan Iversen
Change-Id: I4999be84c45fa32d0ae6f62f667b2c7470972f49
2018-01-04libmspub, add update of config.subjan Iversen
Change-Id: Ia843520afae808fc8ed7dec6ae017400720394e7
2018-01-02upload libqxp 0.0.1David Tardon
Change-Id: I44f94ea59e2b7a7f9fb5c2c74268fbe4601936b3 Reviewed-on: https://gerrit.libreoffice.org/47258 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2018-01-02upload libmspub 0.1.3David Tardon
Change-Id: I1f759bf914e4a61fc943098f04661789d374ffdb Reviewed-on: https://gerrit.libreoffice.org/47256 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-12-30update android rgba cairo patch to apply againCaolán McNamara
Change-Id: Iaee918439f8472bab7fab2cf545ac2e420d614ab
2017-12-28Full UBSan in external/firebirdStephan Bergmann
...after 6a312a4a3d642f0f9769df54c0ec25471c9916bd "Prepare external/firebird for sanitizers". Doing `make check screenshot` on Linux with Clang -fsanitize=undefined -fsanitize=local-bounds -fsanitize=nullability works now. Patches that might be unwanted in non-UBSan builds are added to sanitizer.patch while unproblematic ones are added to always-included ubsan.patch. CppunitTest_dbaccess_firebird_test, e.g., shows that comphelper::AsyncEventNotifierAutoJoin::onTerminated called base-class osl::Thread::onTerminated (which does nothing, anyway) of an already destroyed object, so just drop that. Change-Id: If50f442ee6dbe590db843c38681d1c1cade8fa6a Reviewed-on: https://gerrit.libreoffice.org/47122 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-26vcl-svp: add 24-bit (3-byte) RGB surface support to CairoAshod Nakashian
(cherry picked from commit e8ba02b1d56dc7b59a4f0a7373995b28653a0597) Reviewed-on: https://gerrit.libreoffice.org/46681 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 31c044e2501b9d4a0917e4e09133660bbe2a24dc) Change-Id: I7707219eae4c2d6d40c8dc957207b63d3049a75f Reviewed-on: https://gerrit.libreoffice.org/47010 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-12-23pixman: drop cached glyphs above size watermarkAshod Nakashian
The glyphs cache only tracked the number of glyphs in the cache, which isn't very useful when the glyphs vary in size from a few bytes to dozens of megabytes. In terms of memory footprint, we are interested not just in the number of cached glyphs, but also in the total memory usage. We now track the pixel-size of each glyph and drop as many as necessary to fall below the set threshold which is currently 4 MBs. There was no performance loss observed after this patch on a diverse set of documents of all types (if anything, a very modest performance win was hinted in some cases), with significant memory reduction in some cases where dozens of megabytes were previously left stale in the cache. Change-Id: I377a4c1e59611fca6bf253dd9fa90f75b5295d4b Reviewed-on: https://gerrit.libreoffice.org/45378 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 407660a08c8df27d7cd44435eefa31bd92364a3c) (cherry picked from commit ded39dc17a34127a872b11abddc32bbbb5aae047) Reviewed-on: https://gerrit.libreoffice.org/46987 Tested-by: Jenkins <ci@libreoffice.org>
2017-12-23EPUB export: fix invalid XHTML output for text boxesMiklos Vajna
<div> not allowed inside <p>. Also fix two more similar validation problems. Change-Id: I7c326743b5e89a5a32609bdf312cb8caa203692e Reviewed-on: https://gerrit.libreoffice.org/46983 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-22Prepare external/firebird for sanitizersStephan Bergmann
...so at least Clang -fsanitize=function on Linux works now. The patch needs to stop errors about undefined sanitizer symbols in DSOs (UNDEF_PLATFORM, EXE_LINK_OPTIONS), and make resolution of RTTI symbols consistent in a process, by exporting them from the various version map files and adding RTLD_GLOBAL to dlopen. Change-Id: I75779e55529b62a96a8943e3dee9119647aa91a7 Reviewed-on: https://gerrit.libreoffice.org/46947 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-21tdf#113532 Add Arabic fonts into default installationYousuf Philips
Includes these fonts * Amiri * KACSTOffice, KACSTBook * Reem Kufi * Scheherazade Change-Id: I2071c4c379b2dc88a205e2c284ae0a65cfdc76c9 Reviewed-on: https://gerrit.libreoffice.org/46624 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com>
2017-12-20Remove Clang -Wunknown-pragmas workaroundStephan Bergmann
...that appears to only be necessary for Clang <= 3.4, so no longer needed since fa7b7f73938e837af2765f8a03f07e404046877b "Document that Clang 3.4.2 is known to be too old" Change-Id: I09361f6ffc23b8d20d65d3c84d9003719e2159f8 Reviewed-on: https://gerrit.libreoffice.org/46787 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-18tdf#103080 October 2017 update to Noto fontsYousuf Philips
In addition to updates to the already bundled fonts, Condensed and Light weights of English Noto Sans and Noto Serif have been added, as well as the addition of the Noto Sans Arabic Change-Id: I72bd7815d678fb4723692eb90d352d012ffe035e Reviewed-on: https://gerrit.libreoffice.org/46596 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com>