Index: head/editors/libreoffice/files/patch-powerpc =================================================================== --- head/editors/libreoffice/files/patch-powerpc (revision 538701) +++ head/editors/libreoffice/files/patch-powerpc (revision 538702) @@ -1,216 +1,216 @@ --- configure.ac.orig 2019-08-08 20:00:41.682261000 +0800 +++ configure.ac 2019-08-08 20:01:10.652575000 +0800 @@ -4278,6 +4278,16 @@ RTL_ARCH=X86_64 PLATFORMID=freebsd_x86_64 ;; + powerpc64) + CPUNAME=POWERPC64 + RTL_ARCH=PowerPC_64 + PLATFORMID=freebsd_powerpc64 + ;; + powerpc|powerpcspe) + CPUNAME=POWERPC + RTL_ARCH=PowerPC + PLATFORMID=freebsd_powerpc + ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; --- configure.orig 2019-08-07 01:54:44.000000000 +0800 +++ configure 2019-08-08 20:00:26.166619000 +0800 -@@ -12509,6 +12509,16 @@ - RTL_ARCH=X86_64 - PLATFORMID=freebsd_x86_64 - ;; +@@ -12537,6 +12537,16 @@ + PLATFORMID=freebsd_aarch64 + RTL_ARCH=AARCH64 + ;; + powerpc64) + CPUNAME=POWERPC64 + RTL_ARCH=PowerPC_64 + PLATFORMID=freebsd_powerpc64 + ;; + powerpc|powerpcspe) + CPUNAME=POWERPC + RTL_ARCH=PowerPC + PLATFORMID=freebsd_powerpc + ;; *) as_fn_error $? "Unsupported host_cpu $host_cpu for host_os $host_os" "$LINENO" 5 ;; --- bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx.orig +++ bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx @@ -20,7 +20,11 @@ #include #include +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) +#include +#else #include +#endif #include #include --- bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx.orig +++ bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -20,7 +20,11 @@ #include #include +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) +#include +#else #include +#endif #include #include --- include/osl/endian.h.orig +++ include/osl/endian.h @@ -53,9 +53,11 @@ #elif defined FREEBSD # include # include -# if defined _LITTLE_ENDIAN +# if BYTE_ORDER == LITTLE_ENDIAN +# undef _BIG_ENDIAN # define OSL_LITENDIAN -# elif defined _BIG_ENDIAN +# elif BYTE_ORDER == BIG_ENDIAN +# undef _LITTLE_ENDIAN # define OSL_BIGENDIAN # endif #elif defined AIX --- /dev/null +++ solenv/gbuild/platform/FREEBSD_POWERPC_GCC.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +#please make generic modifications to unxgcc.mk or linux.mk +gb_CPUDEFS += -DPPC -DPOWERPC +gb_COMPILERDEFAULTOPTFLAGS := -O2 + +include $(GBUILDDIR)/platform/unxgcc.mk + +# vim: set noet sw=4: --- /dev/null +++ solenv/gbuild/platform/FREEBSD_POWERPC64_GCC.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +#please make generic modifications to unxgcc.mk or linux.mk +gb_CPUDEFS += -DPPC -DPOWERPC64 +gb_COMPILERDEFAULTOPTFLAGS := -O2 +gb_CXXFLAGS += -mminimal-toc + +include $(GBUILDDIR)/platform/unxgcc.mk + +# vim: set noet sw=4: --- desktop/source/deployment/misc/dp_platform.cxx.orig +++ desktop/source/deployment/misc/dp_platform.cxx @@ -132,6 +132,8 @@ ret = checkOSandCPU("FreeBSD", "X86_64"); else if (token == "freebsd_powerpc") ret = checkOSandCPU("FreeBSD", "PowerPC"); + else if (token == "freebsd_powerpc64") + ret = checkOSandCPU("FreeBSD", "PowerPC64"); else if (token == "kfreebsd_x86") ret = checkOSandCPU("kFreeBSD", "x86"); else if (token == "kfreebsd_x86_64") --- lotuswordpro/source/filter/lwpobjstrm.cxx.orig +++ lotuswordpro/source/filter/lwpobjstrm.cxx @@ -57,6 +57,7 @@ #include "lwpobjstrm.hxx" #include "lwptools.hxx" +#include #include #include #include --- oox/source/helper/binaryoutputstream.cxx.orig +++ oox/source/helper/binaryoutputstream.cxx @@ -23,6 +23,8 @@ #include #include #include + +#include namespace oox { --- sal/cppunittester/cppunittester.cxx.orig +++ sal/cppunittester/cppunittester.cxx @@ -361,6 +361,7 @@ SAL_IMPLEMENT_MAIN() { + return EXIT_SUCCESS; bool ok = false; OUString path; try --- sw/source/filter/ww8/ww8scan.cxx.orig +++ sw/source/filter/ww8/ww8scan.cxx @@ -23,6 +23,7 @@ #include #include +#include #include #include #include --- testtools/CustomTarget_uno_test.mk.orig 2019-03-27 15:11:56.660402000 +0800 +++ testtools/CustomTarget_uno_test.mk 2019-03-27 15:11:55.757889000 +0800 @@ -12,7 +12,10 @@ # this target is phony to run it every time .PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test) -$(call gb_CustomTarget_get_target,testtools/uno_test) : \ +ifeq (($(OS)-$(CPUNAME)), FREEBSD-POWERPC64) + @echo "FreeBSD PowerPC64 GCC fails this test! likely broken UNO bridge. Fix me." +else + $(call gb_CustomTarget_get_target,testtools/uno_test) : \ $(call gb_Executable_get_runtime_dependencies,uno) \ $(call gb_InternalUnoApi_get_target,bridgetest) \ $(call gb_Package_get_target,instsetoo_native_setup_ure) \ @@ -29,6 +32,7 @@ -env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD)) \ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services)) \ -env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)) +endif endif # vim:set shiftwidth=4 tabstop=4 noexpandtab: --- vcl/headless/svpbmp.cxx.orig +++ vcl/headless/svpbmp.cxx @@ -26,6 +26,8 @@ #include #include #include +#include + #include #include --- vcl/source/filter/jpeg/Exif.cxx.orig +++ vcl/source/filter/jpeg/Exif.cxx @@ -20,6 +20,7 @@ #include #include +#include Exif::Exif() : maOrientation(TOP_LEFT),