fdo#70393: move libcdr to a subdir of external

Change-Id: If862bdfc338daa60a104e9b28924343363bb2fab
Reviewed-on: https://gerrit.libreoffice.org/6328
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

6 files changed, 0 insertions, 108 deletions

diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
deleted file mode 100644
index 9dda27fefd6a..000000000000
--- a/libcdr/ExternalProject_libcdr.mk
+++ /dev/null
@@ -1,45 +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,libcdr))
-
-$(eval $(call gb_ExternalProject_use_autoconf,libcdr,build))
-
-$(eval $(call gb_ExternalProject_register_targets,libcdr,\
-	build \
-))
-
-$(eval $(call gb_ExternalProject_use_externals,libcdr,\
-	boost_headers \
-	icu \
-	lcms2 \
-	wpd \
-	wpg \
-	zlib \
-))
-
-$(call gb_ExternalProject_get_state_target,libcdr,build) :
-	$(call gb_ExternalProject_run,build,\
-		export PKG_CONFIG="" \
-		&& ./configure \
-			--with-pic \
-			--enable-static \
-			--disable-shared \
-			--without-docs \
-			--disable-debug \
-			--disable-werror \
-			--disable-weffc \
-			CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
-		    $(if $(VERBOSE)$(verbose),V=1) \
-		    $(MAKE)) \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/libcdr/Makefile b/libcdr/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/libcdr/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/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk
deleted file mode 100644
index 5e5726d72b08..000000000000
--- a/libcdr/Module_libcdr.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,libcdr))
-
-ifeq ($(SYSTEM_CDR),NO)
-
-$(eval $(call gb_Module_add_targets,libcdr,\
-	ExternalProject_libcdr \
-	UnpackedTarball_libcdr \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/libcdr/README b/libcdr/README
deleted file mode 100644
index d3ba94db6252..000000000000
--- a/libcdr/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Library parsing the Corel cdr documents.
-
-I couldn't find an upstream for this library - although I did only try a primitive Google search.
diff --git a/libcdr/UnpackedTarball_libcdr.mk b/libcdr/UnpackedTarball_libcdr.mk
deleted file mode 100644
index d25d241b22e6..000000000000
--- a/libcdr/UnpackedTarball_libcdr.mk
+++ /dev/null
@@ -1,18 +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,libcdr))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\
-	libcdr/libcdr-wpx_seek_end.patch.1 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-wpx_seek_end.patch.1 b/libcdr/libcdr-wpx_seek_end.patch.1
deleted file mode 100644
index 67b8587996f8..000000000000
--- a/libcdr/libcdr-wpx_seek_end.patch.1
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/lib/CDRZipStream.cpp
-+++ b/src/lib/CDRZipStream.cpp
-@@ -160,11 +160,7 @@ WPXInputStream *libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
- 
- bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd()
- {
--#if defined(LIBWPD_STREAM_VERSION_MAJOR) && defined(LIBWPD_STREAM_VERSION_MINOR) && defined(LIBWPD_STREAM_VERSION_REVISION) \
--  && (LIBWPD_STREAM_VERSION_MAJOR > 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 && (LIBWPD_STREAM_VERSION_MINOR > 9 \
--  || (LIBWPD_STREAM_VERSION_MINOR == 9 && LIBWPD_STREAM_VERSION_REVISION >= 5))))
-   if (m_cdir_offset || m_input->seek(-1024, WPX_SEEK_END))
--#endif
-     m_input->seek(m_cdir_offset, WPX_SEEK_SET);
-   try
-   {