8 files changed, 0 insertions, 238 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
deleted file mode 100644
index 649742011223..000000000000
--- a/liborcus/ExternalProject_liborcus.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- 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/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,liborcus))
-
-$(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
-
-$(eval $(call gb_ExternalProject_use_externals,liborcus, \
-    boost_headers \
-    boostsystem \
-    zlib \
-))
-
-$(eval $(call gb_ExternalProject_register_targets,liborcus,\
-	build \
-))
-
-# Must be built with debug GNU C++ library if --enable-dbgutil has
-# caused the LO code to be built thusly.
-
-# The LIBS setting for Android is needed to get the orcus-xml-dump
-# executable to build successfully. We obviously don't actually need
-# that executable on Android, but we don't want to bother with
-# patching out building it for Android.
-
-#$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") CXXFLAGS+="$(BOOST_CXXFLAGS))
-
-liborcus_LIBS=
-ifeq ($(SYSTEM_ZLIB),YES)
-liborcus_LIBS+=-lz
-endif
-ifeq ($(SYSTEM_BOOST),YES)
-liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
-else
-liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem
-endif
-ifeq ($(OS),ANDROID)
-liborcus_LIBS+=-lgnustl_shared -lm
-endif
-
-liborcus_CPPCLAGS=$(CPPFLAGS)
-ifeq ($(COM),MSC)
-liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB
-endif
-ifeq ($(SYSTEM_ZLIB),NO)
-liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
-endif
-#
-# OSes that use the GNU C++ library need to use -D_GLIBCXX_DEBUG in
-# sync with the rest of LibreOffice, i.e. depending on
-# --enable-dbgutil. Note that although Android doesn't use the GNU C
-# library (glibc), the NDK does offer the GNU C++ library as one of
-# the C++ libraries available, and we use it.
-#
-ifneq (,$(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)))
-ifneq (,$(gb_ENABLE_DBGUTIL))
-liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
-endif
-endif
-
-liborcus_CXXFLAGS=$(CXXFLAGS)
-liborcus_LDFLAGS=$(LDFLAGS)
-ifeq ($(COM),MSC)
-liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
-endif
-ifeq ($(SYSTEM_BOOST),NO)
-liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost
-else
-liborcus_LDFLAGS+=$(BOOST_LDFLAGS)
-endif
-ifneq (,$(PTHREAD_LIBS))
-liborcus_LDFLAGS+=$(PTHREAD_LIBS)
-endif
-
-$(call gb_ExternalProject_get_state_target,liborcus,build) :
-	$(call gb_ExternalProject_run,build,\
-		$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
-		$(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \
-		$(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS)') \
-		$(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \
-		./configure \
-			--with-pic \
-			--enable-static \
-			--disable-shared \
-			$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
-			--disable-spreadsheet-model \
-			--disable-werror \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			$(if $(filter NO,$(SYSTEM_BOOST)),--with-boost-system=boostsystem) \
-		&& $(if $(VERBOSE)$(verbose),V=1) \
-		   $(MAKE) \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/liborcus/Makefile b/liborcus/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/liborcus/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/liborcus/Module_liborcus.mk b/liborcus/Module_liborcus.mk
deleted file mode 100644
index e3c963951436..000000000000
--- a/liborcus/Module_liborcus.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- 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/.
-#
-
-$(eval $(call gb_Module_Module,liborcus))
-
-ifeq ($(ENABLE_ORCUS)-$(SYSTEM_LIBORCUS),TRUE-NO)
-
-$(eval $(call gb_Module_add_targets,liborcus,\
-	ExternalProject_liborcus \
-	UnpackedTarball_liborcus \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/liborcus/UnpackedTarball_liborcus.mk b/liborcus/UnpackedTarball_liborcus.mk
deleted file mode 100644
index cb615736e337..000000000000
--- a/liborcus/UnpackedTarball_liborcus.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- 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/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,liborcus))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0))
-
-liborcus_patches :=
-
-# make config.sub recognize arm-linux-androideabi
-liborcus_patches += liborcus_0.1.0-configure.patch
-
-# don't use dllimport
-liborcus_patches += liborcus_0.1.0-dllimport.patch
-
-ifeq ($(OS),MACOSX)
-# no "tac" command on OS X, but "tail -r"
-liborcus_patches += liborcus_0.1.0-tac.patch
-endif
-
-ifneq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
-liborcus_patches += visibility.patch
-endif
-
-# <https://gitorious.org/orcus/orcus/merge_requests/2#
-# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
-# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
-
-$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
-	$(foreach patch,$(liborcus_patches),liborcus/$(patch)) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/liborcus/liborcus_0.1.0-configure.patch b/liborcus/liborcus_0.1.0-configure.patch
deleted file mode 100644
index ae8502e417f0..000000000000
--- a/liborcus/liborcus_0.1.0-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- config.sub
-+++ config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1275,7 +1275,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/liborcus/liborcus_0.1.0-dllimport.patch b/liborcus/liborcus_0.1.0-dllimport.patch
deleted file mode 100644
index 6255d060a492..000000000000
--- a/liborcus/liborcus_0.1.0-dllimport.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/orcus/env.hpp
-+++ include/orcus/env.hpp
-@@ -35,14 +35,8 @@
-     #else
-       #define ORCUS_DLLPUBLIC __declspec(dllexport)
-     #endif
--  #elif defined __ORCUS_STATIC_LIB
-+  #else
-       #define ORCUS_DLLPUBLIC
--  #else
--    #ifdef __GNUC__
--      #define ORCUS_DLLPUBLIC __attribute__ ((dllimport))
--    #else
--      #define ORCUS_DLLPUBLIC __declspec(dllimport)
--    #endif
-   #endif
-   #define ORCUS_DLLLOCAL
- #else
diff --git a/liborcus/liborcus_0.1.0-tac.patch b/liborcus/liborcus_0.1.0-tac.patch
deleted file mode 100644
index 01c77a9565f2..000000000000
--- a/liborcus/liborcus_0.1.0-tac.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure
-+++ configure
-@@ -15668,7 +15668,7 @@
- 
- 			LDFLAGS_SAVE=$LDFLAGS
-             if test "x$ax_boost_user_system_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
-+                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tail -r` ; do
-                      ax_lib=${libextension}
- 				    as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-@@ -15716,7 +15716,7 @@
- 
- 				done
-                 if test "x$link_system" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
-+                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tail -r` ; do
-                      ax_lib=${libextension}
- 				    as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
diff --git a/liborcus/visibility.patch b/liborcus/visibility.patch
deleted file mode 100644
index a5af6398b839..000000000000
--- a/liborcus/visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -3211,7 +3211,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--CXXFLAGS="$CXXFLAGS -O2 -fvisibility=hidden -Wall"
-+CXXFLAGS="$CXXFLAGS -O2 -Wall"
- 
- # ===========================
- # Find required base packages