bridges/Library_cpp_uno.mk | 64 ++++++++++++++++++++++++++++-----------------
vcl/headless/svpgdi.cxx | 8 ++++-
2 files changed, 46 insertions(+), 26 deletions(-)
New commits:
commit 7caa7ed28356490cd00eb12832509758300da8fd
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Nov 26 09:42:21 2015 +0000
restrict this for > cairo 1.10.0 for now
Change-Id: I845a1b045a4e83c35cf1a837c7e520e3b0890c29
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 477b33e..a940e36 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -873,6 +873,9 @@ bool SvpSalGraphics::drawPolyLine(
basegfx::B2DLineJoin eLineJoin,
css::drawing::LineCap eLineCap)
{
+ bool bRet = false;
+ (void)rPolyLine; (void)fTransparency; (void)rLineWidths; (void)eLineJoin;
(void)eLineCap;
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
// short circuit if there is nothing to do
const int nPointCount = rPolyLine.count();
if (nPointCount <= 0)
@@ -971,8 +974,9 @@ bool SvpSalGraphics::drawPolyLine(
xDamageTracker->damaged(basegfx::B2IBox(extents.x, extents.y,
extents.x + extents.width,
extents.y + extents.height));
}
-
- return true;
+ bRet = true;
+#endif
+ return bRet;
}
bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32,
commit 5d7bd6b9299946ea2cc5760c5fd2338b3ec4a902
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Nov 26 09:33:37 2015 +0000
default to trying the linux bridge for all linuxy like things
Change-Id: I1fcf3afadefcd5af472523fd8fca123fb3ab4095
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 702d462..3206a53 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -9,13 +9,7 @@
$(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno))
-ifeq ($(OS)-$(CPUNAME),AIX-POWERPC)
-
-bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
-bridge_exception_objects := except
-bridge_cxx_objects := cpp2uno uno2cpp
-
-else ifeq ($(CPUNAME),ARM)
+ifeq ($(CPUNAME),ARM)
ifeq ($(OS),IOS)
$(eval $(call gb_Library_use_sdk_api,gcc3_uno))
@@ -25,7 +19,7 @@ bridge_exception_objects := cpp2uno cpp2uno-arm cpp2uno-arm64
cpp2uno-i386 excep
$(eval $(call gb_Library_use_custom_headers,gcc3_uno,\
bridges/source/cpp_uno/gcc3_ios_arm \
))
-else ifneq ($(filter LINUX ANDROID,$(OS)),)
+else ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_arm
bridge_noopt_objects := cpp2uno except uno2cpp
# HACK
@@ -35,8 +29,9 @@ $(call gb_LinkTarget_get_target,$(call
gb_Library_get_linktarget,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
endif
-else ifneq (,$(filter ANDROID-AARCH64 LINUX-AARCH64,$(OS)-$(CPUNAME)))
+else ifeq ($(CPUNAME),AARCH64)
+ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_aarch64
bridge_exception_objects := abi callvirtualfunction uno2cpp
@@ -46,23 +41,30 @@ $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,
\
$(gb_LinkTarget_EXCEPTIONFLAGS) \
$(call gb_LinkTarget__get_cxxflags,$(gb_CPPU_ENV)_uno)) \
))
+endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-AXP)
+else ifeq ($(CPUNAME),AXP)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_alpha
bridge_exception_objects := cpp2uno except uno2cpp
+endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-HPPA)
+else ifeq ($(CPUNAME),HPPA)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_hppa
bridge_noopt_objects := call cpp2uno except uno2cpp
+endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-IA64)
+else ifeq ($(CPUNAME),IA64)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_ia64
bridge_asm_objects := call
bridge_exception_objects := except
bridge_noopt_objects := cpp2uno uno2cpp
+endif
else ifeq ($(CPUNAME),INTEL)
@@ -86,10 +88,12 @@ bridge_noopt_objects := uno2cpp
bridge_exception_objects := callvirtualmethod cpp2uno dllinit except
smallstruct
endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-M68K)
+else ifeq ($(CPUNAME),M68K)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_m68k
bridge_noopt_objects := cpp2uno except uno2cpp
+endif
else ifeq ($(CPUNAME),GODSON)
@@ -108,34 +112,52 @@ bridge_noopt_objects := cpp2uno uno2cpp
bridge_exception_objects := except
endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC)
+else ifeq ($(CPUNAME),POWERPC)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_powerpc
bridge_noopt_objects := uno2cpp
bridge_exception_objects := cpp2uno except
+else ifeq ($(OS),AIX)
+bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
+bridge_exception_objects := except
+bridge_cxx_objects := cpp2uno uno2cpp
+endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC64)
+else ifeq ($(CPUNAME),POWERPC64)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_powerpc64
bridge_noopt_objects := cpp2uno uno2cpp
bridge_exception_objects := except
+endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-S390)
+else ifeq ($(CPUNAME),S390)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_s390
bridge_exception_objects := cpp2uno except uno2cpp
+endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-S390X)
+else ifeq ($(CPUNAME),S390X)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_s390x
bridge_exception_objects := cpp2uno except uno2cpp
+endif
-else ifeq ($(OS)-$(CPUNAME),LINUX-SPARC)
+else ifeq ($(CPUNAME),SPARC)
+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_sparc
bridge_asm_objects := call
bridge_noopt_objects := except
bridge_exception_objects := cpp2uno uno2cpp
+else ifeq ($(OS),SOLARIS)
+bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
+bridge_noopt_objects := cpp2uno uno2cpp
+bridge_exception_objects := except
+endif
else ifeq ($(CPUNAME),X86_64)
@@ -160,12 +182,6 @@ bridge_noncallexception_noopt_objects := callvirtualmethod
bridge_exception_objects := abi cpp2uno except uno2cpp
endif
-else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
-
-bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
-bridge_noopt_objects := cpp2uno uno2cpp
-bridge_exception_objects := except
-
endif
$(eval $(call gb_Library_use_external,$(gb_CPPU_ENV)_uno,boost_headers))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
