distro-configs/CPOSX.conf | 29 +++++++++++++++++++++++++++++ vcl/source/gdi/gdimtf.cxx | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-)
New commits: commit d8a543e170e9abb3f87a407d6443816dd8bc564b Author: Tor Lillqvist <[email protected]> Date: Thu Oct 3 14:05:26 2013 +0300 Add first draft of Collabora distro-config file for OS X Change-Id: I88bae998946066d0a505c7cff06eb9cadcd4e7ed diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf new file mode 100644 index 0000000..80089c7 --- /dev/null +++ b/distro-configs/CPOSX.conf @@ -0,0 +1,29 @@ +--with-vendor=Collabora +--with-intro-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/intro.png +--with-flat-logo-svg=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/flat_logo.svg +--with-about-background-svg=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/about.svg +--with-startcenter-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_left.png +--with-startcenter-right-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_right.png +--with-startcenter-rtl-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_left.png +--with-startcenter-rtl-right-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_right.png +--with-startcenter-space-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_space.png +--with-help +--without-junit +--without-helppack-integration +--enable-extension-integration +--disable-online-update +--disable-odk +--enable-scripting-beanshell +--enable-scripting-javascript +--enable-ext-wiki-publisher +--enable-ext-report-builder +--enable-ext-presenter-minimizer +--enable-ext-nlpsolver +--enable-ext-numbertext +--disable-ext-mysql-connector +--enable-ext-ct2n +--enable-ext-google-docs +--enable-ext-languagetool +--enable-release-build +--disable-build-mozab +--with-lang=af ar bn ca cs da de el en-GB en-US en-ZA es fi fr gu he hi hu it ja ko mr nb nl nn pl pt-BR pt ru sk sl sv ta tr xh zh-CN zh-TW zu commit 1b33554474d21075728e0e5f133e2bd3df58b936 Author: Tor Lillqvist <[email protected]> Date: Thu Oct 3 14:03:40 2013 +0300 Don't include X11 headers for OS X Change-Id: I72e9568fe18eb412110384aab940da002140bf0b diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index f43b6ca..0b6daac 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -48,7 +48,7 @@ #include <com/sun/star/graphic/XGraphicRenderer.hpp> #include <comphelper/processfactory.hxx> -#ifdef UNX +#if defined(UNX) && !defined(MACOSX) #include <tools/prex.h> #include "unx/Xproto.h" #include <tools/postx.h> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
