From 267c6f2ac71f92999e969232431ba04678e7437e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 07:54:39 +0200 Subject: Adding upstream version 4:24.2.0. Signed-off-by: Daniel Baumann --- .../libfreehand/ExternalProject_libfreehand.mk | 49 ++++++++++++++++++++++ external/libfreehand/Makefile | 7 ++++ external/libfreehand/Module_libfreehand.mk | 17 ++++++++ external/libfreehand/README | 3 ++ .../libfreehand/UnpackedTarball_libfreehand.mk | 24 +++++++++++ .../icu-65-api-macros-with-semicolon.patch.1 | 12 ++++++ 6 files changed, 112 insertions(+) create mode 100644 external/libfreehand/ExternalProject_libfreehand.mk create mode 100644 external/libfreehand/Makefile create mode 100644 external/libfreehand/Module_libfreehand.mk create mode 100644 external/libfreehand/README create mode 100644 external/libfreehand/UnpackedTarball_libfreehand.mk create mode 100644 external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 (limited to 'external/libfreehand') diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk new file mode 100644 index 0000000000..554017cafd --- /dev/null +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -0,0 +1,49 @@ +# -*- 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,libfreehand)) + +$(eval $(call gb_ExternalProject_use_autoconf,libfreehand,build)) + +$(eval $(call gb_ExternalProject_register_targets,libfreehand,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libfreehand,\ + boost_headers \ + icu \ + lcms2 \ + revenge \ + zlib \ +)) + +$(call gb_ExternalProject_get_state_target,libfreehand,build) : + $(call gb_Trace_StartRange,libfreehand,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-tests \ + --disable-tools \ + --disable-debug \ + --disable-werror \ + --disable-weffc \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(call gb_ExternalProject_get_build_flags,libfreehand)" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + LDFLAGS="$(call gb_ExternalProject_get_link_flags,libfreehand)" \ + $(gb_CONFIGURE_PLATFORMS) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libfreehand,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libfreehand/Makefile b/external/libfreehand/Makefile new file mode 100644 index 0000000000..e4968cf85f --- /dev/null +++ b/external/libfreehand/Makefile @@ -0,0 +1,7 @@ +# -*- 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/external/libfreehand/Module_libfreehand.mk b/external/libfreehand/Module_libfreehand.mk new file mode 100644 index 0000000000..b00efd16e0 --- /dev/null +++ b/external/libfreehand/Module_libfreehand.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/. +# + +$(eval $(call gb_Module_Module,libfreehand)) + +$(eval $(call gb_Module_add_targets,libfreehand,\ + ExternalProject_libfreehand \ + UnpackedTarball_libfreehand \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libfreehand/README b/external/libfreehand/README new file mode 100644 index 0000000000..7403eb1a03 --- /dev/null +++ b/external/libfreehand/README @@ -0,0 +1,3 @@ +Library for import of FreeHand drawings. + +[https://wiki.documentfoundation.org/DLP/Libraries/libfreehand] diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk new file mode 100644 index 0000000000..641b470e3b --- /dev/null +++ b/external/libfreehand/UnpackedTarball_libfreehand.mk @@ -0,0 +1,24 @@ +# -*- 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,libfreehand)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libfreehand,$(FREEHAND_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libfreehand)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libfreehand,0)) + +# icu-65-api-macros-with-semicolon.patch.1 +# See http://site.icu-project.org/download/65 Migration Issues +$(eval $(call gb_UnpackedTarball_add_patches,libfreehand,\ + external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 b/external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 new file mode 100644 index 0000000000..20b0af801a --- /dev/null +++ b/external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 @@ -0,0 +1,12 @@ +diff -ur libfreehand.org/src/lib/libfreehand_utils.cpp libfreehand/src/lib/libfreehand_utils.cpp +--- libfreehand.org/src/lib/libfreehand_utils.cpp 2017-09-16 12:28:50.000000000 +0200 ++++ libfreehand/src/lib/libfreehand_utils.cpp 2019-10-28 23:02:38.581354923 +0100 +@@ -162,7 +162,7 @@ + while (j < length) + { + UChar32 c; +- U16_NEXT(s, j, length, c) ++ U16_NEXT(s, j, length, c); + unsigned char outbuf[U8_MAX_LENGTH+1]; + int i = 0; + U8_APPEND_UNSAFE(&outbuf[0], i, c); -- cgit v1.2.3